Fixed some project fragmentation that came from efforts to go portable

This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti
2012-07-30 23:38:00 -04:00
parent 7d48e20aea
commit d4c75e3974
20 changed files with 47 additions and 152 deletions

View File

@@ -1,8 +1,8 @@
using System;
using System.IO;
using MediaBrowser.Common.Json;
using MediaBrowser.Model.Plugins;
using MediaBrowser.Common.Kernel;
using MediaBrowser.Model.Plugins;
using MediaBrowser.Common.Json;
namespace MediaBrowser.Common.Plugins
{
@@ -100,19 +100,6 @@ namespace MediaBrowser.Common.Plugins
}
}
public void ReloadConfiguration()
{
if (!File.Exists(ConfigurationPath))
{
Configuration = Activator.CreateInstance(ConfigurationType) as BasePluginConfiguration;
}
else
{
Configuration = JsonSerializer.DeserializeFromFile(ConfigurationType, ConfigurationPath) as BasePluginConfiguration;
Configuration.DateLastModified = File.GetLastWriteTime(ConfigurationPath);
}
}
/// <summary>
/// Starts the plugin.
/// </summary>
@@ -126,5 +113,18 @@ namespace MediaBrowser.Common.Plugins
public virtual void Dispose()
{
}
public void ReloadConfiguration()
{
if (!File.Exists(ConfigurationPath))
{
Configuration = Activator.CreateInstance(ConfigurationType) as BasePluginConfiguration;
}
else
{
Configuration = JsonSerializer.DeserializeFromFile(ConfigurationType, ConfigurationPath) as BasePluginConfiguration;
Configuration.DateLastModified = File.GetLastWriteTime(ConfigurationPath);
}
}
}
}