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 PR comments

Browse Source
This commit is contained in:
ignacio laborde 2022-01-04 13:57:19 -03:00 committed by jgriff6
parent c6bf6e00de
commit 5cd37686ac
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ namespace Emby.Naming.Video
.Where(i => i.ExtraType == null) .Where(i => i.ExtraType == null)
.Select(i => new FileSystemMetadata { FullName = i.Path, IsDirectory = i.IsDirectory }); .Select(i => new FileSystemMetadata { FullName = i.Path, IsDirectory = i.IsDirectory });
var stackResult = StackResolver.Resolve(nonExtras, namingOptions); var stackResult = StackResolver.Resolve(nonExtras, namingOptions).ToList();
var remainingFiles = new List<VideoFileInfo>(); var remainingFiles = new List<VideoFileInfo>();
var standaloneMedia = new List<VideoFileInfo>(); var standaloneMedia = new List<VideoFileInfo>();

4
Emby.Server.Implementations/Collections/CollectionManager.cs
View File

@ -210,7 +210,7 @@ namespace Emby.Server.Implementations.Collections
var itemList = new List<BaseItem>(); var itemList = new List<BaseItem>();
var linkedChildrenList = collection.GetLinkedChildren(); var linkedChildrenList = collection.GetLinkedChildren();
var currentLinkedChildrenIds = linkedChildrenList.Select(i => i.Id); var currentLinkedChildrenIds = linkedChildrenList.Select(i => i.Id).ToList();
foreach (var id in ids) foreach (var id in ids)
{ {
@ -300,7 +300,7 @@ namespace Emby.Server.Implementations.Collections
{ {
var results = new Dictionary<Guid, BaseItem>(); var results = new Dictionary<Guid, BaseItem>();
var allBoxSets = GetCollections(user); var allBoxSets = GetCollections(user).ToList();
foreach (var item in items) foreach (var item in items)
{ {

5
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -356,7 +356,7 @@ namespace Emby.Server.Implementations.Library
} }
var children = item.IsFolder var children = item.IsFolder
? ((Folder)item).GetRecursiveChildren(false) ? ((Folder)item).GetRecursiveChildren(false).ToList()
: new List<BaseItem>(); : new List<BaseItem>();
foreach (var metadataPath in GetMetadataPaths(item, children)) foreach (var metadataPath in GetMetadataPaths(item, children))
@ -612,7 +612,8 @@ namespace Emby.Server.Implementations.Library
var list = originalList.Where(i => i.IsDirectory) var list = originalList.Where(i => i.IsDirectory)
.Select(i => _fileSystem.NormalizePath(i.FullName)) .Select(i => _fileSystem.NormalizePath(i.FullName))
.Distinct(StringComparer.OrdinalIgnoreCase); .Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
var dupes = list.Where(subPath => !subPath.EndsWith(":\\", StringComparison.OrdinalIgnoreCase) && list.Any(i => _fileSystem.ContainsSubPath(i, subPath))); var dupes = list.Where(subPath => !subPath.EndsWith(":\\", StringComparison.OrdinalIgnoreCase) && list.Any(i => _fileSystem.ContainsSubPath(i, subPath)));