Browse Source

reverted change

BaronGreenback 4 năm trước cách đây
mục cha
commit
46c7499e2b

+ 5 - 7
MediaBrowser.Common/Plugins/BasePluginOfT.cs

@@ -15,8 +15,6 @@ namespace MediaBrowser.Common.Plugins
     public abstract class BasePlugin<TConfigurationType> : BasePlugin, IHasPluginConfiguration
     public abstract class BasePlugin<TConfigurationType> : BasePlugin, IHasPluginConfiguration
         where TConfigurationType : BasePluginConfiguration
         where TConfigurationType : BasePluginConfiguration
     {
     {
-        private readonly string _dataFolderPath;
-
         /// <summary>
         /// <summary>
         /// The configuration sync lock.
         /// The configuration sync lock.
         /// </summary>
         /// </summary>
@@ -49,14 +47,14 @@ namespace MediaBrowser.Common.Plugins
                 var assemblyName = assembly.GetName();
                 var assemblyName = assembly.GetName();
                 var assemblyFilePath = assembly.Location;
                 var assemblyFilePath = assembly.Location;
 
 
-                _dataFolderPath = Path.Combine(ApplicationPaths.PluginsPath, Path.GetFileNameWithoutExtension(assemblyFilePath));
-                if (!Directory.Exists(_dataFolderPath) && Version != null)
+                var dataFolderPath = Path.Combine(ApplicationPaths.PluginsPath, Path.GetFileNameWithoutExtension(assemblyFilePath));
+                if (!Directory.Exists(dataFolderPath) && Version != null)
                 {
                 {
                     // Try again with the version number appended to the folder name.
                     // Try again with the version number appended to the folder name.
-                    _dataFolderPath = _dataFolderPath + "_" + Version.ToString();
+                    dataFolderPath = dataFolderPath + "_" + Version.ToString();
                 }
                 }
 
 
-                assemblyPlugin.SetAttributes(assemblyFilePath, _dataFolderPath, assemblyName.Version);
+                assemblyPlugin.SetAttributes(assemblyFilePath, dataFolderPath, assemblyName.Version);
 
 
                 var idAttributes = assembly.GetCustomAttributes(typeof(GuidAttribute), true);
                 var idAttributes = assembly.GetCustomAttributes(typeof(GuidAttribute), true);
                 if (idAttributes.Length > 0)
                 if (idAttributes.Length > 0)
@@ -139,7 +137,7 @@ namespace MediaBrowser.Common.Plugins
         /// Gets the full path to the configuration file.
         /// Gets the full path to the configuration file.
         /// </summary>
         /// </summary>
         /// <value>The configuration file path.</value>
         /// <value>The configuration file path.</value>
-        public string ConfigurationFilePath => Path.Combine(_dataFolderPath, ConfigurationFileName);
+        public string ConfigurationFilePath => Path.Combine(ApplicationPaths.PluginConfigurationsPath, ConfigurationFileName);
 
 
         /// <summary>
         /// <summary>
         /// Gets the plugin configuration.
         /// Gets the plugin configuration.