소스 검색

async open subtitle methods

Luke Pulverenti 11 년 전
부모
커밋
d6ce2eacb5
2개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
  2. 2 1
      MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs

+ 1 - 1
MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs

@@ -109,7 +109,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
             // There's an internal subtitle stream for this language
             if (skipIfGraphicalSubtitlesPresent &&
-                internalMediaStreams.Any(i => i.Type == MediaStreamType.Subtitle && string.Equals(i.Language, language, StringComparison.OrdinalIgnoreCase)))
+                internalMediaStreams.Any(i => i.Type == MediaStreamType.Subtitle && i.IsGraphicalSubtitleStream && string.Equals(i.Language, language, StringComparison.OrdinalIgnoreCase)))
             {
                 return false;
             }

+ 2 - 1
MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs

@@ -218,7 +218,8 @@ namespace MediaBrowser.Providers.Subtitles
                                                                subtitleSearchParameters
                                                            };
 
-            var result = OpenSubtitles.SearchSubtitles(parms.ToArray());
+            var result = await OpenSubtitles.SearchSubtitlesAsync(parms.ToArray(), cancellationToken).ConfigureAwait(false);
+
             if (!(result is MethodResponseSubtitleSearch))
             {
                 _logger.Debug("Invalid response type");