mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-01 03:42:51 +01:00
Switched to MEF as a means to locate plugins and resolvers
This commit is contained in:
parent
84af205572
commit
97ee9fed14
@@ -1,37 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.IO;
|
||||
using MediaBrowser.Common.Json;
|
||||
|
||||
namespace MediaBrowser.Common.Configuration
|
||||
{
|
||||
public class ConfigurationController<TConfigurationType>
|
||||
where TConfigurationType : BaseConfiguration, new ()
|
||||
{
|
||||
/// <summary>
|
||||
/// The path to the configuration file
|
||||
/// </summary>
|
||||
public string Path { get; set; }
|
||||
|
||||
public TConfigurationType Configuration { get; set; }
|
||||
|
||||
public void Reload()
|
||||
{
|
||||
if (!File.Exists(Path))
|
||||
{
|
||||
Configuration = new TConfigurationType();
|
||||
}
|
||||
else
|
||||
{
|
||||
Configuration = JsonSerializer.DeserializeFromFile<TConfigurationType>(Path);
|
||||
}
|
||||
}
|
||||
|
||||
public void Save()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,11 @@
|
||||
using System.Configuration;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.Composition;
|
||||
using System.ComponentModel.Composition.Hosting;
|
||||
using System.Configuration;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Threading.Tasks;
|
||||
using MediaBrowser.Common.Configuration;
|
||||
using MediaBrowser.Common.Json;
|
||||
using MediaBrowser.Common.Logging;
|
||||
@@ -12,8 +17,7 @@ namespace MediaBrowser.Common.Kernel
|
||||
/// <summary>
|
||||
/// Represents a shared base kernel for both the UI and server apps
|
||||
/// </summary>
|
||||
public abstract class BaseKernel<TConfigurationContorllerType, TConfigurationType>
|
||||
where TConfigurationContorllerType : ConfigurationController<TConfigurationType>, new()
|
||||
public abstract class BaseKernel<TConfigurationType>
|
||||
where TConfigurationType : BaseConfiguration, new()
|
||||
{
|
||||
/// <summary>
|
||||
@@ -21,19 +25,39 @@ namespace MediaBrowser.Common.Kernel
|
||||
/// </summary>
|
||||
public string ProgramDataPath { get; private set; }
|
||||
|
||||
protected string PluginsPath
|
||||
{
|
||||
get
|
||||
{
|
||||
return Path.Combine(ProgramDataPath, "plugins");
|
||||
}
|
||||
}
|
||||
|
||||
protected string ConfigurationPath
|
||||
{
|
||||
get
|
||||
{
|
||||
return Path.Combine(ProgramDataPath, "config.js");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the current configuration
|
||||
/// </summary>
|
||||
public TConfigurationContorllerType ConfigurationController { get; private set; }
|
||||
public TConfigurationType Configuration { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets the list of currently loaded plugins
|
||||
/// </summary>
|
||||
[ImportMany(typeof(BasePlugin))]
|
||||
public IEnumerable<BasePlugin> Plugins { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Both the UI and server will have a built-in HttpServer.
|
||||
/// People will inevitably want remote control apps so it's needed in the UI too.
|
||||
/// </summary>
|
||||
public HttpServer HttpServer { get; private set; }
|
||||
|
||||
public PluginController PluginController { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets the kernel context. The UI kernel will have to override this.
|
||||
/// </summary>
|
||||
@@ -43,9 +67,6 @@ namespace MediaBrowser.Common.Kernel
|
||||
{
|
||||
ProgramDataPath = GetProgramDataPath();
|
||||
|
||||
PluginController = new PluginController() { PluginsPath = Path.Combine(ProgramDataPath, "Plugins") };
|
||||
ConfigurationController = new TConfigurationContorllerType() { Path = Path.Combine(ProgramDataPath, "config.js") };
|
||||
|
||||
Logger.LoggerInstance = new FileLogger(Path.Combine(ProgramDataPath, "Logs"));
|
||||
}
|
||||
|
||||
@@ -55,7 +76,51 @@ namespace MediaBrowser.Common.Kernel
|
||||
|
||||
ReloadHttpServer();
|
||||
|
||||
ReloadPlugins();
|
||||
ReloadComposableParts();
|
||||
}
|
||||
|
||||
protected void ReloadComposableParts()
|
||||
{
|
||||
if (!Directory.Exists(PluginsPath))
|
||||
{
|
||||
Directory.CreateDirectory(PluginsPath);
|
||||
}
|
||||
|
||||
var catalog = new AggregateCatalog(Directory.GetDirectories(PluginsPath, "*", SearchOption.TopDirectoryOnly).Select(f => new DirectoryCatalog(f)));
|
||||
|
||||
//catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly()));
|
||||
//catalog.Catalogs.Add(new AssemblyCatalog(GetType().Assembly));
|
||||
|
||||
new CompositionContainer(catalog).ComposeParts(this);
|
||||
|
||||
OnComposablePartsLoaded();
|
||||
}
|
||||
|
||||
protected virtual void OnComposablePartsLoaded()
|
||||
{
|
||||
StartPlugins();
|
||||
}
|
||||
|
||||
private void StartPlugins()
|
||||
{
|
||||
Parallel.For(0, Plugins.Count(), i =>
|
||||
{
|
||||
var plugin = Plugins.ElementAt(i);
|
||||
|
||||
plugin.ReloadConfiguration();
|
||||
|
||||
if (plugin.Enabled)
|
||||
{
|
||||
if (KernelContext == KernelContext.Server)
|
||||
{
|
||||
plugin.InitInServer();
|
||||
}
|
||||
else
|
||||
{
|
||||
plugin.InitInUI();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -87,9 +152,21 @@ namespace MediaBrowser.Common.Kernel
|
||||
private void ReloadConfiguration()
|
||||
{
|
||||
// Deserialize config
|
||||
ConfigurationController.Reload();
|
||||
if (!File.Exists(ConfigurationPath))
|
||||
{
|
||||
Configuration = new TConfigurationType();
|
||||
}
|
||||
else
|
||||
{
|
||||
Configuration = JsonSerializer.DeserializeFromFile<TConfigurationType>(ConfigurationPath);
|
||||
}
|
||||
|
||||
Logger.LoggerInstance.LogSeverity = ConfigurationController.Configuration.LogSeverity;
|
||||
Logger.LoggerInstance.LogSeverity = Configuration.LogSeverity;
|
||||
}
|
||||
|
||||
public void SaveConfiguration()
|
||||
{
|
||||
JsonSerializer.SerializeToFile(Configuration, ConfigurationPath);
|
||||
}
|
||||
|
||||
private void ReloadHttpServer()
|
||||
@@ -99,13 +176,7 @@ namespace MediaBrowser.Common.Kernel
|
||||
HttpServer.Dispose();
|
||||
}
|
||||
|
||||
HttpServer = new HttpServer("http://+:" + ConfigurationController.Configuration.HttpServerPortNumber + "/mediabrowser/");
|
||||
}
|
||||
|
||||
protected virtual void ReloadPlugins()
|
||||
{
|
||||
// Find plugins
|
||||
PluginController.Init(KernelContext);
|
||||
HttpServer = new HttpServer("http://+:" + Configuration.HttpServerPortNumber + "/mediabrowser/");
|
||||
}
|
||||
|
||||
private static TConfigurationType GetConfiguration(string directory)
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
<HintPath>..\packages\ServiceStack.Text.3.8.5\lib\net35\ServiceStack.Text.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Reactive, Version=1.0.10621.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
@@ -48,7 +49,6 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Configuration\BaseConfiguration.cs" />
|
||||
<Compile Include="Configuration\ConfigurationController.cs" />
|
||||
<Compile Include="Events\GenericItemEventArgs.cs" />
|
||||
<Compile Include="Json\JsonSerializer.cs" />
|
||||
<Compile Include="Kernel\BaseKernel.cs" />
|
||||
@@ -67,7 +67,6 @@
|
||||
<Compile Include="Logging\Logger.cs" />
|
||||
<Compile Include="Logging\LogRow.cs" />
|
||||
<Compile Include="Plugins\BasePlugin.cs" />
|
||||
<Compile Include="Plugins\PluginController.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -43,8 +43,22 @@ namespace MediaBrowser.Common.Plugins
|
||||
public abstract class BasePlugin
|
||||
{
|
||||
public abstract string Name { get; }
|
||||
public string Path { get; set; }
|
||||
public Version Version { get; set; }
|
||||
|
||||
public string Path
|
||||
{
|
||||
get
|
||||
{
|
||||
return System.IO.Path.GetDirectoryName(GetType().Assembly.Location);
|
||||
}
|
||||
}
|
||||
|
||||
public Version Version
|
||||
{
|
||||
get
|
||||
{
|
||||
return GetType().Assembly.GetName().Version;
|
||||
}
|
||||
}
|
||||
|
||||
public BasePluginConfiguration Configuration { get; protected set; }
|
||||
|
||||
|
||||
@@ -1,130 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Threading.Tasks;
|
||||
using MediaBrowser.Common.Kernel;
|
||||
|
||||
namespace MediaBrowser.Common.Plugins
|
||||
{
|
||||
/// <summary>
|
||||
/// Manages Plugins within the PluginsPath directory
|
||||
/// </summary>
|
||||
public class PluginController
|
||||
{
|
||||
public string PluginsPath { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets the list of currently loaded plugins
|
||||
/// </summary>
|
||||
public IEnumerable<BasePlugin> Plugins { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Initializes the controller
|
||||
/// </summary>
|
||||
public void Init(KernelContext context)
|
||||
{
|
||||
AppDomain.CurrentDomain.AssemblyResolve -= new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
||||
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
||||
|
||||
Plugins = GetAllPlugins();
|
||||
|
||||
Parallel.For(0, Plugins.Count(), i =>
|
||||
{
|
||||
var plugin = Plugins.ElementAt(i);
|
||||
|
||||
plugin.ReloadConfiguration();
|
||||
|
||||
if (plugin.Enabled)
|
||||
{
|
||||
if (context == KernelContext.Server)
|
||||
{
|
||||
plugin.InitInServer();
|
||||
}
|
||||
else
|
||||
{
|
||||
plugin.InitInUI();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets all plugins within PluginsPath
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private IEnumerable<BasePlugin> GetAllPlugins()
|
||||
{
|
||||
if (!Directory.Exists(PluginsPath))
|
||||
{
|
||||
Directory.CreateDirectory(PluginsPath);
|
||||
}
|
||||
|
||||
List<BasePlugin> plugins = new List<BasePlugin>();
|
||||
|
||||
foreach (string folder in Directory.GetDirectories(PluginsPath, "*", SearchOption.TopDirectoryOnly))
|
||||
{
|
||||
BasePlugin plugin = GetPluginFromDirectory(folder);
|
||||
|
||||
plugin.Path = folder;
|
||||
|
||||
if (plugin != null)
|
||||
{
|
||||
plugins.Add(plugin);
|
||||
}
|
||||
}
|
||||
|
||||
return plugins;
|
||||
}
|
||||
|
||||
private BasePlugin GetPluginFromDirectory(string path)
|
||||
{
|
||||
string dll = Directory.GetFiles(path, "*.dll", SearchOption.TopDirectoryOnly).FirstOrDefault();
|
||||
|
||||
if (!string.IsNullOrEmpty(dll))
|
||||
{
|
||||
return GetPluginFromDll(dll);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private BasePlugin GetPluginFromDll(string path)
|
||||
{
|
||||
return GetPluginFromDll(Assembly.Load(File.ReadAllBytes(path)));
|
||||
}
|
||||
|
||||
private BasePlugin GetPluginFromDll(Assembly assembly)
|
||||
{
|
||||
var plugin = assembly.GetTypes().Where(type => typeof(BasePlugin).IsAssignableFrom(type)).FirstOrDefault();
|
||||
|
||||
if (plugin != null)
|
||||
{
|
||||
BasePlugin instance = plugin.GetConstructor(Type.EmptyTypes).Invoke(null) as BasePlugin;
|
||||
|
||||
instance.Version = assembly.GetName().Version;
|
||||
|
||||
return instance;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
|
||||
{
|
||||
AssemblyName assemblyName = new AssemblyName(args.Name);
|
||||
|
||||
IEnumerable<string> dllPaths = Directory.GetFiles(PluginsPath, "*.dll", SearchOption.AllDirectories);
|
||||
|
||||
string dll = dllPaths.FirstOrDefault(f => Path.GetFileNameWithoutExtension(f) == assemblyName.Name);
|
||||
|
||||
if (!string.IsNullOrEmpty(dll))
|
||||
{
|
||||
return Assembly.Load(File.ReadAllBytes(dll));
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user