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

Address comments

Browse Source
This commit is contained in:
Bond_009 2020-04-25 15:29:59 +02:00
parent 851dda097e
commit a273ed9a57
2 changed files with 151 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Naming/Video/VideoResolver.cs
View File

@ -93,7 +93,7 @@ namespace Emby.Naming.Video
year = cleanDateTimeResult.Year; year = cleanDateTimeResult.Year;
if (extraResult.ExtraType == null if (extraResult.ExtraType == null
&& TryCleanString(cleanDateTimeResult.Name, out ReadOnlySpan<char> newName)) && TryCleanString(name, out ReadOnlySpan<char> newName))
{ {
name = newName.ToString(); name = newName.ToString();
} }

305
tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs
View File

@ -1,5 +1,4 @@
using System.Collections; using System.Collections.Generic;
using System.Collections.Generic;
using Emby.Naming.Common; using Emby.Naming.Common;
using Emby.Naming.Video; using Emby.Naming.Video;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
@ -11,179 +10,175 @@ namespace Jellyfin.Naming.Tests.Video
{ {
private readonly NamingOptions _namingOptions = new NamingOptions(); private readonly NamingOptions _namingOptions = new NamingOptions();
private class ResolveFileTestData : IEnumerable<object[]> public static IEnumerable<object[]> GetResolveFileTestData()
{ {
public IEnumerator<object[]> GetEnumerator() yield return new object[]
{ {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/7 Psychos.mkv/7 Psychos.mkv",
{ Container = "mkv",
Path = @"/server/Movies/7 Psychos.mkv/7 Psychos.mkv", Name = "7 Psychos"
Container = "mkv", }
Name = "7 Psychos" };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/3 days to kill (2005)/3 days to kill (2005).mkv",
{ Container = "mkv",
Path = @"/server/Movies/3 days to kill (2005)/3 days to kill (2005).mkv", Name = "3 days to kill",
Container = "mkv", Year = 2005
Name = "3 days to kill", }
Year = 2005 };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/American Psycho/American.Psycho.mkv",
{ Container = "mkv",
Path = @"/server/Movies/American Psycho/American.Psycho.mkv", Name = "American.Psycho",
Container = "mkv", }
Name = "American.Psycho", };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/brave (2007)/brave (2006).3d.sbs.mkv",
{ Container = "mkv",
Path = @"/server/Movies/brave (2007)/brave (2006).3d.sbs.mkv", Name = "brave",
Container = "mkv", Year = 2006,
Name = "brave", Is3D = true,
Year = 2006, Format3D = "sbs",
Is3D = true, }
Format3D = "sbs", };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/300 (2007)/300 (2006).3d1.sbas.mkv",
{ Container = "mkv",
Path = @"/server/Movies/300 (2007)/300 (2006).3d1.sbas.mkv", Name = "300",
Container = "mkv", Year = 2006
Name = "300", }
Year = 2006 };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/300 (2007)/300 (2006).3d.sbs.mkv",
{ Container = "mkv",
Path = @"/server/Movies/300 (2007)/300 (2006).3d.sbs.mkv", Name = "300",
Container = "mkv", Year = 2006,
Name = "300", Is3D = true,
Year = 2006, Format3D = "sbs",
Is3D = true, }
Format3D = "sbs", };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/brave (2007)/brave (2006)-trailer.bluray.disc",
{ Container = "disc",
Path = @"/server/Movies/brave (2007)/brave (2006)-trailer.bluray.disc", Name = "brave",
Container = "disc", Year = 2006,
Name = "brave", IsStub = true,
Year = 2006, StubType = "bluray",
IsStub = true, }
StubType = "bluray", };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/300 (2007)/300 (2006)-trailer.bluray.disc",
{ Container = "disc",
Path = @"/server/Movies/300 (2007)/300 (2006)-trailer.bluray.disc", Name = "300",
Container = "disc", Year = 2006,
Name = "300", IsStub = true,
Year = 2006, StubType = "bluray",
IsStub = true, }
StubType = "bluray", };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/Brave (2007)/Brave (2006).bluray.disc",
{ Container = "disc",
Path = @"/server/Movies/Brave (2007)/Brave (2006).bluray.disc", Name = "Brave",
Container = "disc", Year = 2006,
Name = "Brave", IsStub = true,
Year = 2006, StubType = "bluray",
IsStub = true, }
StubType = "bluray", };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/300 (2007)/300 (2006).bluray.disc",
{ Container = "disc",
Path = @"/server/Movies/300 (2007)/300 (2006).bluray.disc", Name = "300",
Container = "disc", Year = 2006,
Name = "300", IsStub = true,
Year = 2006, StubType = "bluray",
IsStub = true, }
StubType = "bluray", };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/300 (2007)/300 (2006)-trailer.mkv",
{ Container = "mkv",
Path = @"/server/Movies/300 (2007)/300 (2006)-trailer.mkv", Name = "300",
Container = "mkv", Year = 2006,
Name = "300", ExtraType = ExtraType.Trailer,
Year = 2006, }
ExtraType = ExtraType.Trailer, };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/Brave (2007)/Brave (2006)-trailer.mkv",
{ Container = "mkv",
Path = @"/server/Movies/Brave (2007)/Brave (2006)-trailer.mkv", Name = "Brave",
Container = "mkv", Year = 2006,
Name = "Brave", ExtraType = ExtraType.Trailer,
Year = 2006, }
ExtraType = ExtraType.Trailer, };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/300 (2007)/300 (2006).mkv",
{ Container = "mkv",
Path = @"/server/Movies/300 (2007)/300 (2006).mkv", Name = "300",
Container = "mkv", Year = 2006
Name = "300", }
Year = 2006 };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/Bad Boys (1995)/Bad Boys (1995).mkv",
{ Container = "mkv",
Path = @"/server/Movies/Bad Boys (1995)/Bad Boys (1995).mkv", Name = "Bad Boys",
Container = "mkv", Year = 1995,
Name = "Bad Boys", }
Year = 1995, };
} yield return new object[]
}; {
yield return new object[] new VideoFileInfo()
{ {
new VideoFileInfo() Path = @"/server/Movies/Brave (2007)/Brave (2006).mkv",
{ Container = "mkv",
Path = @"/server/Movies/Brave (2007)/Brave (2006).mkv", Name = "Brave",
Container = "mkv", Year = 2006,
Name = "Brave", }
Year = 2006, };
}
};
}
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
} }
[Theory] [Theory]
[ClassData(typeof(ResolveFileTestData))] [MemberData(nameof(GetResolveFileTestData))]
public void ResolveFile_ValidFileName_Success(VideoFileInfo expectedResult) public void ResolveFile_ValidFileName_Success(VideoFileInfo expectedResult)
{ {
var result = new VideoResolver(_namingOptions).ResolveFile(expectedResult.Path); var result = new VideoResolver(_namingOptions).ResolveFile(expectedResult.Path);