From 9685b81db5b975f57739a9dcc6c2cdb6c4c4dbcf Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 30 Jan 2014 23:50:09 -0500
Subject: convert artist providers

---
 .../Entities/Audio/MusicArtist.cs                  |  7 -----
 MediaBrowser.Controller/Entities/BaseItem.cs       |  2 +-
 MediaBrowser.Controller/MediaInfo/FFMpegManager.cs |  7 ++++-
 .../Providers/MetadataRefreshOptions.cs            | 30 +++++++++++++++++++++-
 4 files changed, 36 insertions(+), 10 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index 860d34fd8..b2d95ed30 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -69,13 +69,6 @@ namespace MediaBrowser.Controller.Entities.Audio
             return base.GetClientTypeName();
         }
 
-        /// <summary>
-        /// Gets or sets the last fm image URL.
-        /// </summary>
-        /// <value>The last fm image URL.</value>
-        public string LastFmImageUrl { get; set; }
-        public string LastFmImageSize { get; set; }
-
         public MusicArtist()
         {
             UserItemCountList = new List<ItemByNameCounts>();
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 06ebe8905..f12532204 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1492,7 +1492,7 @@ namespace MediaBrowser.Controller.Entities
             return RefreshMetadata(new MetadataRefreshOptions
             {
                 ForceSave = true,
-                ImageRefreshMode = MetadataRefreshMode.None,
+                ImageRefreshMode = ImageRefreshMode.ValidationOnly,
                 MetadataRefreshMode = MetadataRefreshMode.None
 
             }, CancellationToken.None);
diff --git a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
index c1951038c..746157bb3 100644
--- a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
+++ b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
@@ -126,7 +126,7 @@ namespace MediaBrowser.Controller.MediaInfo
         {
             if (!IsEligibleForChapterImageExtraction(video))
             {
-                return true;
+                extractImages = false;
             }
 
             var success = true;
@@ -187,6 +187,11 @@ namespace MediaBrowser.Controller.MediaInfo
                             break;
                         }
                     }
+                    else if (!string.IsNullOrEmpty(chapter.ImagePath))
+                    {
+                        chapter.ImagePath = null;
+                        changesMade = true;
+                    }
                 }
                 else if (!string.Equals(path, chapter.ImagePath, StringComparison.OrdinalIgnoreCase))
                 {
diff --git a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
index d6e8a3afe..27de50ef8 100644
--- a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
+++ b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
@@ -22,11 +22,21 @@ namespace MediaBrowser.Controller.Providers
         /// </summary>
         [Obsolete]
         public bool ResetResolveArgs { get; set; }
+
+        public MetadataRefreshOptions()
+        {
+            ResetResolveArgs = true;
+        }
     }
 
     public class ImageRefreshOptions
     {
-        public MetadataRefreshMode ImageRefreshMode { get; set; }
+        public ImageRefreshMode ImageRefreshMode { get; set; }
+
+        public ImageRefreshOptions()
+        {
+            ImageRefreshMode = ImageRefreshMode.Default;
+        }
     }
 
     public enum MetadataRefreshMode
@@ -46,4 +56,22 @@ namespace MediaBrowser.Controller.Providers
         /// </summary>
         FullRefresh
     }
+
+    public enum ImageRefreshMode
+    {
+        /// <summary>
+        /// The default
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// Existing images will be validated
+        /// </summary>
+        ValidationOnly,
+
+        /// <summary>
+        /// All providers will be executed to search for new metadata
+        /// </summary>
+        FullRefresh
+    }
 }
-- 
cgit v1.2.3