alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-04 21:32:53 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix multiversion eligibility check for complex folder names

Browse Source
This commit is contained in:
cvium
2021-03-10 10:47:35 +01:00
parent 94db751f4b
commit 3824c09e77
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,20 +221,23 @@ namespace Emby.Naming.Video
string testFilename = Path.GetFileNameWithoutExtension(testFilePath);
if (testFilename.StartsWith(folderName, StringComparison.OrdinalIgnoreCase))
{
if (CleanStringParser.TryClean(testFilename, _options.CleanStringRegexes, out var cleanName))
{
testFilename = cleanName.ToString();
}
// Remove the folder name before cleaning as we don't care about cleaning that part
if (folderName.Length <= testFilename.Length)
{
testFilename = testFilename.Substring(folderName.Length).Trim();
}
if (CleanStringParser.TryClean(testFilename, _options.CleanStringRegexes, out var cleanName))
{
testFilename = cleanName.ToString();
}
// The CleanStringParser should have removed common keywords etc., so if it starts with -, _ or [ it's eligible.
return string.IsNullOrEmpty(testFilename)
|| testFilename[0] == '-'
|| testFilename[0] == '_'
|| string.IsNullOrWhiteSpace(Regex.Replace(testFilename, @"\[([^]]*)\]", string.Empty));
|| testFilename[0] == '-'
|| testFilename[0] == '_'
|| testFilename[0] == '['
|| string.IsNullOrWhiteSpace(Regex.Replace(testFilename, @"\[([^]]*)\]", string.Empty));
}
return false;