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

Clean up Emby.Naming

Browse Source
This commit is contained in:
Bond_009
2020-01-22 22:18:56 +01:00
parent 6eac7f0fa7
commit dc62e436c4
27 changed files with 287 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
View File

@@ -60,7 +60,7 @@ namespace Jellyfin.Naming.Tests.Music
{
var parser = new AlbumParser(new NamingOptions());
return parser.ParseMultiPart(path).IsMultiPart;
return parser.IsMultiPart(path);
}
}
}

3
tests/Jellyfin.Naming.Tests/TV/SeasonFolderTests.cs
View File

@@ -103,8 +103,7 @@ namespace Jellyfin.Naming.Tests.TV
private int? GetSeasonNumberFromPath(string path)
{
var result = new SeasonPathParser()
.Parse(path, true, true);
var result = SeasonPathParser.Parse(path, true, true);
return result.SeasonNumber;
}

130
tests/Jellyfin.Naming.Tests/Video/StackTests.cs
View File

@@ -1,4 +1,5 @@
using Emby.Naming.Common;
using System.Linq;
using Emby.Naming.Common;
using Emby.Naming.Video;
using MediaBrowser.Model.IO;
using Xunit;
@@ -21,10 +22,10 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Single(result.Stacks);
TestStackInfo(result.Stacks[0], "Bad Boys (2006)", 4);
Assert.Single(result);
TestStackInfo(result[0], "Bad Boys (2006)", 4);
}
[Fact]
@@ -38,9 +39,9 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Empty(result.Stacks);
Assert.Empty(result);
}
[Fact]
@@ -54,9 +55,9 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Empty(result.Stacks);
Assert.Empty(result);
}
[Fact]
@@ -70,9 +71,9 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Empty(result.Stacks);
Assert.Empty(result);
}
[Fact]
@@ -86,9 +87,9 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Empty(result.Stacks);
Assert.Empty(result);
}
[Fact]
@@ -102,9 +103,8 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
Assert.Empty(result.Stacks);
var result = resolver.ResolveFiles(files).ToList();
Assert.Empty(result);
}
[Fact]
@@ -119,9 +119,9 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Empty(result.Stacks);
Assert.Empty(result);
}
[Fact]
@@ -135,10 +135,10 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Single(result.Stacks);
TestStackInfo(result.Stacks[0], "300 2006", 2);
Assert.Single(result);
TestStackInfo(result[0], "300 2006", 2);
}
[Fact]
@@ -155,10 +155,10 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Single(result.Stacks);
TestStackInfo(result.Stacks[0], "Bad Boys (2006).stv.unrated.multi.1080p.bluray.x264-rough", 4);
Assert.Single(result);
TestStackInfo(result[0], "Bad Boys (2006).stv.unrated.multi.1080p.bluray.x264-rough", 4);
}
[Fact]
@@ -175,9 +175,9 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Empty(result.Stacks);
Assert.Empty(result);
}
[Fact]
@@ -194,10 +194,10 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Single(result.Stacks);
TestStackInfo(result.Stacks[0], "300 (2006)", 4);
Assert.Single(result);
TestStackInfo(result[0], "300 (2006)", 4);
}
[Fact]
@@ -214,10 +214,10 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Single(result.Stacks);
TestStackInfo(result.Stacks[0], "Bad Boys (2006)", 3);
Assert.Single(result);
TestStackInfo(result[0], "Bad Boys (2006)", 3);
}
[Fact]
@@ -238,11 +238,11 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Equal(2, result.Stacks.Count);
TestStackInfo(result.Stacks[1], "Bad Boys (2006)", 4);
TestStackInfo(result.Stacks[0], "300 (2006)", 3);
Assert.Equal(2, result.Count);
TestStackInfo(result[1], "Bad Boys (2006)", 4);
TestStackInfo(result[0], "300 (2006)", 3);
}
[Fact]
@@ -256,10 +256,10 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveDirectories(files);
var result = resolver.ResolveDirectories(files).ToList();
Assert.Single(result.Stacks);
TestStackInfo(result.Stacks[0], "blah blah", 2);
Assert.Single(result);
TestStackInfo(result[0], "blah blah", 2);
}
[Fact]
@@ -275,11 +275,11 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Single(result.Stacks);
Assert.Single(result);
TestStackInfo(result.Stacks[0], "300", 3);
TestStackInfo(result[0], "300", 3);
}
[Fact]
@@ -297,12 +297,12 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Equal(2, result.Stacks.Count);
Assert.Equal(2, result.Count);
TestStackInfo(result.Stacks[0], "300", 2);
TestStackInfo(result.Stacks[1], "Avengers", 3);
TestStackInfo(result[0], "300", 2);
TestStackInfo(result[1], "Avengers", 3);
}
[Fact]
@@ -328,13 +328,13 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Equal(3, result.Stacks.Count);
Assert.Equal(3, result.Count);
TestStackInfo(result.Stacks[0], "300 (2006)", 4);
TestStackInfo(result.Stacks[1], "300", 3);
TestStackInfo(result.Stacks[2], "Bad Boys (2006)", 4);
TestStackInfo(result[0], "300 (2006)", 4);
TestStackInfo(result[1], "300", 3);
TestStackInfo(result[2], "Bad Boys (2006)", 4);
}
[Fact]
@@ -354,11 +354,11 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Single(result.Stacks);
Assert.Single(result);
TestStackInfo(result.Stacks[0], "300 (2006)", 4);
TestStackInfo(result[0], "300 (2006)", 4);
}
[Fact]
@@ -375,11 +375,11 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.Resolve(files);
var result = resolver.Resolve(files).ToList();
Assert.Equal(2, result.Stacks.Count);
TestStackInfo(result.Stacks[0], "300 (2006)", 3);
TestStackInfo(result.Stacks[1], "Bad Boys (2006)", 2);
Assert.Equal(2, result.Count);
TestStackInfo(result[0], "300 (2006)", 3);
TestStackInfo(result[1], "Bad Boys (2006)", 2);
}
[Fact]
@@ -397,9 +397,9 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Empty(result.Stacks);
Assert.Empty(result);
}
[Fact]
@@ -414,10 +414,10 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveFiles(files);
var result = resolver.ResolveFiles(files).ToList();
Assert.Single(result.Stacks);
Assert.Equal(2, result.Stacks[0].Files.Count);
Assert.Single(result);
Assert.Equal(2, result[0].Files.Count);
}
[Fact]
@@ -432,10 +432,10 @@ namespace Jellyfin.Naming.Tests.Video
var resolver = GetResolver();
var result = resolver.ResolveDirectories(files);
var result = resolver.ResolveDirectories(files).ToList();
Assert.Single(result.Stacks);
Assert.Equal(2, result.Stacks[0].Files.Count);
Assert.Single(result);
Assert.Equal(2, result[0].Files.Count);
}
private void TestStackInfo(FileStack stack, string name, int fileCount)

10
tests/Jellyfin.Naming.Tests/Video/StubTests.cs
View File

@@ -38,17 +38,17 @@ namespace Jellyfin.Naming.Tests.Video
{
var options = new NamingOptions();
var resultStubType = StubResolver.ResolveFile(path, options);
var isStubResult = StubResolver.TryResolveFile(path, options, out var stubTypeResult);
Assert.Equal(isStub, resultStubType.IsStub);
Assert.Equal(isStub, isStubResult);
if (stubType == null)
if (isStub)
{
Assert.Null(resultStubType.StubType);
Assert.Equal(stubType, stubTypeResult);
}
else
{
Assert.Equal(stubType, resultStubType.StubType, true);
Assert.Null(stubTypeResult);
}
}
}