The Free Software Media System - Server Backend & API
Backport pull request #16227 from jellyfin/release-10.11.z
dfederma37e83d44859
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.csindex d2a3290c47..2ecb6cbdff 100644--- a/MediaBrowser.Controller/Entities/Folder.cs+++ b/MediaBrowser.Controller/Entities/Folder.cs@@ -452,6 +452,7 @@ namespace MediaBrowser.Controller.Entities// That's all the new and changed ones - now see if any have been removed and need cleanupvar itemsRemoved = currentChildren.Values.Except(validChildren).ToList();var shouldRemove = !IsRoot || allowRemoveRoot;+ var actuallyRemoved = new List<BaseItem>();// If it's an AggregateFolder, don't removeif (shouldRemove && itemsRemoved.Count > 0){@@ -467,6 +468,7 @@ namespace MediaBrowser.Controller.Entities{Logger.LogDebug("Removed item: {Path}", item.Path);+ actuallyRemoved.Add(item);item.SetParent(null);LibraryManager.DeleteItem(item, new DeleteOptions { DeleteFileLocation = false }, this, false);}@@ -477,6 +479,20 @@ namespace MediaBrowser.Controller.Entities{LibraryManager.CreateItems(newItems, this, cancellationToken);}++ // After removing items, reattach any detached user data to remaining children+ // that share the same user data keys (eg. same episode replaced with a new file).+ if (actuallyRemoved.Count > 0)+ {+ var removedKeys = actuallyRemoved.SelectMany(i => i.GetUserDataKeys()).ToHashSet();+ foreach (var child in validChildren)+ {+ if (child.GetUserDataKeys().Any(removedKeys.Contains))+ {+ await child.ReattachUserDataAsync(cancellationToken).ConfigureAwait(false);+ }+ }+ }}else{