PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge branch 'master' of https://github.com/TorchAPI/Torch

Browse Source
This commit is contained in:
John Gross
2019-11-05 10:19:46 -08:00
parent b02d613a28 c18d6d4795
commit 28164b491b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Torch/Plugins/PluginManager.cs
View File

@@ -330,6 +330,8 @@ namespace Torch.Managers
private void LoadPlugin(PluginItem item) private void LoadPlugin(PluginItem item)
{ {
var assemblies = new List<Assembly>(); var assemblies = new List<Assembly>();
var loaded = AppDomain.CurrentDomain.GetAssemblies();
if (item.IsZip) if (item.IsZip)
{ {
@@ -340,6 +342,9 @@ namespace Torch.Managers
if (!entry.Name.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase)) if (!entry.Name.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
continue; continue;
//if (loaded.Any(a => entry.Name.Contains(a.GetName().Name)))
// continue;
using (var stream = entry.Open()) using (var stream = entry.Open())
{ {
@@ -375,6 +380,9 @@ namespace Torch.Managers
if (!file.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase)) if (!file.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
continue; continue;
//if (loaded.Any(a => file.Contains(a.GetName().Name)))
// continue;
using (var stream = File.OpenRead(file)) using (var stream = File.OpenRead(file))
{ {
var data = stream.ReadToEnd(); var data = stream.ReadToEnd();
@@ -391,7 +399,7 @@ namespace Torch.Managers
{ {
_log.Warn(e, $"Failed to read debugging symbols from {symbolPath}"); _log.Warn(e, $"Failed to read debugging symbols from {symbolPath}");
} }
assemblies.Add(symbol != null ? Assembly.Load(data, symbol) : Assembly.Load(data)); assemblies.Add(symbol != null ? Assembly.Load(data, symbol) : Assembly.Load(data));
} }
} }