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

Hide asms from ext. tool list if they don't reference any Hawk asms

This commit is contained in:
James Groom 2024-03-30 07:15:31 +10:00 committed by GitHub
parent a3faf6fbd7
commit 2206571ab8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
View File

@ -117,10 +117,15 @@ namespace BizHawk.Client.EmuHawk
/// <summary>Generates a <see cref="ToolStripMenuItem"/> from an assembly at <paramref name="fileName"/> containing an external tool.</summary>
/// <returns>
/// a <see cref="ToolStripMenuItem"/> with its <see cref="ToolStripItem.Tag"/> containing a <see cref="MenuItemInfo"/>, or
/// <see langword="null"/> if the file is not a .NET assembly
/// <see langword="null"/> if the file is not a .NET assembly or does not reference a BizHawk assembly
/// </returns>
private ToolStripMenuItem/*?*/ GenerateToolTipFromFileName(string fileName)
{
ToolStripMenuItem/*?*/ Fail(string reason)
{
Console.WriteLine($"ignoring <exttools>/{fileName.MakeRelativeTo(DirectoryMonitor.Path).RemovePrefix("./")} as {reason}");
return null;
}
if (fileName == null) throw new Exception();
var item = new ToolStripMenuItem(Path.GetFileName(fileName))
{
@ -136,6 +141,10 @@ namespace BizHawk.Client.EmuHawk
var asmBytes = File.ReadAllBytes(fileName);
var externalToolFile = Assembly.Load(asmBytes);
#endif
if (!externalToolFile.GetReferencedAssemblies().Any(static name => name.Name.StartsWithOrdinal("BizHawk.")))
{
return Fail("it doesn't reference a BizHawk assembly");
}
var entryPoint = externalToolFile.GetTypes()
.SingleOrDefault(t => typeof(IExternalToolForm).IsAssignableFrom(t) && t.GetCustomAttributes().OfType<ExternalToolAttribute>().Any());
if (entryPoint == null) throw new ExternalToolAttribute.MissingException();
@ -193,8 +202,7 @@ namespace BizHawk.Client.EmuHawk
}
catch (BadImageFormatException)
{
Console.WriteLine($"ignoring <exttools>/{fileName.MakeRelativeTo(DirectoryMonitor.Path).RemovePrefix("./")} as it doesn't seem to be an assembly (are you not targeting `net48`?)");
return null;
return Fail("it doesn't seem to be an assembly (are you not targeting `net48`?)");
}
catch (Exception e)
{