alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-17 11:43:44 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

update to jstree 3.0.8

Browse Source
This commit is contained in:
Luke Pulverenti
2014-12-20 20:23:56 -05:00
parent 0a8291d39b
commit 7b0306dce7
9 changed files with 59 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1563,14 +1563,11 @@ namespace MediaBrowser.Server.Implementations.Library
return null;
}
var collectionTypes = GetUserRootFolder().Children
return GetUserRootFolder().Children
.OfType<ICollectionFolder>()
.Where(i => !string.IsNullOrEmpty(i.CollectionType) && (string.Equals(i.Path, item.Path, StringComparison.OrdinalIgnoreCase) || i.PhysicalLocations.Contains(item.Path)))
.Where(i => string.Equals(i.Path, item.Path, StringComparison.OrdinalIgnoreCase) || i.PhysicalLocations.Contains(item.Path))
.Select(i => i.CollectionType)
.Distinct()
.ToList();
return collectionTypes.Count == 1 ? collectionTypes[0] : null;
.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
}
public async Task<UserView> GetNamedView(string name,
@@ -1717,7 +1714,7 @@ namespace MediaBrowser.Server.Implementations.Library
new Naming.Logging.NullLogger());
var locationType = episode.LocationType;
var fileType = /*args.IsDirectory ? FileInfoType.Directory :*/ FileInfoType.File;
var episodeInfo = locationType == LocationType.FileSystem || locationType == LocationType.Offline ?
resolver.Resolve(episode.Path, fileType) :