The Free Software Media System - Server Backend & API
Backport pull request #15899 from jellyfin/release-10.11.z
MarcoCoreDuo09edca8b7a91
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.mdindex 171509382d..1770db60be 100644--- a/CONTRIBUTORS.md+++ b/CONTRIBUTORS.md@@ -210,6 +210,7 @@- [bjorntp](https://github.com/bjorntp)- [martenumberto](https://github.com/martenumberto)- [ZeusCraft10](https://github.com/ZeusCraft10)+ - [MarcoCoreDuo](https://github.com/MarcoCoreDuo)# Emby Contributorsdiff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.csindex f35d85f659..bdf04edc2e 100644--- a/Emby.Server.Implementations/Library/LibraryManager.cs+++ b/Emby.Server.Implementations/Library/LibraryManager.cs@@ -2202,6 +2202,12 @@ namespace Emby.Server.Implementations.Librarypublic Task UpdateItemAsync(BaseItem item, BaseItem parent, ItemUpdateType updateReason, CancellationToken cancellationToken)=> UpdateItemsAsync([item], parent, updateReason, cancellationToken);+ /// <inheritdoc />+ public async Task ReattachUserDataAsync(BaseItem item, CancellationToken cancellationToken)+ {+ await _itemRepository.ReattachUserDataAsync(item, cancellationToken).ConfigureAwait(false);+ }+public async Task RunMetadataSavers(BaseItem item, ItemUpdateType updateReason){if (item.IsFileProtocol)diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.csindex 3b3d3c4f43..646a9c4836 100644--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs@@ -624,7 +624,6 @@ public sealed class BaseItemRepositoryvar ids = tuples.Select(f => f.Item.Id).ToArray();var existingItems = context.BaseItems.Where(e => ids.Contains(e.Id)).Select(f => f.Id).ToArray();- var newItems = tuples.Where(e => !existingItems.Contains(e.Item.Id)).ToArray();foreach (var item in tuples){@@ -658,19 +657,6 @@ public sealed class BaseItemRepositorycontext.SaveChanges();- foreach (var item in newItems)- {- // reattach old userData entries- var userKeys = item.UserDataKey.ToArray();- var retentionDate = (DateTime?)null;- context.UserData- .Where(e => e.ItemId == PlaceholderId)- .Where(e => userKeys.Contains(e.CustomDataKey))- .ExecuteUpdate(e => e- .SetProperty(f => f.ItemId, item.Item.Id)- .SetProperty(f => f.RetentionDate, retentionDate));- }-var itemValueMaps = tuples.Select(e => (e.Item, Values: GetItemValuesToSave(e.Item, e.InheritedTags))).ToArray();@@ -766,6 +752,29 @@ public sealed class BaseItemRepositorytransaction.Commit();}+ /// <inheritdoc />+ public async Task ReattachUserDataAsync(BaseItemDto item, CancellationToken cancellationToken)+ {+ ArgumentNullException.ThrowIfNull(item);+ cancellationToken.ThrowIfCancellationRequested();++ var dbContext = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);++ await using (dbContext.ConfigureAwait(false))+ {+ var userKeys = item.GetUserDataKeys().ToArray();+ var retentionDate = (DateTime?)null;+ await dbContext.UserData+ .Where(e => e.ItemId == PlaceholderId)+ .Where(e => userKeys.Contains(e.CustomDataKey))+ .ExecuteUpdateAsync(+ e => e+ .SetProperty(f => f.ItemId, item.Id)+ .SetProperty(f => f.RetentionDate, retentionDate),+ cancellationToken).ConfigureAwait(false);+ }+ }+/// <inheritdoc />public BaseItemDto? RetrieveItem(Guid id){diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.csindex d9d2d0e3a8..7586b99e77 100644--- a/MediaBrowser.Controller/Entities/BaseItem.cs+++ b/MediaBrowser.Controller/Entities/BaseItem.cs@@ -2053,6 +2053,9 @@ namespace MediaBrowser.Controller.Entitiespublic virtual async Task UpdateToRepositoryAsync(ItemUpdateType updateReason, CancellationToken cancellationToken)=> await LibraryManager.UpdateItemAsync(this, GetParent(), updateReason, cancellationToken).ConfigureAwait(false);+ public async Task ReattachUserDataAsync(CancellationToken cancellationToken) =>+ await LibraryManager.ReattachUserDataAsync(this, cancellationToken).ConfigureAwait(false);+/// <summary>/// Validates that images within the item are still on the filesystem./// </summary>diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.csindex fcc5ed672a..675812ac23 100644--- a/MediaBrowser.Controller/Library/ILibraryManager.cs+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs@@ -281,6 +281,14 @@ namespace MediaBrowser.Controller.Library/// <returns>Returns a Task that can be awaited.</returns>Task UpdateItemAsync(BaseItem item, BaseItem parent, ItemUpdateType updateReason, CancellationToken cancellationToken);+ /// <summary>+ /// Reattaches the user data to the item.+ /// </summary>+ /// <param name="item">The item.</param>+ /// <param name="cancellationToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous reattachment operation.</returns>+ Task ReattachUserDataAsync(BaseItem item, CancellationToken cancellationToken);+/// <summary>/// Retrieves the item./// </summary>diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.csindex 00c492742a..bf80b7d0a8 100644--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs@@ -35,6 +35,14 @@ public interface IItemRepositoryTask SaveImagesAsync(BaseItem item, CancellationToken cancellationToken = default);+ /// <summary>+ /// Reattaches the user data to the item.+ /// </summary>+ /// <param name="item">The item.</param>+ /// <param name="cancellationToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous reattachment operation.</returns>+ Task ReattachUserDataAsync(BaseItem item, CancellationToken cancellationToken);+/// <summary>/// Retrieves the item./// </summary>diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.csindex a2102ca9cd..e9cb46eab5 100644--- a/MediaBrowser.Providers/Manager/MetadataService.cs+++ b/MediaBrowser.Providers/Manager/MetadataService.cs@@ -153,7 +153,7 @@ namespace MediaBrowser.Providers.Managerif (isFirstRefresh){- await SaveItemAsync(metadataResult, ItemUpdateType.MetadataImport, cancellationToken).ConfigureAwait(false);+ await SaveItemAsync(metadataResult, ItemUpdateType.MetadataImport, false, cancellationToken).ConfigureAwait(false);}// Next run metadata providers@@ -247,7 +247,7 @@ namespace MediaBrowser.Providers.Manager}// Save to database- await SaveItemAsync(metadataResult, updateType, cancellationToken).ConfigureAwait(false);+ await SaveItemAsync(metadataResult, updateType, isFirstRefresh, cancellationToken).ConfigureAwait(false);}return updateType;@@ -275,9 +275,14 @@ namespace MediaBrowser.Providers.Manager}}- protected async Task SaveItemAsync(MetadataResult<TItemType> result, ItemUpdateType reason, CancellationToken cancellationToken)+ protected async Task SaveItemAsync(MetadataResult<TItemType> result, ItemUpdateType reason, bool reattachUserData, CancellationToken cancellationToken){await result.Item.UpdateToRepositoryAsync(reason, cancellationToken).ConfigureAwait(false);+ if (reattachUserData)+ {+ await result.Item.ReattachUserDataAsync(cancellationToken).ConfigureAwait(false);+ }+if (result.Item.SupportsPeople && result.People is not null){var baseItem = result.Item;