novetuscmd enhancements

NovetusLauncher/NovetusCMD/CommandLineArguments.cs

@@ -0,0 +1,114 @@
+using System.Collections.Specialized;
+using System.Text.RegularExpressions;
+
+namespace NovetusCMD
+{
+    public class CommandLineArguments
+    {
+        //credit to GriffonRL on codeproject
+        /// <summary>
+        /// Arguments class
+        /// </summary>
+        public class Arguments
+        {
+            // Variables
+            private StringDictionary Parameters;
+
+            // Constructor
+            public Arguments(string[] Args)
+            {
+                Parameters = new StringDictionary();
+                Regex Spliter = new Regex(@"^-{1,2}|^/|=|:",
+                    RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+                Regex Remover = new Regex(@"^['""]?(.*?)['""]?$",
+                    RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+                string Parameter = null;
+                string[] Parts;
+
+                // Valid parameters forms:
+                // {-,/,--}param{ ,=,:}((",')value(",'))
+                // Examples: 
+                // -param1 value1 --param2 /param3:"Test-:-work" 
+                //   /param4=happy -param5 '--=nice=--'
+                foreach (string Txt in Args)
+                {
+                    // Look for new parameters (-,/ or --) and a
+                    // possible enclosed value (=,:)
+                    Parts = Spliter.Split(Txt, 3);
+
+                    switch (Parts.Length)
+                    {
+                        // Found a value (for the last parameter 
+                        // found (space separator))
+                        case 1:
+                            if (Parameter != null)
+                            {
+                                if (!Parameters.ContainsKey(Parameter))
+                                {
+                                    Parts[0] =
+                                        Remover.Replace(Parts[0], "$1");
+
+                                    Parameters.Add(Parameter, Parts[0]);
+                                }
+                                Parameter = null;
+                            }
+                            // else Error: no parameter waiting for a value (skipped)
+                            break;
+
+                        // Found just a parameter
+                        case 2:
+                            // The last parameter is still waiting. 
+                            // With no value, set it to true.
+                            if (Parameter != null)
+                            {
+                                if (!Parameters.ContainsKey(Parameter))
+                                    Parameters.Add(Parameter, "true");
+                            }
+                            Parameter = Parts[1];
+                            break;
+
+                        // Parameter with enclosed value
+                        case 3:
+                            // The last parameter is still waiting. 
+                            // With no value, set it to true.
+                            if (Parameter != null)
+                            {
+                                if (!Parameters.ContainsKey(Parameter))
+                                    Parameters.Add(Parameter, "true");
+                            }
+
+                            Parameter = Parts[1];
+
+                            // Remove possible enclosing characters (",')
+                            if (!Parameters.ContainsKey(Parameter))
+                            {
+                                Parts[2] = Remover.Replace(Parts[2], "$1");
+                                Parameters.Add(Parameter, Parts[2]);
+                            }
+
+                            Parameter = null;
+                            break;
+                    }
+                }
+                // In case a parameter is still waiting
+                if (Parameter != null)
+                {
+                    if (!Parameters.ContainsKey(Parameter))
+                        Parameters.Add(Parameter, "true");
+                }
+            }
+
+            // Retrieve a parameter value if it exists 
+            // (overriding C# indexer property)
+            public string this[string Param]
+            {
+                get
+                {
+                    return (Parameters[Param]);
+                }
+            }
+        }
+    }
+}

NovetusLauncher/NovetusCMD/NovetusCMD.csproj

@@ -75,6 +75,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CommandLineArguments.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

NovetusLauncher/NovetusCMD/Program.cs

@@ -8,10 +8,9 @@
  */
 using System;
 using Mono.Nat;
-
 using System.Diagnostics;
 using System.IO;
-
+using static NovetusCMD.CommandLineArguments;
 
 namespace NovetusCMD
 {
@@ -196,43 +195,88 @@ namespace NovetusCMD
 		public static void Main(string[] args)
 		{
 			bool StartInNo3D = false;
+            bool OverrideINI = false;
 
-			if (args.Length == 0)
+            if (args.Length == 0)
 			{
-    			ConsolePrint("WARNING 1 - NovetusCMD will launch the server in 3D mode. To launch the server in No3D mode, add -no3d as a command line argument.", 5);
+                ConsolePrint("Help: Command Line Arguments", 3);
-			}
+                ConsolePrint("---------", 1);
+                ConsolePrint("-no3d | Launches server in NoGraphics mode", 3);
+                ConsolePrint("-overrideconfig | Override the launcher settings.", 3);
+                ConsolePrint("-overrideconfig must be added in order for the below commands to function.", 5);
+                ConsolePrint("-upnp | Turns on UPnP.", 4);
+                ConsolePrint("-map <map filename> | Sets the map.", 4);
+                ConsolePrint("-client <client name> | Sets the client.", 4);
+                ConsolePrint("-port <port number> | Sets the server port.", 4);
+                ConsolePrint("-maxplayers <number of players> | Sets the number of players.", 4);
+                ConsolePrint("---------", 1);
+            }
 			else
 			{
-				foreach (string s in args)
+                Arguments CommandLine = new Arguments(args);
-      			{
-        			GlobalVars.SharedArgs = ProcessInput(s);
-      			}
 
-				if (GlobalVars.SharedArgs.Equals("-no3d"))
+                if (CommandLine["no3d"] != null)
 				{
 					StartInNo3D = true;
-				}
+                    ConsolePrint("NovetusCMD will now launch the server in No3D mode.\n", 4);
-			}
+                }
+
+                if (CommandLine["overrideconfig"] != null)
+                {
+                    OverrideINI = true;
+                    ConsolePrint("NovetusCMD will no longer grab values from the INI file.\n", 4);
+
+                    if (CommandLine["upnp"] != null)
+                    {
+                        GlobalVars.UPnP = true;
+                        ConsolePrint("NovetusCMD will now use UPnP for port forwarding.\n", 4);
+                    }
+
+                    if (CommandLine["map"] != null)
+                    {
+                        GlobalVars.Map = CommandLine["map"];
+                    }
+
+                    if (CommandLine["client"] != null)
+                    {
+                        GlobalVars.SelectedClient = CommandLine["client"];
+                    }
+
+                    if (CommandLine["port"] != null)
+                    {
+                        GlobalVars.RobloxPort = Convert.ToInt32(CommandLine["port"]);
+                    }
+
+                    if (CommandLine["maxplayers"] != null)
+                    {
+                        GlobalVars.PlayerLimit = Convert.ToInt32(CommandLine["maxplayers"]);
+                    }
+                }
+            }
 			
-			ConsolePrint("NOTE: NovetusCMD will use values defined from the launcher. If you want to define values for NovetusCMD, change the settings in the launcher through the 'Host' tab.", 5);
 			string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO
 			string version = lines[0];
     		GlobalVars.DefaultClient = lines[1];
     		GlobalVars.DefaultMap = lines[2];
     		GlobalVars.SelectedClient = GlobalVars.DefaultClient;
     		GlobalVars.Map = GlobalVars.DefaultMap;
-    		Console.Title = "Novetus " + version;
+    		Console.Title = "Novetus " + version + " CMD";
-    		ConsolePrint("Novetus version " + version + " loaded. Initializing config.", 4);
-    		
-			if (!File.Exists(GlobalVars.ConfigDir + "\\config.ini"))
-			{
-				ConsolePrint("WARNING 2 - config.ini not found. Creating one with default values.", 5);
-				WriteConfigValues();
-			}
-			
     		GlobalVars.Version = version;
 
-    		ReadConfigValues();
+            if (!OverrideINI)
+            {
+                ConsolePrint("NovetusCMD is now loading all server configurations from the INI file.", 5);
+                ConsolePrint("NovetusCMD version " + version + " loaded. Initializing config.", 4);
+
+                if (!File.Exists(GlobalVars.ConfigDir + "\\config.ini"))
+                {
+                    ConsolePrint("WARNING 2 - config.ini not found. Creating one with default values.", 5);
+                    WriteConfigValues();
+                }
+
+                ReadConfigValues();
+            }
+
     		InitUPnP();
     		StartWebServer();
     		
@@ -307,7 +351,7 @@ namespace NovetusCMD
 			}
 		}
 
-		static void ServerExited(object sender, EventArgs e)
+        static void ServerExited(object sender, EventArgs e)
 		{
             Environment.Exit(0);
 		}

NovetusLauncher/NovetusLauncher/bin/Release/Novetus.vshost.exe.manifest

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>