michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Reworked plugin loading to allow on the fly .dll replacement

Browse Source
This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti 2012-07-26 13:00:53 -04:00
parent 8d0fede236
commit 77e81432f7
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Common/Kernel/BaseKernel.cs
View File

@ -96,8 +96,11 @@ namespace MediaBrowser.Common.Kernel
Directory.CreateDirectory(PluginsPath); Directory.CreateDirectory(PluginsPath);
} }
var catalog = new AggregateCatalog(Directory.GetDirectories(PluginsPath, "*", SearchOption.TopDirectoryOnly).Select(f => new DirectoryCatalog(f))); // Gets all plugin assemblies by first reading all bytes of the .dll and calling Assembly.Load against that
// This will prevent the .dll file from getting locked, and allow us to replace it when needed
IEnumerable<Assembly> pluginAssemblies = Directory.GetFiles(PluginsPath, "*.dll", SearchOption.AllDirectories).Select(f => Assembly.Load(File.ReadAllBytes((f))));
var catalog = new AggregateCatalog(pluginAssemblies.Select(a => new AssemblyCatalog(a)));
//catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly())); //catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly()));
//catalog.Catalogs.Add(new AssemblyCatalog(GetType().Assembly)); //catalog.Catalogs.Add(new AssemblyCatalog(GetType().Assembly));
@ -130,6 +133,12 @@ namespace MediaBrowser.Common.Kernel
{ {
foreach (BasePlugin plugin in Plugins) foreach (BasePlugin plugin in Plugins)
{ {
Assembly assembly = plugin.GetType().Assembly;
AssemblyName assemblyName = assembly.GetName();
plugin.Version = assemblyName.Version;
plugin.Path = Path.Combine(PluginsPath, assemblyName.Name);
plugin.ReloadConfiguration(); plugin.ReloadConfiguration();
if (plugin.Enabled) if (plugin.Enabled)

16
MediaBrowser.Common/Plugins/BasePlugin.cs
View File

@ -44,21 +44,9 @@ namespace MediaBrowser.Common.Plugins
{ {
public abstract string Name { get; } public abstract string Name { get; }
public string Path public string Path { get; set; }
{
get
{
return System.IO.Path.GetDirectoryName(GetType().Assembly.Location);
}
}
public Version Version public Version Version { get; set; }
{
get
{
return GetType().Assembly.GetName().Version;
}
}
public BasePluginConfiguration Configuration { get; protected set; } public BasePluginConfiguration Configuration { get; protected set; }