Command line: Load rom from command line arguments

UI/CommandLineHelper.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Mesen.GUI
-{
-	class CommandLineHelper
-	{
-		public static List<string> PreprocessCommandLineArguments(string[] args, bool toLower)
-		{
-			var switches = new List<string>();
-			for(int i = 0; i < args.Length; i++) {
-				if(args[i] != null) {
-					string arg = args[i].Trim();
-					if(arg.StartsWith("--")) {
-						arg = "/" + arg.Substring(2);
-					} else if(arg.StartsWith("-")) {
-						arg = "/" + arg.Substring(1);
-					}
-
-					if(toLower) {
-						arg = arg.ToLowerInvariant();
-					}
-					switches.Add(arg);
-				}
-			}
-			return switches;
-		}
-
-		public static void GetRomPathFromCommandLine(List<string> switches, out string romPath, out List<string> luaScriptsToLoad)
-		{
-			Func<string, bool, string> getValidPath = (string path, bool forLua) => {
-				path = path.Trim();
-				if(path.ToLower().EndsWith(".lua") == forLua) {
-					try {
-						if(!File.Exists(path)) {
-							//Try loading file as a relative path to the folder Mesen was started from
-							path = Path.Combine(Program.OriginalFolder, path);
-						}
-						if(File.Exists(path)) {
-							return path;
-						}
-					} catch { }
-				}
-				return null;
-			};
-
-			//Check if any Lua scripts were specified
-			luaScriptsToLoad = new List<string>();
-			foreach(string arg in switches) {
-				string path = getValidPath(arg, true);
-				if(path != null) {
-					luaScriptsToLoad.Add(path);
-				}
-			}
-
-			romPath = null;
-			foreach(string arg in switches) {
-				string path = getValidPath(arg, false);
-				if(path != null) {
-					romPath = path;
-					break;
-				}
-			}
-		}
-	}
-}

UI/Forms/frmMain.cs

@@ -4,6 +4,7 @@ using Mesen.GUI.Debugger;
 using Mesen.GUI.Emulation;
 using Mesen.GUI.Forms.Config;
 using Mesen.GUI.Updates;
+using Mesen.GUI.Utilities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -23,6 +24,7 @@ namespace Mesen.GUI.Forms
 		private NotificationListener _notifListener;
 		private ShortcutHandler _shortcuts;
 		private DisplayManager _displayManager;
+		private CommandLineHelper _commandLine;
 
 		public frmMain(string[] args)
 		{
@@ -31,6 +33,8 @@ namespace Mesen.GUI.Forms
 				return;
 			}
 
+			_commandLine = new CommandLineHelper(args);
+
 			ResourceHelper.LoadResources(Language.English);
 		}
 
@@ -69,9 +73,13 @@ namespace Mesen.GUI.Forms
 			BindShortcuts();
 
 			ctrlRecentGames.Initialize();
-			ctrlRecentGames.Visible = true;
 			ResizeRecentGames();
 
+			_commandLine.LoadGameFromCommandLine();
+			if(!EmuRunner.IsRunning()) {
+				ctrlRecentGames.Visible = true;
+			}
+
 			this.Resize += frmMain_Resize;
 		}
 

UI/Program.cs

@@ -12,6 +12,7 @@ using System.Windows.Forms;
 using System.Xml.Serialization;
 using Mesen.GUI.Config;
 using Mesen.GUI.Forms;
