alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-31 12:58:28 +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

21
Emby.Naming/Video/StackResolver.cs
View File

@@ -20,7 +20,7 @@ namespace Emby.Naming.Video
_options = options;
}
public StackResult ResolveDirectories(IEnumerable<string> files)
public IEnumerable<FileStack> ResolveDirectories(IEnumerable<string> files)
{
return Resolve(files.Select(i => new FileSystemMetadata
{
@@ -29,7 +29,7 @@ namespace Emby.Naming.Video
}));
}
public StackResult ResolveFiles(IEnumerable<string> files)
public IEnumerable<FileStack> ResolveFiles(IEnumerable<string> files)
{
return Resolve(files.Select(i => new FileSystemMetadata
{
@@ -38,9 +38,8 @@ namespace Emby.Naming.Video
}));
}
public StackResult ResolveAudioBooks(IEnumerable<FileSystemMetadata> files)
public IEnumerable<FileStack> ResolveAudioBooks(IEnumerable<FileSystemMetadata> files)
{
var result = new StackResult();
foreach (var directory in files.GroupBy(file => file.IsDirectory ? file.FullName : Path.GetDirectoryName(file.FullName)))
{
var stack = new FileStack()
@@ -58,20 +57,16 @@ namespace Emby.Naming.Video
stack.Files.Add(file.FullName);
}
result.Stacks.Add(stack);
yield return stack;
}
return result;
}
public StackResult Resolve(IEnumerable<FileSystemMetadata> files)
public IEnumerable<FileStack> Resolve(IEnumerable<FileSystemMetadata> files)
{
var result = new StackResult();
var resolver = new VideoResolver(_options);
var list = files
.Where(i => i.IsDirectory || (resolver.IsVideoFile(i.FullName) || resolver.IsStubFile(i.FullName)))
.Where(i => i.IsDirectory || resolver.IsVideoFile(i.FullName) || resolver.IsStubFile(i.FullName))
.OrderBy(i => i.FullName)
.ToList();
@@ -191,14 +186,12 @@ namespace Emby.Naming.Video
if (stack.Files.Count > 1)
{
result.Stacks.Add(stack);
yield return stack;
i += stack.Files.Count - 1;
break;
}
}
}
return result;
}
private string GetRegexInput(FileSystemMetadata file)