diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-27 18:54:56 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-27 18:54:56 -0400 |
| commit | 31c8c3bf7f1cb5e79d36b0b1d5c28907ea526011 (patch) | |
| tree | 3cb82628a3d58065d4f2b1bfecace002e5cb0b1e /MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs | |
| parent | 0d5e95222af2a40d06971baa5ab06a9e5d2fba3d (diff) | |
make open subtitle project portable
Diffstat (limited to 'MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs index a58da3dc8..d8f36de9a 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs @@ -218,16 +218,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles }); } - private string NormalizeLanguage(string language) - { - // Problem with Greek subtitle download #1349 - if (string.Equals (language, "gre", StringComparison.OrdinalIgnoreCase)) { - - return "ell"; - } + private string NormalizeLanguage(string language) + { + // Problem with Greek subtitle download #1349 + if (string.Equals(language, "gre", StringComparison.OrdinalIgnoreCase)) + { + + return "ell"; + } - return language; - } + return language; + } public async Task<IEnumerable<RemoteSubtitleInfo>> Search(SubtitleSearchRequest request, CancellationToken cancellationToken) { @@ -265,14 +266,19 @@ namespace MediaBrowser.MediaEncoding.Subtitles await Login(cancellationToken).ConfigureAwait(false); - var subLanguageId = NormalizeLanguage(request.Language); - var hash = Utilities.ComputeHash(request.MediaPath); + var subLanguageId = NormalizeLanguage(request.Language); + string hash; + + using (var fileStream = File.OpenRead(request.MediaPath)) + { + hash = Utilities.ComputeHash(fileStream); + } var fileInfo = new FileInfo(request.MediaPath); var movieByteSize = fileInfo.Length; var searchImdbId = request.ContentType == VideoContentType.Movie ? imdbId.ToString(_usCulture) : ""; var subtitleSearchParameters = request.ContentType == VideoContentType.Episode ? new List<SubtitleSearchParameters> { - new SubtitleSearchParameters(subLanguageId, + new SubtitleSearchParameters(subLanguageId, query: request.SeriesName, season: request.ParentIndexNumber.Value.ToString(_usCulture), episode: request.IndexNumber.Value.ToString(_usCulture)) @@ -282,9 +288,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles new SubtitleSearchParameters(subLanguageId, query: request.Name, imdbid: searchImdbId) }; var parms = new List<SubtitleSearchParameters> { - new SubtitleSearchParameters( subLanguageId, - movieHash: hash, - movieByteSize: movieByteSize, + new SubtitleSearchParameters( subLanguageId, + movieHash: hash, + movieByteSize: movieByteSize, imdbid: searchImdbId ), }; parms.AddRange(subtitleSearchParameters); |
