lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
This commit is contained in:
martinek-stepan 2020-11-12 12:54:55 +01:00 committed by GitHub
parent 195a6261c4
commit 496923719c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Naming/AudioBook/AudioBookListResolver.cs
View File

@ -33,7 +33,7 @@ namespace Emby.Naming.AudioBook
{
var audioBookResolver = new AudioBookResolver(_options);
// File with empty fullname will be sorted out here
// File with empty fullname will be sorted out here.
var audiobookFileInfos = files
.Select(i => audioBookResolver.Resolve(i.FullName))
.OfType<AudioBookFileInfo>()
@ -139,8 +139,8 @@ namespace Emby.Naming.AudioBook
private AudioBookFileInfo FindMainAudioBookFile(List<AudioBookFileInfo> files, string name)
{
var main = files.Find(x => Path.GetFileNameWithoutExtension(x.Path) == name);
main ??= files.FirstOrDefault(x => Path.GetFileNameWithoutExtension(x.Path) == "audiobook");
var main = files.Find(x => Path.GetFileNameWithoutExtension(x.Path).Equals(name));
main ??= files.FirstOrDefault(x => Path.GetFileNameWithoutExtension(x.Path).Equals("audiobook"));
main ??= files.OrderBy(x => x.Container)
.ThenBy(x => x.Path)
.First();

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

@ -147,7 +147,7 @@ namespace Emby.Naming.Video
}
// If there's only one video, accept all trailers
// Be lenient because people use all kinds of mishmash conventions with trailers
// Be lenient because people use all kinds of mishmash conventions with trailers.
if (list.Count == 1)
{
var trailers = remainingFiles
@ -231,7 +231,7 @@ namespace Emby.Naming.Video
testFilename = testFilename.Substring(folderName.Length).Trim();
return string.IsNullOrEmpty(testFilename)
|| testFilename[0] == '-'
|| testFilename[0] == '_'
|| testFilename[0].Equals( '_')
|| string.IsNullOrWhiteSpace(Regex.Replace(testFilename, @"\[([^]]*)\]", string.Empty));
}