Merge pull request #934 from Bond-009/plugin

WIP - Don't require a restart for 75% of plugins
pull/1166/head
Joshua M. Boniface 6 years ago committed by GitHub
commit 2dbc1153e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -173,11 +173,17 @@ namespace Emby.Server.Implementations
/// <value>The logger.</value> /// <value>The logger.</value>
protected ILogger Logger { get; set; } protected ILogger Logger { get; set; }
private IPlugin[] _plugins;
/// <summary> /// <summary>
/// Gets the plugins. /// Gets the plugins.
/// </summary> /// </summary>
/// <value>The plugins.</value> /// <value>The plugins.</value>
public IPlugin[] Plugins { get; protected set; } public IPlugin[] Plugins
{
get => _plugins;
protected set => _plugins = value;
}
/// <summary> /// <summary>
/// Gets or sets the logger factory. /// Gets or sets the logger factory.
@ -1036,6 +1042,41 @@ namespace Emby.Server.Implementations
CollectionFolder.JsonSerializer = JsonSerializer; CollectionFolder.JsonSerializer = JsonSerializer;
CollectionFolder.ApplicationHost = this; CollectionFolder.ApplicationHost = this;
AuthenticatedAttribute.AuthService = AuthService; AuthenticatedAttribute.AuthService = AuthService;
InstallationManager.PluginInstalled += PluginInstalled;
}
private async void PluginInstalled(object sender, GenericEventArgs<PackageVersionInfo> args)
{
string dir = Path.Combine(ApplicationPaths.PluginsPath, Path.GetFileNameWithoutExtension(args.Argument.targetFilename));
var types = Directory.EnumerateFiles(dir, "*.dll", SearchOption.TopDirectoryOnly)
.Select(x => Assembly.LoadFrom(x))
.SelectMany(x => x.ExportedTypes)
.Where(x => x.IsClass && !x.IsAbstract && !x.IsInterface && !x.IsGenericType)
.ToList();
types.AddRange(types);
var plugins = types.Where(x => x.IsAssignableFrom(typeof(IPlugin)))
.Select(CreateInstanceSafe)
.Where(x => x != null)
.Cast<IPlugin>()
.Select(LoadPlugin)
.Where(x => x != null)
.ToArray();
int oldLen = _plugins.Length;
Array.Resize<IPlugin>(ref _plugins, _plugins.Length + plugins.Length);
plugins.CopyTo(_plugins, oldLen);
var entries = types.Where(x => x.IsAssignableFrom(typeof(IServerEntryPoint)))
.Select(CreateInstanceSafe)
.Where(x => x != null)
.Cast<IServerEntryPoint>()
.ToList();
await Task.WhenAll(StartEntryPoints(entries, true));
await Task.WhenAll(StartEntryPoints(entries, false));
} }
/// <summary> /// <summary>

Loading…
Cancel
Save