diff options
| author | Andrew Rabert <ar@nullsum.net> | 2018-12-27 18:27:57 -0500 |
|---|---|---|
| committer | Andrew Rabert <ar@nullsum.net> | 2018-12-27 18:27:57 -0500 |
| commit | a86b71899ec52c44ddc6c3018e8cc5e9d7ff4d62 (patch) | |
| tree | a74f6ea4a8abfa1664a605d31d48bc38245ccf58 /MediaBrowser.Api | |
| parent | 9bac3ac616b01f67db98381feb09d34ebe821f9a (diff) | |
Add GPL modules
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/PackageService.cs | 40 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/StreamState.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Api/SearchService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Api/StartupWizardService.cs | 4 |
4 files changed, 5 insertions, 46 deletions
diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs index 366d1318b..0b1dc083d 100644 --- a/MediaBrowser.Api/PackageService.cs +++ b/MediaBrowser.Api/PackageService.cs @@ -62,21 +62,6 @@ namespace MediaBrowser.Api } /// <summary> - /// Class GetPackageVersionUpdates - /// </summary> - [Route("/Packages/Updates", "GET", Summary = "Gets available package updates for currently installed packages")] - [Authenticated(Roles = "Admin")] - public class GetPackageVersionUpdates : IReturn<PackageVersionInfo[]> - { - /// <summary> - /// Gets or sets the name. - /// </summary> - /// <value>The name.</value> - [ApiMember(Name = "PackageType", Description = "Package type filter (System/UserInstalled)", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")] - public string PackageType { get; set; } - } - - /// <summary> /// Class InstallPackage /// </summary> [Route("/Packages/Installed/{Name}", "POST", Summary = "Installs a package")] @@ -146,30 +131,7 @@ namespace MediaBrowser.Api /// </summary> /// <param name="request">The request.</param> /// <returns>System.Object.</returns> - public async Task<object> Get(GetPackageVersionUpdates request) - { - PackageVersionInfo[] result = null; - - if (string.Equals(request.PackageType, "UserInstalled", StringComparison.OrdinalIgnoreCase) || string.Equals(request.PackageType, "All", StringComparison.OrdinalIgnoreCase)) - { - result = (await _installationManager.GetAvailablePluginUpdates(_appHost.ApplicationVersion, false, CancellationToken.None).ConfigureAwait(false)).ToArray(); - } - - else if (string.Equals(request.PackageType, "System", StringComparison.OrdinalIgnoreCase) || - string.Equals(request.PackageType, "All", StringComparison.OrdinalIgnoreCase)) - { - var updateCheckResult = await _appHost - .CheckForApplicationUpdate(CancellationToken.None, new SimpleProgress<double>()).ConfigureAwait(false); - - if (updateCheckResult.IsUpdateAvailable) - { - result = new PackageVersionInfo[] { updateCheckResult.Package }; - } - } - - return ToOptimizedResult(result ?? new PackageVersionInfo[] { }); - } - + /// /// <summary> /// Gets the specified request. /// </summary> diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs index ac20b5e33..db5d256c4 100644 --- a/MediaBrowser.Api/Playback/StreamState.cs +++ b/MediaBrowser.Api/Playback/StreamState.cs @@ -148,7 +148,6 @@ namespace MediaBrowser.Api.Playback DisposeTranscodingThrottler(); DisposeLiveStream(); DisposeLogStream(); - DisposeIsoMount(); TranscodingJob = null; } @@ -251,9 +250,9 @@ namespace MediaBrowser.Api.Playback public DeviceProfile DeviceProfile { get; set; } public TranscodingJob TranscodingJob; - public override void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded, int? bitRate) + public override void ReportTranscodingProgress(TimeSpan? transcodingPosition, float framerate, double? percentComplete, long bytesTranscoded, int? bitRate) { - ApiEntryPoint.Instance.ReportTranscodingProgress(TranscodingJob, this, transcodingPosition, framerate, percentComplete, bytesTranscoded, bitRate); + ApiEntryPoint.Instance.ReportTranscodingProgress(TranscodingJob, this, transcodingPosition, 0, percentComplete, 0, bitRate); } } } diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs index 2e363136b..0473dd924 100644 --- a/MediaBrowser.Api/SearchService.cs +++ b/MediaBrowser.Api/SearchService.cs @@ -230,7 +230,7 @@ namespace MediaBrowser.Api result.StartDate = program.StartDate; } - var hasSeries = item as IHasSeriesName; + var hasSeries = item as IHasSeries; if (hasSeries != null) { result.Series = hasSeries.SeriesName; diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs index b4891ba1a..7fccbcc9b 100644 --- a/MediaBrowser.Api/StartupWizardService.cs +++ b/MediaBrowser.Api/StartupWizardService.cs @@ -51,16 +51,14 @@ namespace MediaBrowser.Api private readonly IServerConfigurationManager _config; private readonly IServerApplicationHost _appHost; private readonly IUserManager _userManager; - private readonly IConnectManager _connectManager; private readonly IMediaEncoder _mediaEncoder; private readonly IHttpClient _httpClient; - public StartupWizardService(IServerConfigurationManager config, IHttpClient httpClient, IServerApplicationHost appHost, IUserManager userManager, IConnectManager connectManager, IMediaEncoder mediaEncoder) + public StartupWizardService(IServerConfigurationManager config, IHttpClient httpClient, IServerApplicationHost appHost, IUserManager userManager, IMediaEncoder mediaEncoder) { _config = config; _appHost = appHost; _userManager = userManager; - _connectManager = connectManager; _mediaEncoder = mediaEncoder; _httpClient = httpClient; } |