+using Mesen.GUI.Utilities;
 
 namespace Mesen.GUI
 {
@@ -118,8 +119,7 @@ namespace Mesen.GUI
 						singleInstance.ArgumentsReceived += (object sender, ArgumentsReceivedEventArgs e) => {
 							if(frmMain.IsHandleCreated) {
 								frmMain.BeginInvoke((MethodInvoker)(() => {
-									//frmMain.ProcessCommandLineArguments(CommandLineHelper.PreprocessCommandLineArguments(e.Args, true), false);
+									new CommandLineHelper(e.Args).LoadGameFromCommandLine();
-									//frmMain.LoadGameFromCommandLine(CommandLineHelper.PreprocessCommandLineArguments(e.Args, false));
 								}));
 							}
 						};

UI/UI.csproj

@@ -208,7 +208,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommandLineHelper.cs" />
     <Compile Include="Config\AudioConfig.cs" />
     <Compile Include="Config\BaseConfig.cs" />
     <Compile Include="Config\ConfigAttributes.cs" />
@@ -606,6 +605,7 @@
     <Compile Include="RuntimeChecker.cs" />
     <Compile Include="SingleInstance.cs" />
     <Compile Include="Utilities\ArchiveHelper.cs" />
+    <Compile Include="Utilities\CommandLineHelper.cs" />
     <Compile Include="Utilities\HexConverter.cs" />
     <Compile Include="Utilities\Md5Helper.cs" />
     <Compile Include="Updates\UpdateHelper.cs" />

UI/Utilities/CommandLineHelper.cs

@@ -0,0 +1,191 @@
+using Mesen.GUI.Config;
+using Mesen.GUI.Emulation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Mesen.GUI.Utilities
+{
+	class CommandLineHelper
+	{
+		private string[] _args;
+		private bool _noVideo;
+		private bool _noAudio;
+		private bool _noInput;
+		//private bool _loadLastSessionRequested;
+		private string _movieToRecord;
+		private List<string> _luaScriptsToLoad = new List<string>();
+
+		public CommandLineHelper(string[] args)
+		{
+			_args = args;
+		}
+
+		public void ProcessCommandLineArguments(List<string> switches, bool forStartup)
+		{
+			if(forStartup) {
+				_noVideo = switches.Contains("/novideo");
+				_noAudio = switches.Contains("/noaudio");
+				_noInput = switches.Contains("/noinput");
+			}
+
+			if(switches.Contains("/donotsavesettings")) {
+				ConfigManager.DoNotSaveSettings = true;
+			}
+
+			/*if(switches.Contains("/loadlastsession")) {
+				_loadLastSessionRequested = true;
+			}*/
+
+			Regex recordMovieCommand = new Regex("/recordmovie=([^\"]+)");
+			foreach(string command in switches) {
+				Match match = recordMovieCommand.Match(command);
+				if(match.Success) {
+					string moviePath = match.Groups[1].Value;
+					string folder = Path.GetDirectoryName(moviePath);
+					if(string.IsNullOrWhiteSpace(folder)) {
+						moviePath = Path.Combine(ConfigManager.MovieFolder, moviePath);
+					} else if(!Path.IsPathRooted(moviePath)) {
+						moviePath = Path.Combine(Program.OriginalFolder, moviePath);
+					}
+					if(!moviePath.ToLower().EndsWith(".mmo")) {
+						moviePath += ".mmo";
+					}
+					_movieToRecord = moviePath;
+					break;
+				}
+			}
+			
+			ConfigManager.ProcessSwitches(switches);
+		}
+
+		private void ProcessFullscreenSwitch(List<string> switches)
+		{
+			//TODO
+			/*if(switches.Contains("/fullscreen")) {
+				double scale = ConfigManager.Config.Video.VideoScale;
+				if(!ConfigManager.Config.Video.UseExclusiveFullscreen) {
+					//Go into fullscreen mode right away
+					SetFullscreenState(true);
+				}
+
+				_fullscreenRequested = true;
+				foreach(string option in switches) {
+					if(option.StartsWith("/videoscale=")) {
+						_switchOptionScale = scale;
+					}
+				}
+			}*/
+		}
+
+		public void LoadGameFromCommandLine()
+		{
+			List<string> switches = CommandLineHelper.PreprocessCommandLineArguments(_args, false);
+
+			string romPath;
+			CommandLineHelper.GetRomPathFromCommandLine(switches, out romPath, out _luaScriptsToLoad);
+
+			if(romPath != null) {
+				EmuRunner.LoadRom(romPath);
+			} else {
+				if(!EmuRunner.IsRunning()) {
+					//When no ROM is loaded, only process Lua scripts if a ROM was specified as a command line param
+					_luaScriptsToLoad.Clear();
+					_movieToRecord = null;
+					//_loadLastSessionRequested = false;
+				} else {
+					//No game was specified, but a game is running already, load the scripts right away
+					ProcessPostLoadCommandSwitches();
+				}
+			}
+		}
+
+		private void ProcessPostLoadCommandSwitches()
+		{
+			//TODO
+			/*if(_luaScriptsToLoad.Count > 0) {
+				foreach(string luaScript in _luaScriptsToLoad) {
+					frmScript scriptWindow = DebugWindowManager.OpenScriptWindow(true);
+					scriptWindow.LoadScriptFile(luaScript);
+				}
+				_luaScriptsToLoad.Clear();
+			}
+
+			if(_movieToRecord != null) {
+				if(EmuApi.MovieRecording()) {
+					EmuApi.MovieStop();
+				}
+				RecordMovieOptions options = new RecordMovieOptions(_movieToRecord, "", "", RecordMovieFrom.StartWithSaveData);
+				EmuApi.MovieRecord(ref options);
+				_movieToRecord = null;
+			}
+
+			if(_loadLastSessionRequested) {
+				_loadLastSessionRequested = false;
+				EmuRunner.LoadLastSession();
+			}*/
+		}
+
+		public static List<string> PreprocessCommandLineArguments(string[] args, bool toLower)
+		{
+			var switches = new List<string>();
+			for(int i = 0; i < args.Length; i++) {
+				if(args[i] != null) {
+					string arg = args[i].Trim();
+					if(arg.StartsWith("--")) {
+						arg = "/" + arg.Substring(2);
+					} else if(arg.StartsWith("-")) {
+						arg = "/" + arg.Substring(1);
+					}
+
+					if(toLower) {
+						arg = arg.ToLowerInvariant();
+					}
+					switches.Add(arg);
+				}
+			}
+			return switches;
+		}
+
+		public static void GetRomPathFromCommandLine(List<string> switches, out string romPath, out List<string> luaScriptsToLoad)
+		{
+			Func<string, bool, string> getValidPath = (string path, bool forLua) => {
+				path = path.Trim();
+				if(path.ToLower().EndsWith(".lua") == forLua) {
+					try {
+						if(!File.Exists(path)) {
+							//Try loading file as a relative path to the folder Mesen was started from
+							path = Path.Combine(Program.OriginalFolder, path);
+						}
+						if(File.Exists(path)) {
+							return path;
+						}
+					} catch { }
+				}
+				return null;
+			};
+
+			//Check if any Lua scripts were specified
+			luaScriptsToLoad = new List<string>();
+			foreach(string arg in switches) {
+				string path = getValidPath(arg, true);
+				if(path != null) {
+					luaScriptsToLoad.Add(path);
+				}
+			}
+
+			romPath = null;
+			foreach(string arg in switches) {
+				string path = getValidPath(arg, false);
+				if(path != null) {
+					romPath = path;
+					break;
+				}
+			}
+		}
+	}
+}