diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index a265d5418f..1c9a4776a0 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -173,11 +173,17 @@ namespace Emby.Server.Implementations
/// The logger.
protected ILogger Logger { get; set; }
+ private IPlugin[] _plugins;
+
///
/// Gets the plugins.
///
/// The plugins.
- public IPlugin[] Plugins { get; protected set; }
+ public IPlugin[] Plugins
+ {
+ get => _plugins;
+ protected set => _plugins = value;
+ }
///
/// Gets or sets the logger factory.
@@ -1036,6 +1042,41 @@ namespace Emby.Server.Implementations
CollectionFolder.JsonSerializer = JsonSerializer;
CollectionFolder.ApplicationHost = this;
AuthenticatedAttribute.AuthService = AuthService;
+
+ InstallationManager.PluginInstalled += PluginInstalled;
+ }
+
+ private async void PluginInstalled(object sender, GenericEventArgs 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()
+ .Select(LoadPlugin)
+ .Where(x => x != null)
+ .ToArray();
+
+ int oldLen = _plugins.Length;
+ Array.Resize(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()
+ .ToList();
+
+ await Task.WhenAll(StartEntryPoints(entries, true));
+ await Task.WhenAll(StartEntryPoints(entries, false));
}
///