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

restore changes

Browse Source
This commit is contained in:
Luke Pulverenti 2015-11-13 15:56:26 -05:00
parent 0c0c017b2f
commit 73c772637e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -603,9 +603,9 @@ namespace MediaBrowser.Server.Implementations.Library
// Example: if \\server\movies exists, then strip out \\server\movies\action // Example: if \\server\movies exists, then strip out \\server\movies\action
if (isPhysicalRoot) if (isPhysicalRoot)
{ {
var paths = NormalizeRootPathList(fileSystemDictionary.Keys); var paths = NormalizeRootPathList(fileSystemDictionary.Values);
fileSystemDictionary = paths.Select(_fileSystem.GetDirectoryInfo).ToDictionary(i => i.FullName); fileSystemDictionary = paths.ToDictionary(i => i.FullName);
} }
args.FileSystemDictionary = fileSystemDictionary; args.FileSystemDictionary = fileSystemDictionary;
@ -625,9 +625,12 @@ namespace MediaBrowser.Server.Implementations.Library
return EntityResolutionIgnoreRules.Any(r => r.ShouldIgnore(file, parent)); return EntityResolutionIgnoreRules.Any(r => r.ShouldIgnore(file, parent));
} }
public IEnumerable<string> NormalizeRootPathList(IEnumerable<string> paths) public IEnumerable<FileSystemMetadata> NormalizeRootPathList(IEnumerable<FileSystemMetadata> paths)
{ {
var list = paths.Select(_fileSystem.NormalizePath) var originalList = paths.ToList();
var list = originalList.Where(i => i.IsDirectory)
.Select(i => _fileSystem.NormalizePath(i.FullName))
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.ToList(); .ToList();
@ -639,7 +642,9 @@ namespace MediaBrowser.Server.Implementations.Library
_logger.Info("Found duplicate path: {0}", dupe); _logger.Info("Found duplicate path: {0}", dupe);
} }
return list.Except(dupes, StringComparer.OrdinalIgnoreCase); var newList = list.Except(dupes, StringComparer.OrdinalIgnoreCase).Select(_fileSystem.GetDirectoryInfo).ToList();
newList.AddRange(originalList.Where(i => !i.IsDirectory));
return newList;
} }
/// <summary> /// <summary>