From d9aaba36ec807b12d58fdf9498ee60574ba44a54 Mon Sep 17 00:00:00 2001
From: Greenback <jimcartlidge@yahoo.co.uk>
Date: Wed, 16 Dec 2020 23:19:09 +0000
Subject: [PATCH] Copy previous plugin settings if they don't exist.

---
 .../Plugins/PluginManager.cs                  | 29 +++++++++++++++++++
 MediaBrowser.Common/Plugins/BasePlugin.cs     |  4 +--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index 26a029f712..e7589a0f92 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -274,6 +274,32 @@ namespace Emby.Server.Implementations
             }
         }
 
+        private void CopyFiles(string source, string destination, bool overwrite, string searchPattern)
+        {
+            FileInfo[] files;
+            try
+            {
+                files = new DirectoryInfo(source).GetFiles(searchPattern);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogDebug(ex, "Error retrieving file list.");
+                return;
+            }
+
+            foreach (FileInfo file in files)
+            {
+                try
+                {
+                    file.CopyTo(Path.Combine(destination, file.Name), overwrite);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogDebug(ex, "Error copying file {Name}", file.Name);
+                }
+            }
+        }
+
         /// <summary>
         /// Changes the status of the other versions of the plugin to "Superceded".
         /// </summary>
@@ -295,6 +321,9 @@ namespace Emby.Server.Implementations
                 return;
             }
 
+            // migrate settings across from the last active version if they don't exist.
+            CopyFiles(predecessor.Path, plugin.Path, false, "*.xml");
+
             if (predecessor.Manifest.Status == PluginStatus.Active && !ChangePluginState(predecessor, PluginStatus.Superceded))
             {
                 _logger.LogError("Unable to disable version {Version} of {Name}", predecessor.Version, predecessor.Name);
diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index a0d6b8f836..5756f8852c 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -166,14 +166,14 @@ namespace MediaBrowser.Common.Plugins
                     assemblyPlugin.SetId(assemblyId);
                 }
 
-                // TODO : Simplify this, once migration support is ceased.
+                // TODO : Remove this, once migration support is ceased.
                 if (inPluginFolder)
                 {
                     var oldConfigFilePath = Path.Combine(ApplicationPaths.PluginConfigurationsPath, ConfigurationFileName);
 
                     if (!File.Exists(ConfigurationFilePath) && File.Exists(oldConfigFilePath))
                     {
-                        // Migrate settings, as different plugin versions may have different settings.
+                        // Migrate pre 10.7 settings, as different plugin versions may have different settings.
                         try
                         {
                             File.Copy(oldConfigFilePath, ConfigurationFilePath);