From 966217e6a9327becd2aad89dc10cc6a9cc756740 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Tue, 16 Mar 2021 14:38:29 +0100 Subject: [PATCH] Merge pull request #5550 from cvium/revert_underscore_multiversion (cherry picked from commit f42cee4790e8093e732166b17509cfba25d00a71) Signed-off-by: Joshua M. Boniface --- Emby.Naming/Video/VideoListResolver.cs | 1 - tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs index e31542634e..6d2530a877 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 f2e478550e..0b0994484a 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]