Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix final merge logic

Browse Source
This commit is contained in:
Shadowghost 2024-05-21 21:47:29 +02:00
parent 8a5a93ee80
commit f3bf9bcdc8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Providers/Manager/MetadataService.cs
View File

@ -164,7 +164,7 @@ namespace MediaBrowser.Providers.Manager
} }
// Next run remote image providers, but only if local image providers didn't throw an exception // Next run remote image providers, but only if local image providers didn't throw an exception
if (!localImagesFailed && refreshOptions.ImageRefreshMode != MetadataRefreshMode.ValidationOnly) if (!localImagesFailed && refreshOptions.ImageRefreshMode > MetadataRefreshMode.ValidationOnly)
{ {
var providers = GetNonLocalImageProviders(item, allImageProviders, refreshOptions).ToList(); var providers = GetNonLocalImageProviders(item, allImageProviders, refreshOptions).ToList();
@ -242,7 +242,7 @@ namespace MediaBrowser.Providers.Manager
protected async Task SaveItemAsync(MetadataResult<TItemType> result, ItemUpdateType reason, CancellationToken cancellationToken) protected async Task SaveItemAsync(MetadataResult<TItemType> result, ItemUpdateType reason, CancellationToken cancellationToken)
{ {
if (result.Item.SupportsPeople && result.People is not null) if (result.Item.SupportsPeople)
{ {
var baseItem = result.Item; var baseItem = result.Item;
@ -752,9 +752,10 @@ namespace MediaBrowser.Providers.Manager
{ {
if (refreshResult.UpdateType > ItemUpdateType.None) if (refreshResult.UpdateType > ItemUpdateType.None)
{ {
if (options.RemoveOldMetadata) if (!options.RemoveOldMetadata)
{ {
MergeData(metadata, temp, Array.Empty<MetadataField>(), true, true); // Add existing metadata to provider result if it does not exist there
MergeData(temp, metadata, Array.Empty<MetadataField>(), false, false);
} }
MergeData(temp, metadata, item.LockedFields, options.MetadataRefreshMode >= MetadataRefreshMode.Default || options.ReplaceAllMetadata, true); MergeData(temp, metadata, item.LockedFields, options.MetadataRefreshMode >= MetadataRefreshMode.Default || options.ReplaceAllMetadata, true);