From b2d1c0dee32189c93303c964a1a512f89db85e10 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 19 Mar 2016 18:31:00 -0400
Subject: [PATCH] update subtitle download setting

---
 MediaBrowser.Model/Providers/SubtitleOptions.cs        |  2 +-
 MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs   |  2 +-
 MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs | 10 +++++-----
 .../MediaInfo/SubtitleScheduledTask.cs                 |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MediaBrowser.Model/Providers/SubtitleOptions.cs b/MediaBrowser.Model/Providers/SubtitleOptions.cs
index 84f01e0b7a..2b15c0e1f1 100644
--- a/MediaBrowser.Model/Providers/SubtitleOptions.cs
+++ b/MediaBrowser.Model/Providers/SubtitleOptions.cs
@@ -2,7 +2,7 @@ namespace MediaBrowser.Model.Providers
 {
     public class SubtitleOptions
     {
-        public bool SkipIfGraphicalSubtitlesPresent { get; set; }
+        public bool SkipIfEmbeddedSubtitlesPresent { get; set; }
         public bool SkipIfAudioTrackMatches { get; set; }
         public string[] DownloadLanguages { get; set; }
         public bool DownloadMovieSubtitles { get; set; }
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index ee05a89a85..5f556bffb4 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -532,7 +532,7 @@ namespace MediaBrowser.Providers.MediaInfo
                     _subtitleManager)
                     .DownloadSubtitles(video,
                     currentStreams.Concat(externalSubtitleStreams).ToList(),
-                    subtitleOptions.SkipIfGraphicalSubtitlesPresent,
+                    subtitleOptions.SkipIfEmbeddedSubtitlesPresent,
                     subtitleOptions.SkipIfAudioTrackMatches,
                     subtitleOptions.DownloadLanguages,
                     cancellationToken).ConfigureAwait(false);
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs b/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
index 6230e73475..d822890326 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
@@ -26,7 +26,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
         public async Task<List<string>> DownloadSubtitles(Video video,
             List<MediaStream> mediaStreams,
-            bool skipIfGraphicalSubtitlesPresent,
+            bool skipIfEmbeddedSubtitlesPresent,
             bool skipIfAudioTrackMatches,
             IEnumerable<string> languages,
             CancellationToken cancellationToken)
@@ -59,7 +59,7 @@ namespace MediaBrowser.Providers.MediaInfo
             {
                 try
                 {
-                    var downloaded = await DownloadSubtitles(video, mediaStreams, skipIfGraphicalSubtitlesPresent, skipIfAudioTrackMatches, lang, mediaType, cancellationToken)
+                    var downloaded = await DownloadSubtitles(video, mediaStreams, skipIfEmbeddedSubtitlesPresent, skipIfAudioTrackMatches, lang, mediaType, cancellationToken)
                         .ConfigureAwait(false);
 
                     if (downloaded)
@@ -78,7 +78,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
         private async Task<bool> DownloadSubtitles(Video video,
             List<MediaStream> mediaStreams,
-            bool skipIfGraphicalSubtitlesPresent,
+            bool skipIfEmbeddedSubtitlesPresent,
             bool skipIfAudioTrackMatches,
             string language,
             VideoContentType mediaType,
@@ -107,8 +107,8 @@ namespace MediaBrowser.Providers.MediaInfo
             }
 
             // There's an internal subtitle stream for this language
-            if (skipIfGraphicalSubtitlesPresent &&
-                mediaStreams.Any(i => i.Type == MediaStreamType.Subtitle && !i.IsTextSubtitleStream && string.Equals(i.Language, language, StringComparison.OrdinalIgnoreCase)))
+            if (skipIfEmbeddedSubtitlesPresent &&
+                mediaStreams.Any(i => i.Type == MediaStreamType.Subtitle && !i.IsExternal && string.Equals(i.Language, language, StringComparison.OrdinalIgnoreCase)))
             {
                 return false;
             }
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
index 4953621f5a..b8b17cefee 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
@@ -114,7 +114,7 @@ namespace MediaBrowser.Providers.MediaInfo
                     _subtitleManager)
                     .DownloadSubtitles(video,
                     mediaStreams,
-                    options.SkipIfGraphicalSubtitlesPresent,
+                    options.SkipIfEmbeddedSubtitlesPresent,
                     options.SkipIfAudioTrackMatches,
                     options.DownloadLanguages,
                     cancellationToken).ConfigureAwait(false);