github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make identify flag describe purpose, not source

Browse source
This commit is contained in:
Joe Rogers 2022-01-08 14:03:59 +01:00
parent b17fe35e2e
commit b43f46d5c9
No known key found for this signature in database
GPG key ID: 0074AD57B8FDBBB4
4 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Jellyfin.Api/Controllers/ItemLookupController.cs
View file

@ -264,7 +264,7 @@ namespace Jellyfin.Api.Controllers
ReplaceAllMetadata = true, ReplaceAllMetadata = true,
ReplaceAllImages = replaceAllImages, ReplaceAllImages = replaceAllImages,
SearchResult = searchResult, SearchResult = searchResult,
IsIdentify = true RemoveOldMetadata = true
}, },
CancellationToken.None).ConfigureAwait(false); CancellationToken.None).ConfigureAwait(false);

4
MediaBrowser.Controller/Providers/ImageRefreshOptions.cs
View file

@ -28,9 +28,9 @@ namespace MediaBrowser.Controller.Providers
public bool IsAutomated { get; set; } public bool IsAutomated { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether the action is an identify. /// Gets or sets a value indicating whether old metadata should be removed if it isn't be replaced.
/// </summary> /// </summary>
public bool IsIdentify { get; set; } public bool RemoveOldMetadata { get; set; }
public bool IsReplacingImage(ImageType type) public bool IsReplacingImage(ImageType type)
{ {

2
MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
View file

@ -30,7 +30,7 @@ namespace MediaBrowser.Controller.Providers
ReplaceAllImages = copy.ReplaceAllImages; ReplaceAllImages = copy.ReplaceAllImages;
ReplaceImages = copy.ReplaceImages; ReplaceImages = copy.ReplaceImages;
SearchResult = copy.SearchResult; SearchResult = copy.SearchResult;
IsIdentify = copy.IsIdentify; RemoveOldMetadata = copy.RemoveOldMetadata;
if (copy.RefreshPaths != null && copy.RefreshPaths.Length > 0) if (copy.RefreshPaths != null && copy.RefreshPaths.Length > 0)
{ {

6
MediaBrowser.Providers/Manager/MetadataService.cs
View file

@ -96,8 +96,7 @@ namespace MediaBrowser.Providers.Manager
var allImageProviders = ((ProviderManager)ProviderManager).GetImageProviders(item, refreshOptions).ToList(); var allImageProviders = ((ProviderManager)ProviderManager).GetImageProviders(item, refreshOptions).ToList();
// If replacing images with identify purge existing images. if (refreshOptions.RemoveOldMetadata && refreshOptions.ReplaceAllImages)
if (refreshOptions.IsIdentify && refreshOptions.ReplaceAllImages)
{ {
if (ImageProvider.RemoveImages(item)) if (ImageProvider.RemoveImages(item))
{ {
@ -755,9 +754,8 @@ namespace MediaBrowser.Providers.Manager
} }
else else
{ {
if (!options.IsIdentify) if (!options.RemoveOldMetadata)
{ {
// Keep metadata for fields that the new metadata doesn't have populated
MergeData(metadata, temp, Array.Empty<MetadataField>(), false, false); MergeData(metadata, temp, Array.Empty<MetadataField>(), false, false);
} }