From 62702fa3eb5070ce8c57dc4e39551bcc4e64fa74 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Wed, 23 Dec 2020 16:28:50 +0000
Subject: Changes as requested

---
 MediaBrowser.Common/Plugins/BasePluginOfT.cs         | 20 +++++---------------
 .../Plugins/IHasPluginConfiguration.cs               |  6 ------
 MediaBrowser.Common/Plugins/IPluginManager.cs        |  1 +
 MediaBrowser.Common/Plugins/PluginManifest.cs        |  4 +---
 4 files changed, 7 insertions(+), 24 deletions(-)

(limited to 'MediaBrowser.Common/Plugins')

diff --git a/MediaBrowser.Common/Plugins/BasePluginOfT.cs b/MediaBrowser.Common/Plugins/BasePluginOfT.cs
index ea05a722bc..d5c7808512 100644
--- a/MediaBrowser.Common/Plugins/BasePluginOfT.cs
+++ b/MediaBrowser.Common/Plugins/BasePluginOfT.cs
@@ -25,8 +25,6 @@ namespace MediaBrowser.Common.Plugins
         /// </summary>
         private readonly object _configurationSaveLock = new object();
 
-        private Action<string> _directoryCreateFn;
-
         /// <summary>
         /// The configuration.
         /// </summary>
@@ -65,11 +63,6 @@ namespace MediaBrowser.Common.Plugins
                     assemblyPlugin.SetId(assemblyId);
                 }
             }
-
-            if (this is IHasPluginConfiguration hasPluginConfiguration)
-            {
-                hasPluginConfiguration.SetStartupInfo(s => Directory.CreateDirectory(s));
-            }
         }
 
         /// <summary>
@@ -145,13 +138,6 @@ namespace MediaBrowser.Common.Plugins
         /// <value>The configuration.</value>
         BasePluginConfiguration IHasPluginConfiguration.Configuration => Configuration;
 
-        /// <inheritdoc />
-        public void SetStartupInfo(Action<string> directoryCreateFn)
-        {
-            // hack alert, until the .net core transition is complete
-            _directoryCreateFn = directoryCreateFn;
-        }
-
         /// <summary>
         /// Saves the current configuration to the file system.
         /// </summary>
@@ -160,7 +146,11 @@ namespace MediaBrowser.Common.Plugins
         {
             lock (_configurationSaveLock)
             {
-                _directoryCreateFn(Path.GetDirectoryName(ConfigurationFilePath));
+                var folder = Path.GetDirectoryName(ConfigurationFilePath);
+                if (!Directory.Exists(folder))
+                {
+                    Directory.CreateDirectory(folder);
+                }
 
                 XmlSerializer.SerializeToFile(config, ConfigurationFilePath);
             }
diff --git a/MediaBrowser.Common/Plugins/IHasPluginConfiguration.cs b/MediaBrowser.Common/Plugins/IHasPluginConfiguration.cs
index 42ad85dd37..af9272caae 100644
--- a/MediaBrowser.Common/Plugins/IHasPluginConfiguration.cs
+++ b/MediaBrowser.Common/Plugins/IHasPluginConfiguration.cs
@@ -23,11 +23,5 @@ namespace MediaBrowser.Common.Plugins
         /// </summary>
         /// <param name="configuration">The configuration.</param>
         void UpdateConfiguration(BasePluginConfiguration configuration);
-
-        /// <summary>
-        /// Sets the startup directory creation function.
-        /// </summary>
-        /// <param name="directoryCreateFn">The directory function used to create the configuration folder.</param>
-        void SetStartupInfo(Action<string> directoryCreateFn);
     }
 }
diff --git a/MediaBrowser.Common/Plugins/IPluginManager.cs b/MediaBrowser.Common/Plugins/IPluginManager.cs
index 7f7381b033..3da34d8bb3 100644
--- a/MediaBrowser.Common/Plugins/IPluginManager.cs
+++ b/MediaBrowser.Common/Plugins/IPluginManager.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace MediaBrowser.Common.Plugins
diff --git a/MediaBrowser.Common/Plugins/PluginManifest.cs b/MediaBrowser.Common/Plugins/PluginManifest.cs
index 334c8d9082..4c724f6949 100644
--- a/MediaBrowser.Common/Plugins/PluginManifest.cs
+++ b/MediaBrowser.Common/Plugins/PluginManifest.cs
@@ -19,14 +19,12 @@ namespace MediaBrowser.Common.Plugins
             Category = string.Empty;
             Changelog = string.Empty;
             Description = string.Empty;
-            Status = PluginStatus.Active;
             Id = Guid.Empty;
             Name = string.Empty;
             Owner = string.Empty;
             Overview = string.Empty;
             TargetAbi = string.Empty;
             Version = string.Empty;
-            AutoUpdate = true;
         }
 
         /// <summary>
@@ -99,7 +97,7 @@ namespace MediaBrowser.Common.Plugins
         /// Gets or sets a value indicating whether this plugin should automatically update.
         /// </summary>
         [JsonPropertyName("autoUpdate")]
-        public bool AutoUpdate { get; set; }
+        public bool AutoUpdate { get; set; } = true; // DO NOT MOVE THIS INTO THE CONSTRUCTOR.
 
         /// <summary>
         /// Gets or sets the ImagePath
-- 
cgit v1.2.3