aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Rogers <1337joe@gmail.com>2022-01-08 14:03:59 +0100
committerJoe Rogers <1337joe@gmail.com>2022-01-08 14:03:59 +0100
commitb43f46d5c939a0df6b2a445b4c4d51f79e6e8365 (patch)
tree5e169bee495b1b187eab6339bc1d1d93b3b0afa8
parentb17fe35e2ef6fa24bbc36d0f077d3d0fedc13fc2 (diff)
Make identify flag describe purpose, not source
-rw-r--r--Jellyfin.Api/Controllers/ItemLookupController.cs2
-rw-r--r--MediaBrowser.Controller/Providers/ImageRefreshOptions.cs4
-rw-r--r--MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs2
-rw-r--r--MediaBrowser.Providers/Manager/MetadataService.cs6
4 files changed, 6 insertions, 8 deletions
diff --git a/Jellyfin.Api/Controllers/ItemLookupController.cs b/Jellyfin.Api/Controllers/ItemLookupController.cs
index 9cc23dc4f..c49f85616 100644
--- a/Jellyfin.Api/Controllers/ItemLookupController.cs
+++ b/Jellyfin.Api/Controllers/ItemLookupController.cs
@@ -264,7 +264,7 @@ namespace Jellyfin.Api.Controllers
ReplaceAllMetadata = true,
ReplaceAllImages = replaceAllImages,
SearchResult = searchResult,
- IsIdentify = true
+ RemoveOldMetadata = true
},
CancellationToken.None).ConfigureAwait(false);
diff --git a/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs b/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs
index 9f40f8a2c..4073d07ad 100644
--- a/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs
+++ b/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs
@@ -28,9 +28,9 @@ namespace MediaBrowser.Controller.Providers
public bool IsAutomated { get; set; }
/// <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>
- public bool IsIdentify { get; set; }
+ public bool RemoveOldMetadata { get; set; }
public bool IsReplacingImage(ImageType type)
{
diff --git a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
index 1fb18334a..a38bbaf69 100644
--- a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
+++ b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
@@ -30,7 +30,7 @@ namespace MediaBrowser.Controller.Providers
ReplaceAllImages = copy.ReplaceAllImages;
ReplaceImages = copy.ReplaceImages;
SearchResult = copy.SearchResult;
- IsIdentify = copy.IsIdentify;
+ RemoveOldMetadata = copy.RemoveOldMetadata;
if (copy.RefreshPaths != null && copy.RefreshPaths.Length > 0)
{
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index eee3d3bd1..a7238831b 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -96,8 +96,7 @@ namespace MediaBrowser.Providers.Manager
var allImageProviders = ((ProviderManager)ProviderManager).GetImageProviders(item, refreshOptions).ToList();
- // If replacing images with identify purge existing images.
- if (refreshOptions.IsIdentify && refreshOptions.ReplaceAllImages)
+ if (refreshOptions.RemoveOldMetadata && refreshOptions.ReplaceAllImages)
{
if (ImageProvider.RemoveImages(item))
{
@@ -755,9 +754,8 @@ namespace MediaBrowser.Providers.Manager
}
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);
}