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

support --config=c:\path\to\config.ini (fixes #1404)

This commit is contained in:
zeromus 2018-12-23 00:23:57 -05:00
parent adf4dd6150
commit 15131a0626
5 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.Client.Common/PathManager.cs
View File

@ -13,6 +13,11 @@ namespace BizHawk.Client.Common
{
public static class PathManager
{
static PathManager()
{
SetDefaultIniPath(MakeProgramRelativePath("config.ini"));
}
public static string GetExeDirectoryAbsolute()
{
var path = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
@ -40,7 +45,12 @@ namespace BizHawk.Client.Common
/// <summary>
/// The location of the default INI file
/// </summary>
public static string DefaultIniPath => MakeProgramRelativePath("config.ini");
public static string DefaultIniPath { get; private set; }
public static void SetDefaultIniPath(string newDefaultIniPath)
{
DefaultIniPath = newDefaultIniPath;
}
/// <summary>
/// Gets absolute base as derived from EXE

6
BizHawk.Client.EmuHawk/ArgParser.cs
View File

@ -14,6 +14,8 @@ namespace BizHawk.Client.EmuHawk
public string cmdRom = null;
public string cmdLoadSlot = null;
public string cmdLoadState = null;
public string cmdConfigPath = null;
public string cmdConfigFile = null;
public string cmdMovie = null;
public string cmdDumpType = null;
public string cmdDumpName = null;
@ -55,6 +57,10 @@ namespace BizHawk.Client.EmuHawk
{
cmdLoadState = args[i].Substring(args[i].IndexOf('=') + 1);
}
if (arg.StartsWith("--config="))
{
cmdConfigFile = args[i].Substring(args[i].IndexOf('=') + 1);
}
else if (arg.StartsWith("--movie="))
{
cmdMovie = args[i].Substring(args[i].IndexOf('=') + 1);

2
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -2782,7 +2782,7 @@ namespace BizHawk.Client.EmuHawk
showMenuVisible = true; // need to always be able to restore this as an emergency measure
}
if (argParse._chromeless)
if (argParser._chromeless)
{
showMenuVisible = true; // I decided this was always possible in chromeless mode, we'll see what they think
}

72
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -154,7 +154,7 @@ namespace BizHawk.Client.EmuHawk
}
};
argParse.ParseArguments(args);
argParser.ParseArguments(args);
Database.LoadDatabase(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb.txt"));
@ -270,14 +270,14 @@ namespace BizHawk.Client.EmuHawk
Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy);
}
if (argParse.cmdRom != null)
if (argParser.cmdRom != null)
{
// Commandline should always override auto-load
var ioa = OpenAdvancedSerializer.ParseWithLegacy(argParse.cmdRom);
LoadRom(argParse.cmdRom, new LoadRomArgs { OpenAdvanced = ioa });
var ioa = OpenAdvancedSerializer.ParseWithLegacy(argParser.cmdRom);
LoadRom(argParser.cmdRom, new LoadRomArgs { OpenAdvanced = ioa });
if (Global.Game == null)
{
MessageBox.Show("Failed to load " + argParse.cmdRom + " specified on commandline");
MessageBox.Show("Failed to load " + argParser.cmdRom + " specified on commandline");
}
}
else if (Global.Config.RecentRoms.AutoLoad && !Global.Config.RecentRoms.Empty)
@ -285,7 +285,7 @@ namespace BizHawk.Client.EmuHawk
LoadRomFromRecent(Global.Config.RecentRoms.MostRecent);
}
if (argParse.cmdMovie != null)
if (argParser.cmdMovie != null)
{
_supressSyncSettingsWarning = true; // We dont' want to be nagged if we are attempting to automate
if (Global.Game == null)
@ -296,21 +296,21 @@ namespace BizHawk.Client.EmuHawk
// If user picked a game, then do the commandline logic
if (!Global.Game.IsNullInstance)
{
var movie = MovieService.Get(argParse.cmdMovie);
var movie = MovieService.Get(argParser.cmdMovie);
Global.MovieSession.ReadOnly = true;
// if user is dumping and didnt supply dump length, make it as long as the loaded movie
if (argParse._autoDumpLength == 0)
if (argParser._autoDumpLength == 0)
{
argParse._autoDumpLength = movie.InputLogLength;
argParser._autoDumpLength = movie.InputLogLength;
}
// Copy pasta from drag & drop
if (MovieImport.IsValidMovieExtension(Path.GetExtension(argParse.cmdMovie)))
if (MovieImport.IsValidMovieExtension(Path.GetExtension(argParser.cmdMovie)))
{
string errorMsg;
string warningMsg;
var imported = MovieImport.ImportFile(argParse.cmdMovie, out errorMsg, out warningMsg);
var imported = MovieImport.ImportFile(argParser.cmdMovie, out errorMsg, out warningMsg);
if (!string.IsNullOrEmpty(errorMsg))
{
MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
@ -328,7 +328,7 @@ namespace BizHawk.Client.EmuHawk
else
{
StartNewMovie(movie, false);
Global.Config.RecentMovies.Add(argParse.cmdMovie);
Global.Config.RecentMovies.Add(argParser.cmdMovie);
}
_supressSyncSettingsWarning = false;
@ -355,20 +355,20 @@ namespace BizHawk.Client.EmuHawk
}
}
if (argParse.startFullscreen || Global.Config.StartFullscreen)
if (argParser.startFullscreen || Global.Config.StartFullscreen)
{
_needsFullscreenOnLoad = true;
}
if (!Global.Game.IsNullInstance)
{
if (argParse.cmdLoadState != null)
if (argParser.cmdLoadState != null)
{
LoadState(argParse.cmdLoadState, Path.GetFileName(argParse.cmdLoadState));
LoadState(argParser.cmdLoadState, Path.GetFileName(argParser.cmdLoadState));
}
else if (argParse.cmdLoadSlot != null)
else if (argParser.cmdLoadSlot != null)
{
LoadQuickSave("QuickSave" + argParse.cmdLoadSlot);
LoadQuickSave("QuickSave" + argParser.cmdLoadSlot);
}
else if (Global.Config.AutoLoadLastSaveSlot)
{
@ -377,14 +377,14 @@ namespace BizHawk.Client.EmuHawk
}
//start Lua Console if requested in the command line arguments
if (argParse.luaConsole)
if (argParser.luaConsole)
{
GlobalWin.Tools.Load<LuaConsole>();
}
//load Lua Script if requested in the command line arguments
if (argParse.luaScript != null)
if (argParser.luaScript != null)
{
GlobalWin.Tools.LuaConsole.LoadLuaFile(argParse.luaScript);
GlobalWin.Tools.LuaConsole.LoadLuaFile(argParser.luaScript);
}
GlobalWin.Tools.AutoLoad();
@ -407,9 +407,9 @@ namespace BizHawk.Client.EmuHawk
}
// start dumping, if appropriate
if (argParse.cmdDumpType != null && argParse.cmdDumpName != null)
if (argParser.cmdDumpType != null && argParser.cmdDumpName != null)
{
RecordAv(argParse.cmdDumpType, argParse.cmdDumpName);
RecordAv(argParser.cmdDumpType, argParser.cmdDumpName);
}
SetMainformMovieInfo();
@ -1023,15 +1023,15 @@ namespace BizHawk.Client.EmuHawk
{
// TODO - maybe apply a hack tracked during fullscreen here to override it
FormBorderStyle = FormBorderStyle.None;
MainMenuStrip.Visible = Global.Config.DispChrome_MenuFullscreen && !argParse._chromeless;
MainStatusBar.Visible = Global.Config.DispChrome_StatusBarFullscreen && !argParse._chromeless;
MainMenuStrip.Visible = Global.Config.DispChrome_MenuFullscreen && !argParser._chromeless;
MainStatusBar.Visible = Global.Config.DispChrome_StatusBarFullscreen && !argParser._chromeless;
}
else
{
MainStatusBar.Visible = Global.Config.DispChrome_StatusBarWindowed && !argParse._chromeless;
MainMenuStrip.Visible = Global.Config.DispChrome_MenuWindowed && !argParse._chromeless;
MaximizeBox = MinimizeBox = Global.Config.DispChrome_CaptionWindowed && !argParse._chromeless;
if (Global.Config.DispChrome_FrameWindowed == 0 || argParse._chromeless)
MainStatusBar.Visible = Global.Config.DispChrome_StatusBarWindowed && !argParser._chromeless;
MainMenuStrip.Visible = Global.Config.DispChrome_MenuWindowed && !argParser._chromeless;
MaximizeBox = MinimizeBox = Global.Config.DispChrome_CaptionWindowed && !argParser._chromeless;
if (Global.Config.DispChrome_FrameWindowed == 0 || argParser._chromeless)
{
FormBorderStyle = FormBorderStyle.None;
}
@ -1401,7 +1401,7 @@ namespace BizHawk.Client.EmuHawk
private int _lastOpenRomFilter;
private ArgParser argParse = new ArgParser();
private ArgParser argParser = new ArgParser();
// Resources
private Bitmap _statusBarDiskLightOnImage;
private Bitmap _statusBarDiskLightOffImage;
@ -1470,7 +1470,7 @@ namespace BizHawk.Client.EmuHawk
}
}
if (!Global.Config.DispChrome_CaptionWindowed || argParse._chromeless)
if (!Global.Config.DispChrome_CaptionWindowed || argParser._chromeless)
{
str = "";
}
@ -3368,9 +3368,9 @@ namespace BizHawk.Client.EmuHawk
try
{
// is this the best time to handle this? or deeper inside?
if (argParse._currAviWriterFrameList != null)
if (argParser._currAviWriterFrameList != null)
{
if (!argParse._currAviWriterFrameList.Contains(Emulator.Frame))
if (!argParser._currAviWriterFrameList.Contains(Emulator.Frame))
{
goto HANDLE_AUTODUMP;
}
@ -3453,13 +3453,13 @@ namespace BizHawk.Client.EmuHawk
}
HANDLE_AUTODUMP:
if (argParse._autoDumpLength > 0)
if (argParser._autoDumpLength > 0)
{
argParse._autoDumpLength--;
if (argParse._autoDumpLength == 0) // finish
argParser._autoDumpLength--;
if (argParser._autoDumpLength == 0) // finish
{
StopAv();
if (argParse._autoCloseOnDump)
if (argParser._autoCloseOnDump)
{
_exitRequestPending = true;
}

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

@ -284,19 +284,20 @@ namespace BizHawk.Client.EmuHawk
BizHawk.Common.TempFileManager.Start();
HawkFile.ArchiveHandlerFactory = new SevenZipSharpArchiveHandler();
string iniPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "config.ini");
ArgParser argParser = new ArgParser();
argParser.ParseArguments(args);
if (argParser.cmdConfigFile != null) PathManager.SetDefaultIniPath(argParser.cmdConfigFile);
try
{
Global.Config = ConfigService.Load<Config>(iniPath);
Global.Config = ConfigService.Load<Config>(PathManager.DefaultIniPath);
} catch (Exception e) {
new ExceptionBox(e).ShowDialog();
new ExceptionBox("Since your config file is corrupted, we're going to recreate it. Back it up before proceeding if you want to investigate further.").ShowDialog();
File.Delete(iniPath);
Global.Config = ConfigService.Load<Config>(iniPath);
File.Delete(PathManager.DefaultIniPath);
Global.Config = ConfigService.Load<Config>(PathManager.DefaultIniPath);
}
Global.Config.ResolveDefaults();