ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rewrite IsAvailable, call to Assembly.GetTypes is now lazy

This commit is contained in:
YoshiRulz 2019-08-20 00:36:22 +10:00 committed by James Groom
parent 462bd891af
commit 0e9cc431d9
2 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Client.EmuHawk/Program.cs
View File

@ -72,6 +72,9 @@ namespace BizHawk.Client.EmuHawk
//We need to do it here too... otherwise people get exceptions when externaltools we distribute try to startup
}
// Assembly.ReflectionOnlyLoadFrom doesn't automatically load deps, this stops it from throwing when called
AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += (sender, args) => Assembly.ReflectionOnlyLoad(args.Name);
}
[STAThread]

65
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -736,60 +736,39 @@ namespace BizHawk.Client.EmuHawk
}
}
public bool IsAvailable<T>()
{
return IsAvailable(typeof(T));
}
private static readonly Lazy<List<string>> lazyAsmTypes = new Lazy<List<string>>(() =>
Assembly.ReflectionOnlyLoadFrom(Assembly.GetExecutingAssembly().Location)
.GetTypes()
.Select(t => t.AssemblyQualifiedName)
.ToList()
);
public bool IsAvailable(Type t)
public bool IsAvailable(Type tool)
{
if (!ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, t))
if (!ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, tool)
|| !lazyAsmTypes.Value.Contains(tool.AssemblyQualifiedName) // not a tool
|| (tool == typeof(LuaConsole) && OSTailoredCode.CurrentOS != OSTailoredCode.DistinctOS.Windows)) // simply doesn't work (for now)
{
return false;
}
if (t == typeof(LuaConsole) && OSTailoredCode.CurrentOS != OSTailoredCode.DistinctOS.Windows) return false;
var tool = Assembly
.GetExecutingAssembly()
.GetTypes()
.FirstOrDefault(type => type == t);
if (tool == null) // This isn't a tool, must not be available
ToolAttribute attr;
try
{
return false;
attr = tool.GetCustomAttributes(false).OfType<ToolAttribute>().Single();
}
catch (InvalidOperationException e)
{
return true; // no ToolAttribute on given type -> assumed all supported
}
var attr = tool.GetCustomAttributes(false)
.OfType<ToolAttribute>()
.FirstOrDefault();
// start with the assumption that if no supported systems are mentioned and no unsupported cores are mentioned
// then this is available for all
bool supported = true;
if (attr?.SupportedSystems != null && attr.SupportedSystems.Any())
{
// supported systems are available
supported = attr.SupportedSystems.Contains(Global.Emulator.SystemId);
if (supported)
{
// check for a core not supported override
if (attr.UnsupportedCores.Contains(Global.Emulator.DisplayName()))
supported = false;
}
}
else if (attr?.UnsupportedCores != null && attr.UnsupportedCores.Any())
{
// no supported system specified, but unsupported cores are
if (attr.UnsupportedCores.Contains(Global.Emulator.DisplayName()))
supported = false;
}
return supported;
var sysName = Global.Emulator.DisplayName();
return !attr.UnsupportedCores.Contains(sysName) // not unsupported
&& (!attr.SupportedSystems.Any() || attr.SupportedSystems.Contains(sysName)); // supported (no supported list -> assumed all supported)
}
public bool IsAvailable<T>() => IsAvailable(typeof(T));
// Note: Referencing these properties creates an instance of the tool and persists it. They should be referenced by type if this is not desired
#region Tools