diff options
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderManager.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Providers/MediaBrowser.Providers.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs | 127 |
3 files changed, 130 insertions, 7 deletions
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs index 593d88cf5..bf3183fd2 100644 --- a/MediaBrowser.Providers/Manager/ProviderManager.cs +++ b/MediaBrowser.Providers/Manager/ProviderManager.cs @@ -188,15 +188,10 @@ namespace MediaBrowser.Providers.Manager if (preferredLanguages.Count > 0) { result = result.Where(i => string.IsNullOrEmpty(i.Language) || - preferredLanguages.Contains(i.Language, StringComparer.OrdinalIgnoreCase)); + preferredLanguages.Contains(i.Language, StringComparer.OrdinalIgnoreCase) || + string.Equals(i.Language, "en", StringComparison.OrdinalIgnoreCase)); } - //if (string.Equals(preferredLanguage, "en", StringComparison.OrdinalIgnoreCase)) - //{ - // result = result.Where(i => string.IsNullOrEmpty(i.Language) || - // string.Equals(i.Language, "en", StringComparison.OrdinalIgnoreCase)); - //} - return result; } catch (OperationCanceledException) diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj index 080732b32..406c5e2e5 100644 --- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj +++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj @@ -99,6 +99,7 @@ <Compile Include="MediaInfo\FFProbeVideoInfo.cs" /> <Compile Include="MediaInfo\SubtitleDownloader.cs" /> <Compile Include="MediaInfo\SubtitleResolver.cs" /> + <Compile Include="MediaInfo\SubtitleScheduledTask.cs" /> <Compile Include="Movies\MovieDbTrailerProvider.cs" /> <Compile Include="Movies\MovieExternalIds.cs" /> <Compile Include="Movies\TrailerMetadataService.cs" /> diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs new file mode 100644 index 000000000..361cc317c --- /dev/null +++ b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs @@ -0,0 +1,127 @@ +using MediaBrowser.Common.ScheduledTasks; +using MediaBrowser.Controller.Configuration; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Movies; +using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Subtitles; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Providers.MediaInfo +{ + public class SubtitleScheduledTask : IScheduledTask + { + private readonly ILibraryManager _libraryManager; + private readonly IServerConfigurationManager _config; + private readonly ISubtitleManager _subtitleManager; + private readonly ILogger _logger; + + public SubtitleScheduledTask(ILibraryManager libraryManager, IServerConfigurationManager config, ISubtitleManager subtitleManager, ILogger logger) + { + _libraryManager = libraryManager; + _config = config; + _subtitleManager = subtitleManager; + _logger = logger; + } + + public string Name + { + get { return "Download missing subtitles"; } + } + + public string Description + { + get { return "Searches the internet for missing subtitles based on metadata configuration."; } + } + + public string Category + { + get { return "Library"; } + } + + public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress) + { + var videos = _libraryManager.RootFolder + .RecursiveChildren + .OfType<Video>() + .Where(i => + { + if (i.LocationType == LocationType.Remote || i.LocationType == LocationType.Virtual) + { + return false; + } + + return (_config.Configuration.SubtitleOptions.DownloadEpisodeSubtitles && + i is Episode) || + (_config.Configuration.SubtitleOptions.DownloadMovieSubtitles && + i is Movie); + }) + .ToList(); + + var numComplete = 0; + + foreach (var video in videos) + { + try + { + await DownloadSubtitles(video, cancellationToken).ConfigureAwait(false); + } + catch (Exception ex) + { + _logger.ErrorException("Error downloading subtitles for {0}", ex, video.Path); + } + + // Update progress + numComplete++; + double percent = numComplete; + percent /= videos.Count; + + progress.Report(100 * percent); + } + } + + private async Task DownloadSubtitles(Video video, CancellationToken cancellationToken) + { + if ((_config.Configuration.SubtitleOptions.DownloadEpisodeSubtitles && + video is Episode) || + (_config.Configuration.SubtitleOptions.DownloadMovieSubtitles && + video is Movie)) + { + var mediaStreams = video.GetMediaSources(false).First().MediaStreams; + + var externalSubtitleStreams = mediaStreams.Where(i => i.Type == MediaStreamType.Subtitle && i.IsExternal).ToList(); + var currentStreams = mediaStreams.Except(externalSubtitleStreams).ToList(); + + var downloadedLanguages = await new SubtitleDownloader(_logger, + _subtitleManager) + .DownloadSubtitles(video, + currentStreams, + externalSubtitleStreams, + _config.Configuration.SubtitleOptions.SkipIfGraphicalSubtitlesPresent, + _config.Configuration.SubtitleOptions.SkipIfAudioTrackMatches, + _config.Configuration.SubtitleOptions.DownloadLanguages, + cancellationToken).ConfigureAwait(false); + + // Rescan + if (downloadedLanguages.Count > 0) + { + await video.RefreshMetadata(cancellationToken).ConfigureAwait(false); + } + } + } + + public IEnumerable<ITaskTrigger> GetDefaultTriggers() + { + return new ITaskTrigger[] + { + new DailyTrigger { TimeOfDay = TimeSpan.FromHours(3) }, + }; + } + } +} |