Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5550 from cvium/revert_underscore_multiversion

Browse Source 
(cherry picked from commit f42cee4790e8093e732166b17509cfba25d00a71)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Bond-009 2021-03-16 14:38:29 +01:00 committed by Joshua M. Boniface
parent 328bcadabf
commit 966217e6a9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,6 @@ namespace Emby.Naming.Video
// The CleanStringParser should have removed common keywords etc. // The CleanStringParser should have removed common keywords etc.
return string.IsNullOrEmpty(testFilename) return string.IsNullOrEmpty(testFilename)
|| testFilename[0] == '-' || testFilename[0] == '-'
|| testFilename[0] == '_'
|| Regex.IsMatch(testFilename, @"^\[([^]]*)\]"); || Regex.IsMatch(testFilename, @"^\[([^]]*)\]");
} }

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

@ -327,12 +327,9 @@ namespace Jellyfin.Naming.Tests.Video
FullName = i FullName = i
}).ToList()).ToList(); }).ToList()).ToList();
Assert.Single(result); Assert.Equal(7, result.Count);
Assert.Empty(result[0].Extras); Assert.Empty(result[0].Extras);
Assert.Equal(6, result[0].AlternateVersions.Count); Assert.Empty(result[0].AlternateVersions);
Assert.False(result[0].AlternateVersions[2].Is3D);
Assert.True(result[0].AlternateVersions[3].Is3D);
Assert.True(result[0].AlternateVersions[4].Is3D);
} }
[Fact] [Fact]