From 58a7829ecd773dbc3c875d3f0d4438b847fd54b5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 25 Nov 2017 23:48:12 -0500
Subject: update library changed notifier

---
 .../EntryPoints/LibraryChangedNotifier.cs          | 36 ++++++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

(limited to 'Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs')

diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index 299da0744..0e771cbec 100644
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -260,7 +260,7 @@ namespace Emby.Server.Implementations.EntryPoints
                     LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite);
                 }
 
-                var parent = e.Item.GetParent() as Folder;
+                var parent = e.Parent as Folder;
                 if (parent != null)
                 {
                     _foldersRemovedFrom.Add(parent);
@@ -363,10 +363,16 @@ namespace Emby.Server.Implementations.EntryPoints
         /// <param name="foldersRemovedFrom">The folders removed from.</param>
         /// <param name="userId">The user id.</param>
         /// <returns>LibraryUpdateInfo.</returns>
-        private LibraryUpdateInfo GetLibraryUpdateInfo(IEnumerable<BaseItem> itemsAdded, IEnumerable<BaseItem> itemsUpdated, IEnumerable<BaseItem> itemsRemoved, IEnumerable<Folder> foldersAddedTo, IEnumerable<Folder> foldersRemovedFrom, Guid userId)
+        private LibraryUpdateInfo GetLibraryUpdateInfo(List<BaseItem> itemsAdded, List<BaseItem> itemsUpdated, List<BaseItem> itemsRemoved, List<Folder> foldersAddedTo, List<Folder> foldersRemovedFrom, Guid userId)
         {
             var user = _userManager.GetUserById(userId);
 
+            var newAndRemoved = new List<BaseItem>();
+            newAndRemoved.AddRange(foldersAddedTo);
+            newAndRemoved.AddRange(foldersRemovedFrom);
+
+            var allUserRootChildren = _libraryManager.GetUserRootFolder().GetChildren(user, true).OfType<Folder>().ToList();
+
             return new LibraryUpdateInfo
             {
                 ItemsAdded = itemsAdded.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user)).Select(i => i.Id.ToString("N")).Distinct().ToArray(),
@@ -377,7 +383,9 @@ namespace Emby.Server.Implementations.EntryPoints
 
                 FoldersAddedTo = foldersAddedTo.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user)).Select(i => i.Id.ToString("N")).Distinct().ToArray(),
 
-                FoldersRemovedFrom = foldersRemovedFrom.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user)).Select(i => i.Id.ToString("N")).Distinct().ToArray()
+                FoldersRemovedFrom = foldersRemovedFrom.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user)).Select(i => i.Id.ToString("N")).Distinct().ToArray(),
+
+                CollectionFolders = GetTopParentIds(newAndRemoved, user, allUserRootChildren).ToArray()
             };
         }
 
@@ -396,6 +404,28 @@ namespace Emby.Server.Implementations.EntryPoints
             return item.SourceType == SourceType.Library;
         }
 
+        private IEnumerable<string> GetTopParentIds(List<BaseItem> items, User user, List<Folder> allUserRootChildren)
+        {
+            var list = new List<string>();
+
+            foreach (var item in items)
+            {
+                // If the physical root changed, return the user root
+                if (item is AggregateFolder)
+                {
+                    continue;
+                }
+
+                var collectionFolders = _libraryManager.GetCollectionFolders(item, allUserRootChildren);
+                foreach (var folder in allUserRootChildren)
+                {
+                    list.Add(folder.Id.ToString("N"));
+                }
+            }
+
+            return list.Distinct(StringComparer.Ordinal);
+        }
+
         /// <summary>
         /// Translates the physical item to user library.
         /// </summary>
-- 
cgit v1.2.3