michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make the eligibility check more strict wrt. brackets

Browse Source
This commit is contained in:
cvium 2021-03-10 19:29:52 +01:00
parent 3824c09e77
commit b0af11c34e
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Emby.Naming/Video/VideoListResolver.cs
View File

@ -229,15 +229,14 @@ namespace Emby.Naming.Video
if (CleanStringParser.TryClean(testFilename, _options.CleanStringRegexes, out var cleanName))
{
testFilename = cleanName.ToString();
testFilename = cleanName.Trim().ToString();
}
// The CleanStringParser should have removed common keywords etc., so if it starts with -, _ or [ it's eligible.
// The CleanStringParser should have removed common keywords etc.
return string.IsNullOrEmpty(testFilename)
|| testFilename[0] == '-'
|| testFilename[0] == '_'
|| testFilename[0] == '['
|| string.IsNullOrWhiteSpace(Regex.Replace(testFilename, @"\[([^]]*)\]", string.Empty));
|| Regex.IsMatch(testFilename, @"^\[([^]]*)\]");
}
return false;

18
tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
View File

@ -388,6 +388,24 @@ namespace Jellyfin.Naming.Tests.Video
Assert.Single(result[0].AlternateVersions);
}
[Fact]
public void Resolve_GivenUnclosedBrackets_DoesNotGroup()
{
var files = new[]
{
@"/movies/John Wick - Chapter 3 (2019)/John Wick - Kapitel 3 (2019) [Version 1].mkv",
@"/movies/John Wick - Chapter 3 (2019)/John Wick - Kapitel 3 (2019) [Version 2.mkv"
};
var result = _videoListResolver.Resolve(files.Select(i => new FileSystemMetadata
{
IsDirectory = false,
FullName = i
}).ToList()).ToList();
Assert.Equal(2, result.Count);
}
[Fact]
public void TestEmptyList()
{