aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2021-03-16 14:38:29 +0100
committerJoshua M. Boniface <joshua@boniface.me>2021-03-21 19:10:13 -0400
commit966217e6a9327becd2aad89dc10cc6a9cc756740 (patch)
treeedb6355ec4baf2cac32575d339054951d6fc0a92
parent328bcadabf6d9bc4301912a8e05015b5a6886916 (diff)
Merge pull request #5550 from cvium/revert_underscore_multiversion
(cherry picked from commit f42cee4790e8093e732166b17509cfba25d00a71) Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
-rw-r--r--Emby.Naming/Video/VideoListResolver.cs1
-rw-r--r--tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs7
2 files changed, 2 insertions, 6 deletions
diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs
index e31542634..6d2530a87 100644
--- a/Emby.Naming/Video/VideoListResolver.cs
+++ b/Emby.Naming/Video/VideoListResolver.cs
@@ -236,7 +236,6 @@ namespace Emby.Naming.Video
// The CleanStringParser should have removed common keywords etc.
return string.IsNullOrEmpty(testFilename)
|| testFilename[0] == '-'
- || testFilename[0] == '_'
|| Regex.IsMatch(testFilename, @"^\[([^]]*)\]");
}
diff --git a/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs b/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
index f2e478550..0b0994484 100644
--- a/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
@@ -327,12 +327,9 @@ namespace Jellyfin.Naming.Tests.Video
FullName = i
}).ToList()).ToList();
- Assert.Single(result);
+ Assert.Equal(7, result.Count);
Assert.Empty(result[0].Extras);
- Assert.Equal(6, result[0].AlternateVersions.Count);
- Assert.False(result[0].AlternateVersions[2].Is3D);
- Assert.True(result[0].AlternateVersions[3].Is3D);
- Assert.True(result[0].AlternateVersions[4].Is3D);
+ Assert.Empty(result[0].AlternateVersions);
}
[Fact]