mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-05 13:23:03 +02:00
Allow default/forced tag without setting language
This commit is contained in:
parent
3eec137100
commit
4a20ae6cb4
|
@ -120,6 +120,12 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||||
while (languageSpan.Length > 0)
|
while (languageSpan.Length > 0)
|
||||||
{
|
{
|
||||||
var lastDot = languageSpan.LastIndexOf('.');
|
var lastDot = languageSpan.LastIndexOf('.');
|
||||||
|
if (lastDot < videoFileNameWithoutExtension.Length)
|
||||||
|
{
|
||||||
|
languageSpan = ReadOnlySpan<char>.Empty;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
var currentSlice = languageSpan[lastDot..];
|
var currentSlice = languageSpan[lastDot..];
|
||||||
if (currentSlice.Equals(".default", StringComparison.OrdinalIgnoreCase)
|
if (currentSlice.Equals(".default", StringComparison.OrdinalIgnoreCase)
|
||||||
|| currentSlice.Equals(".forced", StringComparison.OrdinalIgnoreCase)
|
|| currentSlice.Equals(".forced", StringComparison.OrdinalIgnoreCase)
|
||||||
|
@ -133,12 +139,19 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to translate to three character code
|
|
||||||
// Be flexible and check against both the full and three character versions
|
|
||||||
var language = languageSpan.ToString();
|
var language = languageSpan.ToString();
|
||||||
var culture = _localization.FindLanguageInfo(language);
|
if (string.IsNullOrWhiteSpace(language))
|
||||||
|
{
|
||||||
|
language = null;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Try to translate to three character code
|
||||||
|
// Be flexible and check against both the full and three character versions
|
||||||
|
var culture = _localization.FindLanguageInfo(language);
|
||||||
|
|
||||||
language = culture == null ? language : culture.ThreeLetterISOLanguageName;
|
language = culture == null ? language : culture.ThreeLetterISOLanguageName;
|
||||||
|
}
|
||||||
|
|
||||||
mediaStream = new MediaStream
|
mediaStream = new MediaStream
|
||||||
{
|
{
|
||||||
|
|
|
@ -80,6 +80,37 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("/video/My Video.mkv", "/video/My Video.srt", "srt", null, false, false)]
|
||||||
|
[InlineData("/video/My.Video.mkv", "/video/My.Video.srt", "srt", null, false, false)]
|
||||||
|
[InlineData("/video/My.Video.mkv", "/video/My.Video.foreign.srt", "srt", null, true, false)]
|
||||||
|
[InlineData("/video/My Video.mkv", "/video/My Video.forced.srt", "srt", null, true, false)]
|
||||||
|
[InlineData("/video/My.Video.mkv", "/video/My.Video.default.srt", "srt", null, false, true)]
|
||||||
|
[InlineData("/video/My.Video.mkv", "/video/My.Video.forced.default.srt", "srt", null, true, true)]
|
||||||
|
[InlineData("/video/My.Video.mkv", "/video/My.Video.en.srt", "srt", "en", false, false)]
|
||||||
|
[InlineData("/video/My.Video.mkv", "/video/My.Video.default.en.srt", "srt", "en", false, true)]
|
||||||
|
[InlineData("/video/My.Video.mkv", "/video/My.Video.default.forced.en.srt", "srt", "en", true, true)]
|
||||||
|
[InlineData("/video/My.Video.mkv", "/video/My.Video.en.default.forced.srt", "srt", "en", true, true)]
|
||||||
|
public void AddExternalSubtitleStreams_GivenSingleFile_ReturnsExpectedSubtitle(string videoPath, string file, string codec, string? language, bool isForced, bool isDefault)
|
||||||
|
{
|
||||||
|
var streams = new List<MediaStream>();
|
||||||
|
var expected = CreateMediaStream(file, codec, language, 0, isForced, isDefault);
|
||||||
|
|
||||||
|
new SubtitleResolver(Mock.Of<ILocalizationManager>()).AddExternalSubtitleStreams(streams, videoPath, 0, new[] { file });
|
||||||
|
|
||||||
|
Assert.Single(streams);
|
||||||
|
|
||||||
|
var actual = streams[0];
|
||||||
|
|
||||||
|
Assert.Equal(expected.Index, actual.Index);
|
||||||
|
Assert.Equal(expected.Type, actual.Type);
|
||||||
|
Assert.Equal(expected.IsExternal, actual.IsExternal);
|
||||||
|
Assert.Equal(expected.Path, actual.Path);
|
||||||
|
Assert.Equal(expected.IsDefault, actual.IsDefault);
|
||||||
|
Assert.Equal(expected.IsForced, actual.IsForced);
|
||||||
|
Assert.Equal(expected.Language, actual.Language);
|
||||||
|
}
|
||||||
|
|
||||||
private static MediaStream CreateMediaStream(string path, string codec, string? language, int index, bool isForced = false, bool isDefault = false)
|
private static MediaStream CreateMediaStream(string path, string codec, string? language, int index, bool isForced = false, bool isDefault = false)
|
||||||
{
|
{
|
||||||
return new ()
|
return new ()
|
||||||
|
|
Loading…
Reference in a new issue