lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add open subtitle option to only download subtitles that are a perfect match

Browse Source
This commit is contained in:
Luke Pulverenti 2016-04-07 00:09:32 -04:00
parent c27e60d2d8
commit 8e0c9c53bc
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Controller/Subtitles/SubtitleSearchRequest.cs
View File

@ -19,6 +19,7 @@ namespace MediaBrowser.Controller.Subtitles
public int? ParentIndexNumber { get; set; } public int? ParentIndexNumber { get; set; }
public int? ProductionYear { get; set; } public int? ProductionYear { get; set; }
public long? RuntimeTicks { get; set; } public long? RuntimeTicks { get; set; }
public bool IsPerfectMatch { get; set; }
public Dictionary<string, string> ProviderIds { get; set; } public Dictionary<string, string> ProviderIds { get; set; }
public bool SearchAllProviders { get; set; } public bool SearchAllProviders { get; set; }

3
MediaBrowser.Model/Providers/SubtitleOptions.cs
View File

@ -12,11 +12,14 @@ namespace MediaBrowser.Model.Providers
public string OpenSubtitlesPasswordHash { get; set; } public string OpenSubtitlesPasswordHash { get; set; }
public bool IsOpenSubtitleVipAccount { get; set; } public bool IsOpenSubtitleVipAccount { get; set; }
public bool RequirePerfectMatch { get; set; }
public SubtitleOptions() public SubtitleOptions()
{ {
DownloadLanguages = new string[] { }; DownloadLanguages = new string[] { };
SkipIfAudioTrackMatches = true; SkipIfAudioTrackMatches = true;
RequirePerfectMatch = true;
} }
} }
} }

1
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
View File

@ -532,6 +532,7 @@ namespace MediaBrowser.Providers.MediaInfo
currentStreams.Concat(externalSubtitleStreams).ToList(), currentStreams.Concat(externalSubtitleStreams).ToList(),
subtitleOptions.SkipIfEmbeddedSubtitlesPresent, subtitleOptions.SkipIfEmbeddedSubtitlesPresent,
subtitleOptions.SkipIfAudioTrackMatches, subtitleOptions.SkipIfAudioTrackMatches,
subtitleOptions.RequirePerfectMatch,
subtitleOptions.DownloadLanguages, subtitleOptions.DownloadLanguages,
cancellationToken).ConfigureAwait(false); cancellationToken).ConfigureAwait(false);

8
MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
View File

@ -28,6 +28,7 @@ namespace MediaBrowser.Providers.MediaInfo
List<MediaStream> mediaStreams, List<MediaStream> mediaStreams,
bool skipIfEmbeddedSubtitlesPresent, bool skipIfEmbeddedSubtitlesPresent,
bool skipIfAudioTrackMatches, bool skipIfAudioTrackMatches,
bool requirePerfectMatch,
IEnumerable<string> languages, IEnumerable<string> languages,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
@ -59,7 +60,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
try try
{ {
var downloaded = await DownloadSubtitles(video, mediaStreams, skipIfEmbeddedSubtitlesPresent, skipIfAudioTrackMatches, lang, mediaType, cancellationToken) var downloaded = await DownloadSubtitles(video, mediaStreams, skipIfEmbeddedSubtitlesPresent, skipIfAudioTrackMatches, requirePerfectMatch, lang, mediaType, cancellationToken)
.ConfigureAwait(false); .ConfigureAwait(false);
if (downloaded) if (downloaded)
@ -80,6 +81,7 @@ namespace MediaBrowser.Providers.MediaInfo
List<MediaStream> mediaStreams, List<MediaStream> mediaStreams,
bool skipIfEmbeddedSubtitlesPresent, bool skipIfEmbeddedSubtitlesPresent,
bool skipIfAudioTrackMatches, bool skipIfAudioTrackMatches,
bool requirePerfectMatch,
string language, string language,
VideoContentType mediaType, VideoContentType mediaType,
CancellationToken cancellationToken) CancellationToken cancellationToken)
@ -125,7 +127,9 @@ namespace MediaBrowser.Providers.MediaInfo
ProviderIds = video.ProviderIds, ProviderIds = video.ProviderIds,
// Stop as soon as we find something // Stop as soon as we find something
SearchAllProviders = false SearchAllProviders = false,
IsPerfectMatch = requirePerfectMatch
}; };
var episode = video as Episode; var episode = video as Episode;

1
MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
View File

@ -116,6 +116,7 @@ namespace MediaBrowser.Providers.MediaInfo
mediaStreams, mediaStreams,
options.SkipIfEmbeddedSubtitlesPresent, options.SkipIfEmbeddedSubtitlesPresent,
options.SkipIfAudioTrackMatches, options.SkipIfAudioTrackMatches,
options.RequirePerfectMatch,
options.DownloadLanguages, options.DownloadLanguages,
cancellationToken).ConfigureAwait(false); cancellationToken).ConfigureAwait(false);

4
MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
View File

@ -308,8 +308,8 @@ namespace MediaBrowser.Providers.Subtitles
// Avoid implicitly captured closure // Avoid implicitly captured closure
var hasCopy = hash; var hasCopy = hash;
return results.Where(x => x.SubBad == "0" && mediaFilter(x)) return results.Where(x => x.SubBad == "0" && mediaFilter(x) && (!request.IsPerfectMatch || string.Equals(x.MovieHash, hash, StringComparison.OrdinalIgnoreCase)))
.OrderBy(x => (x.MovieHash == hash ? 0 : 1)) .OrderBy(x => (string.Equals(x.MovieHash, hash, StringComparison.OrdinalIgnoreCase) ? 0 : 1))
.ThenBy(x => Math.Abs(long.Parse(x.MovieByteSize, _usCulture) - movieByteSize)) .ThenBy(x => Math.Abs(long.Parse(x.MovieByteSize, _usCulture) - movieByteSize))
.ThenByDescending(x => int.Parse(x.SubDownloadsCnt, _usCulture)) .ThenByDescending(x => int.Parse(x.SubDownloadsCnt, _usCulture))
.ThenByDescending(x => double.Parse(x.SubRating, _usCulture)) .ThenByDescending(x => double.Parse(x.SubRating, _usCulture))