Prechádzať zdrojové kódy

Make identify flag describe purpose, not source

Joe Rogers 3 rokov pred
rodič
commit
b43f46d5c9

+ 1 - 1
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);
 

+ 2 - 2
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)
         {

+ 1 - 1
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)
             {

+ 2 - 4
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);
                         }