michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

for for web socket sending the root folder

Browse Source
This commit is contained in:
Luke Pulverenti 2013-05-24 23:22:45 -04:00
parent 2765ff58bc
commit 8ed35a00aa
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/CollectionFolder.cs
View File

@ -79,7 +79,7 @@ namespace MediaBrowser.Controller.Entities
{ {
// Accessing ResolveArgs could involve file system access // Accessing ResolveArgs could involve file system access
folderIds = ResolveArgs.PhysicalLocations folderIds = ResolveArgs.PhysicalLocations
.Select(f => (f.GetMBId(typeof(Folder)))) .Select(f => f.GetMBId(typeof(Folder)))
.ToDictionary(i => i); .ToDictionary(i => i);
} }
catch (IOException ex) catch (IOException ex)

21
MediaBrowser.ServerApplication/EntryPoints/LibraryChangedNotifier.cs
View File

@ -249,7 +249,7 @@ namespace MediaBrowser.ServerApplication.EntryPoints
/// <param name="collections">The collections.</param> /// <param name="collections">The collections.</param>
/// <param name="allRecursiveChildren">All recursive children.</param> /// <param name="allRecursiveChildren">All recursive children.</param>
/// <returns>IEnumerable{``0}.</returns> /// <returns>IEnumerable{``0}.</returns>
private IEnumerable<T> TranslatePhysicalItemToUserLibrary<T>(T item, User user, List<BaseItem> collections, Dictionary<Guid, BaseItem> allRecursiveChildren) private IEnumerable<T> TranslatePhysicalItemToUserLibrary<T>(T item, User user, IEnumerable<BaseItem> collections, Dictionary<Guid, BaseItem> allRecursiveChildren)
where T : BaseItem where T : BaseItem
{ {
// If the physical root changed, return the user root // If the physical root changed, return the user root
@ -261,7 +261,24 @@ namespace MediaBrowser.ServerApplication.EntryPoints
// Need to find what user collection folder this belongs to // Need to find what user collection folder this belongs to
if (item.Parent is AggregateFolder) if (item.Parent is AggregateFolder)
{ {
return new T[] { user.RootFolder as T }; if (item.LocationType == LocationType.FileSystem)
{
return collections.Where(i =>
{
try
{
return i.LocationType == LocationType.FileSystem &&
i.ResolveArgs.PhysicalLocations.Contains(item.Path);
}
catch (Exception ex)
{
_logger.ErrorException("Error getting ResolveArgs for {0}", ex, i.Path);
return false;
}
}).Cast<T>();
}
} }
// If it's a user root, return it only if it's the right one // If it's a user root, return it only if it's the right one