beenull/Moonlight
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed plugin loading system

Browse source
This commit is contained in:
Marcel Baumgartner 2023-08-01 22:21:19 +02:00
parent 29002d3445
commit 6f3765a3bf
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Moonlight/App/Services/Plugins/PluginService.cs
View file

@ -12,29 +12,13 @@ public class PluginService
public List<MoonlightPlugin> Plugins { get; private set; }
public Dictionary<MoonlightPlugin, string> PluginFiles { get; private set; }
private AssemblyLoadContext LoadContext;
public PluginService()
{
LoadContext = new(null, true);
ReloadPlugins().Wait();
}
private Task UnloadPlugins()
public Task ReloadPlugins()
{
Plugins = new();
PluginFiles = new();
if(LoadContext.Assemblies.Any())
LoadContext.Unload();
return Task.CompletedTask;
}
public async Task ReloadPlugins()
{
await UnloadPlugins();
// Try to update all plugins ending with .dll.cache
foreach (var pluginFile in Directory.EnumerateFiles(
PathBuilder.Dir(Directory.GetCurrentDirectory(), "storage", "plugins"))
@ -59,7 +43,7 @@ public class PluginService
PathBuilder.Dir(Directory.GetCurrentDirectory(), "storage", "plugins"))
.Where(x => x.EndsWith(".dll")))
{
var assembly = LoadContext.LoadFromAssemblyPath(pluginFile);
var assembly = Assembly.LoadFile(pluginFile);
foreach (var type in assembly.GetTypes())
{
@ -76,6 +60,8 @@ public class PluginService
}
Logger.Info($"Loaded {Plugins.Count} plugins");
return Task.CompletedTask;
}
public async Task<ServerPageContext> BuildServerPage(ServerPageContext context)