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

Pass globals to ExternalToolManager via ctor and Restart method

This commit is contained in:
YoshiRulz 2020-11-29 19:06:45 +10:00
parent 84f0d57fd5
commit f7a7b722c5
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -344,7 +344,7 @@ namespace BizHawk.Client.EmuHawk
Controls.SetChildIndex(_presentationPanel, 0);
Tools = new ToolManager(this, Config, DisplayManager, InputManager, Emulator, MovieSession, Game);
ExtToolManager = new ExternalToolManager();
ExtToolManager = new ExternalToolManager(Config.PathEntries, () => (EmuClientApi.SystemIdConverter.Convert(Emulator.SystemId), Game.Hash));
// TODO GL - move these event handlers somewhere less obnoxious line in the On* overrides
Load += (o, e) =>
@ -2793,7 +2793,7 @@ namespace BizHawk.Client.EmuHawk
InitControls(); // rebind hotkeys
InputManager.SyncControls(Emulator, MovieSession, Config);
Tools.Restart(Config, Emulator, Game);
ExtToolManager.Restart();
ExtToolManager.Restart(Config.PathEntries);
AddOnScreenMessage($"Config file loaded: {iniPath}");
}

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

@ -13,20 +13,26 @@ namespace BizHawk.Client.EmuHawk
{
public sealed class ExternalToolManager
{
private readonly Func<(CoreSystem System, string Hash)> _getLoadedRomInfoCallback;
private FileSystemWatcher DirectoryMonitor;
private readonly List<ToolStripMenuItem> MenuItems = new List<ToolStripMenuItem>();
public ExternalToolManager() => Restart();
public ExternalToolManager(PathEntryCollection paths, Func<(CoreSystem System, string Hash)> getLoadedRomInfoCallback)
{
_getLoadedRomInfoCallback = getLoadedRomInfoCallback;
Restart(paths);
}
public void Restart()
public void Restart(PathEntryCollection paths)
{
if (DirectoryMonitor != null)
{
DirectoryMonitor.Created -= DirectoryMonitor_Created;
DirectoryMonitor.Dispose();
}
var extToolsDir = GlobalWin.Config.PathEntries["Global", "External Tools"].Path;
var extToolsDir = paths["Global", "External Tools"].Path;
if (!Directory.Exists(extToolsDir)) Directory.CreateDirectory(extToolsDir);
DirectoryMonitor = new FileSystemWatcher(extToolsDir, "*.dll")
{
@ -91,7 +97,7 @@ namespace BizHawk.Client.EmuHawk
item.Tag = (externalToolFile.Location, entryPoint.FullName); // Tag set => no errors (show custom icon even when disabled)
if (applicabilityAttrs.Count == 1)
{
var system = EmuClientApi.SystemIdConverter.Convert(GlobalWin.Emulator.SystemId);
var (system, loadedRomHash) = _getLoadedRomInfoCallback();
if (applicabilityAttrs[0].NotApplicableTo(system))
{
item.ToolTipText = system == CoreSystem.Null
@ -99,7 +105,7 @@ namespace BizHawk.Client.EmuHawk
: "This tool doesn't work with this system";
return item;
}
if (applicabilityAttrs[0].NotApplicableTo(GlobalWin.Game.Hash, system))
if (applicabilityAttrs[0].NotApplicableTo(loadedRomHash, system))
{
item.ToolTipText = "This tool doesn't work with this game";
return item;