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

LuaFileList - simplify

This commit is contained in:
adelikat 2020-05-31 11:07:20 -05:00
parent f082ef1f4f
commit c057c5793c
2 changed files with 34 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/BizHawk.Client.Common/lua/LuaFileList.cs
View File

@ -12,8 +12,6 @@ namespace BizHawk.Client.Common
private bool _changes;
public Action ChangedCallback { get; set; }
public Action LoadCallback { get; set; }
public bool Changes
{
get => _changes;
@ -64,52 +62,44 @@ namespace BizHawk.Client.Common
return base.Remove(item);
}
public new int RemoveAll(Predicate<LuaFile> match)
{
return base.RemoveAll(match);
}
public bool LoadLuaSession(string path, bool disableOnLoad)
{
var file = new FileInfo(path);
if (file.Exists)
if (!file.Exists)
{
Clear();
using (var sr = file.OpenText())
{
string line;
while ((line = sr.ReadLine()) != null)
{
if (line.StartsWith("---"))
{
Add(LuaFile.SeparatorInstance);
}
else
{
var scriptPath = line.Substring(2, line.Length - 2);
if (!Path.IsPathRooted(scriptPath))
{
var directory = Path.GetDirectoryName(path);
scriptPath = Path.GetFullPath(Path.Combine(directory ?? "", scriptPath));
}
Add(new LuaFile(scriptPath)
{
State = !disableOnLoad && line.Substring(0, 1) == "1"
? LuaFile.RunState.Running
: LuaFile.RunState.Disabled
});
}
}
}
_filename = path;
LoadCallback?.Invoke();
return true;
return false;
}
return false;
Clear();
using var sr = file.OpenText();
string line;
while ((line = sr.ReadLine()) != null)
{
if (line.StartsWith("---"))
{
Add(LuaFile.SeparatorInstance);
}
else
{
var scriptPath = line.Substring(2, line.Length - 2);
if (!Path.IsPathRooted(scriptPath))
{
var directory = Path.GetDirectoryName(path);
scriptPath = Path.GetFullPath(Path.Combine(directory ?? "", scriptPath));
}
Add(new LuaFile(scriptPath)
{
State = !disableOnLoad && line.Substring(0, 1) == "1"
? LuaFile.RunState.Running
: LuaFile.RunState.Disabled
});
}
}
_filename = path;
return true;
}
public void SaveSession()

2
src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -128,7 +128,6 @@ namespace BizHawk.Client.EmuHawk
}
LuaImp.ScriptList.ChangedCallback = SessionChangedCallback;
LuaImp.ScriptList.LoadCallback = ClearOutputWindow;
if (Config.RecentLuaSession.AutoLoad && !Config.RecentLuaSession.Empty)
{
@ -525,6 +524,7 @@ namespace BizHawk.Client.EmuHawk
Config.RecentLua.Add(script.Path);
}
ClearOutputWindow();
return result;
}