diff options
Diffstat (limited to 'MediaBrowser.Providers')
3 files changed, 22 insertions, 18 deletions
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs b/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs index af0f91d0b..cf14cfadc 100644 --- a/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs +++ b/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs @@ -1,6 +1,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Subtitles; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; @@ -37,15 +38,15 @@ namespace MediaBrowser.Providers.MediaInfo return new List<string>(); } - SubtitleMediaType mediaType; + VideoContentType mediaType; if (video is Episode) { - mediaType = SubtitleMediaType.Episode; + mediaType = VideoContentType.Episode; } else if (video is Movie) { - mediaType = SubtitleMediaType.Movie; + mediaType = VideoContentType.Movie; } else { @@ -82,7 +83,7 @@ namespace MediaBrowser.Providers.MediaInfo bool skipIfGraphicalSubtitlesPresent, bool skipIfAudioTrackMatches, string language, - SubtitleMediaType mediaType, + VideoContentType mediaType, CancellationToken cancellationToken) { // There's already subtitles for this language diff --git a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs index 79a301dd3..5b951e0c2 100644 --- a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs +++ b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs @@ -1,6 +1,7 @@ using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Net; using MediaBrowser.Controller.Configuration; +using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Security; using MediaBrowser.Controller.Subtitles; using MediaBrowser.Model.Configuration; @@ -72,17 +73,17 @@ namespace MediaBrowser.Providers.Subtitles get { return "Open Subtitles"; } } - public IEnumerable<SubtitleMediaType> SupportedMediaTypes + public IEnumerable<VideoContentType> SupportedMediaTypes { get { if (string.IsNullOrWhiteSpace(_config.Configuration.SubtitleOptions.OpenSubtitlesUsername) || string.IsNullOrWhiteSpace(_config.Configuration.SubtitleOptions.OpenSubtitlesPasswordHash)) { - return new SubtitleMediaType[] { }; + return new VideoContentType[] { }; } - return new[] { SubtitleMediaType.Episode, SubtitleMediaType.Movie }; + return new[] { VideoContentType.Episode, VideoContentType.Movie }; } } @@ -163,21 +164,21 @@ namespace MediaBrowser.Providers.Subtitles _lastLogin = DateTime.UtcNow; } - public async Task<IEnumerable<RemoteSubtitleInfo>> SearchSubtitles(SubtitleSearchRequest request, CancellationToken cancellationToken) + public async Task<IEnumerable<RemoteSubtitleInfo>> Search(SubtitleSearchRequest request, CancellationToken cancellationToken) { var imdbIdText = request.GetProviderId(MetadataProviders.Imdb); long imdbId = 0; switch (request.ContentType) { - case SubtitleMediaType.Episode: + case VideoContentType.Episode: if (!request.IndexNumber.HasValue || !request.ParentIndexNumber.HasValue || string.IsNullOrEmpty(request.SeriesName)) { _logger.Debug("Episode information missing"); return new List<RemoteSubtitleInfo>(); } break; - case SubtitleMediaType.Movie: + case VideoContentType.Movie: if (string.IsNullOrEmpty(request.Name)) { _logger.Debug("Movie name missing"); @@ -206,8 +207,8 @@ namespace MediaBrowser.Providers.Subtitles var hash = Utilities.ComputeHash(request.MediaPath); var fileInfo = new FileInfo(request.MediaPath); var movieByteSize = fileInfo.Length; - var searchImdbId = request.ContentType == SubtitleMediaType.Movie ? imdbId.ToString(_usCulture) : ""; - var subtitleSearchParameters = request.ContentType == SubtitleMediaType.Episode + var searchImdbId = request.ContentType == VideoContentType.Movie ? imdbId.ToString(_usCulture) : ""; + var subtitleSearchParameters = request.ContentType == VideoContentType.Episode ? new List<SubtitleSearchParameters> { new SubtitleSearchParameters(subLanguageId, query: request.SeriesName, @@ -234,7 +235,7 @@ namespace MediaBrowser.Providers.Subtitles Predicate<SubtitleSearchResult> mediaFilter = x => - request.ContentType == SubtitleMediaType.Episode + request.ContentType == VideoContentType.Episode ? !string.IsNullOrEmpty(x.SeriesSeason) && !string.IsNullOrEmpty(x.SeriesEpisode) && int.Parse(x.SeriesSeason, _usCulture) == request.ParentIndexNumber && int.Parse(x.SeriesEpisode, _usCulture) == request.IndexNumber diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs index 6951e8bd0..2d5445653 100644 --- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs +++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs @@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Subtitles; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; @@ -45,7 +46,7 @@ namespace MediaBrowser.Providers.Subtitles { try { - return await i.SearchSubtitles(request, cancellationToken).ConfigureAwait(false); + return await i.Search(request, cancellationToken).ConfigureAwait(false); } catch (Exception ex) { @@ -99,15 +100,15 @@ namespace MediaBrowser.Providers.Subtitles return Task.FromResult<IEnumerable<RemoteSubtitleInfo>>(new List<RemoteSubtitleInfo>()); } - SubtitleMediaType mediaType; + VideoContentType mediaType; if (video is Episode) { - mediaType = SubtitleMediaType.Episode; + mediaType = VideoContentType.Episode; } else if (video is Movie) { - mediaType = SubtitleMediaType.Movie; + mediaType = VideoContentType.Movie; } else { @@ -124,7 +125,8 @@ namespace MediaBrowser.Providers.Subtitles Name = video.Name, ParentIndexNumber = video.ParentIndexNumber, ProductionYear = video.ProductionYear, - ProviderIds = video.ProviderIds + ProviderIds = video.ProviderIds, + RuntimeTicks = video.RunTimeTicks }; var episode = video as Episode; |