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

fixes #388 - LibraryChanged message not reporting ItemsRemoved properly

Browse Source
This commit is contained in:
Luke Pulverenti 2013-07-29 12:03:19 -04:00
parent 9a116a8575
commit 2646ce696b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
View File

@ -46,7 +46,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
/// <summary> /// <summary>
/// The library update duration /// The library update duration
/// </summary> /// </summary>
private const int LibraryUpdateDuration = 60000; private const int LibraryUpdateDuration = 20000;
public LibraryChangedNotifier(ILibraryManager libraryManager, ISessionManager sessionManager, IServerManager serverManager, IUserManager userManager, ILogger logger) public LibraryChangedNotifier(ILibraryManager libraryManager, ISessionManager sessionManager, IServerManager serverManager, IUserManager userManager, ILogger logger)
{ {
@ -239,7 +239,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
ItemsUpdated = itemsUpdated.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(), ItemsUpdated = itemsUpdated.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(),
ItemsRemoved = itemsRemoved.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(), ItemsRemoved = itemsRemoved.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren, true)).Select(i => i.Id).Distinct().ToList(),
FoldersAddedTo = foldersAddedTo.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(), FoldersAddedTo = foldersAddedTo.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(),
@ -255,14 +255,15 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
/// <param name="user">The user.</param> /// <param name="user">The user.</param>
/// <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>
/// <param name="includeIfNotFound">if set to <c>true</c> [include if not found].</param>
/// <returns>IEnumerable{``0}.</returns> /// <returns>IEnumerable{``0}.</returns>
private IEnumerable<T> TranslatePhysicalItemToUserLibrary<T>(T item, User user, IEnumerable<BaseItem> collections, Dictionary<Guid, BaseItem> allRecursiveChildren) private IEnumerable<T> TranslatePhysicalItemToUserLibrary<T>(T item, User user, IEnumerable<BaseItem> collections, Dictionary<Guid, BaseItem> allRecursiveChildren, bool includeIfNotFound = false)
where T : BaseItem where T : BaseItem
{ {
// If the physical root changed, return the user root // If the physical root changed, return the user root
if (item is AggregateFolder) if (item is AggregateFolder)
{ {
return new T[] { user.RootFolder as T }; return new[] { user.RootFolder as T };
} }
// Need to find what user collection folder this belongs to // Need to find what user collection folder this belongs to
@ -300,9 +301,9 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
} }
// Return it only if it's in the user's library // Return it only if it's in the user's library
if (allRecursiveChildren.ContainsKey(item.Id)) if (includeIfNotFound || allRecursiveChildren.ContainsKey(item.Id))
{ {
return new T[] { item }; return new[] { item };
} }
return new T[] { }; return new T[] { };