Merge pull request #22 from pieckenst/pwa

Pwa
pieckenst · Oct 13, 2022 · 95414f0 · 95414f0
2 parents e0d001f + 6536d1a
commit 95414f0
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 24 deletions.
diff --git a/.vs/handlerlaunch/FileContentIndex/3c1320b8-b4fc-4b2e-91a1-fa6b6b5b433a.vsidx b/.vs/handlerlaunch/FileContentIndex/3c1320b8-b4fc-4b2e-91a1-fa6b6b5b433a.vsidx
diff --git a/.vs/handlerlaunch/FileContentIndex/3f96457c-423b-435f-875e-0750da3e1546.vsidx b/.vs/handlerlaunch/FileContentIndex/3f96457c-423b-435f-875e-0750da3e1546.vsidx
diff --git a/.vs/handlerlaunch/FileContentIndex/75a44926-0277-40a2-9fed-37f1483c412f.vsidx b/.vs/handlerlaunch/FileContentIndex/75a44926-0277-40a2-9fed-37f1483c412f.vsidx
diff --git a/...e1b9100-44b7-4bd4-8e90-a496c5af6a57.vsidx → ...0e2faad-5baa-40e4-9796-321a4ed38a31.vsidx b/...e1b9100-44b7-4bd4-8e90-a496c5af6a57.vsidx → ...0e2faad-5baa-40e4-9796-321a4ed38a31.vsidx
diff --git a/.vs/handlerlaunch/FileContentIndex/ba70402f-51cb-4123-af2b-81077d122d08.vsidx b/.vs/handlerlaunch/FileContentIndex/ba70402f-51cb-4123-af2b-81077d122d08.vsidx
diff --git a/.vs/handlerlaunch/v17/.suo b/.vs/handlerlaunch/v17/.suo
diff --git a/handlerlaunch/Properties/launchSettings.json b/handlerlaunch/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "handlerlaunch": {
       "commandName": "Project",
-      "commandLineArgs": "?spellbornhandle=yes:?gamepath=D:%5CGames%5CSpellborn"
+      "commandLineArgs": "?spellbornhandle=yes?:gamepath=\"D:%5CGames%5CSpellborn\""
     }
   }
 }
diff --git a/handlerlaunch/SupportObjects.cs b/handlerlaunch/SupportObjects.cs
@@ -200,33 +200,24 @@ public class spellbornsupporter
         private bool enableLaunch;
 
         private static readonly ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public void startupRoutine(string[] args)
+        public string dogamepathreturn(string[] args)
         {
-#if DEBUG
-            Console.WriteLine(args[0]);
-#else
-            Console.WriteLine("");
-#endif
-            try
-            {
-                string gamepathns = Program.TextFollowing(args[0], ":?gamepath=");
+            string thirdsanitationstep = "";
+            try {
+                Console.WriteLine(args[0]);
+                string gamepathns = Program.TextFollowing(args[0].ToString(), "gamepath=");
+                Console.WriteLine(gamepathns);
                 string gamepathcst = "";
-                string firstsanstep = "";
                 string secsanitationstep = "";
-                string thirdsanitationstep = "";
+
                 if (gamepathns.Contains(":?"))
                     gamepathcst = gamepathns.Split(":?")[0];
-                if (gamepathcst.Contains("%20")) { firstsanstep = gamepathcst.Replace("%20", ""); Console.WriteLine(firstsanstep); } else { firstsanstep = gamepathcst; }
-                if (gamepathcst.Contains("%22")) { secsanitationstep = firstsanstep.Replace("%22", ""); Console.WriteLine(secsanitationstep); } else { secsanitationstep = gamepathcst; }
-                if (gamepathcst.Contains("%5C")) { thirdsanitationstep = secsanitationstep.Replace("%5C", "\\"); Console.WriteLine(thirdsanitationstep); }
-                passoverfromweb = thirdsanitationstep;
-#if DEBUG
-                Console.WriteLine(passoverfromweb);
-
-#else
-                Console.WriteLine("");
-#endif
+                else { gamepathcst= gamepathns ;}
+                if (gamepathcst.Contains("%22")) { secsanitationstep = gamepathcst.Replace("%22", ""); } else { secsanitationstep = gamepathcst; }
+                if (gamepathcst.Contains("%5C")) { thirdsanitationstep = secsanitationstep.Replace("%5C", "/"); }
+                if (thirdsanitationstep == null) {
+                    thirdsanitationstep = "D:\\Games\\Spellborn";
+                }
             }
             catch (Exception e)
             {
@@ -236,8 +227,29 @@ public void startupRoutine(string[] args)
                 Console.WriteLine(e.StackTrace);
                 _log.Error(e.Message);
                 Console.ReadLine();
-                passoverfromweb= "D:\\Games\\Spellborn";
+                thirdsanitationstep = "D:\\Games\\Spellborn";
             }
+            return thirdsanitationstep;
+        }
+        public void startupRoutine(string[] args)
+        {
+#if DEBUG
+            Console.WriteLine(args[0]);
+#else
+            Console.WriteLine("");
+#endif
+            string thirdsanitationstep = dogamepathreturn(args);
+
+
+                passoverfromweb = thirdsanitationstep;
+#if DEBUG
+                Console.WriteLine(passoverfromweb);
+
+#else
+                Console.WriteLine("");
+#endif
+
+
             bool folderExists = Directory.Exists(passoverfromweb);
             try {
                 if (!folderExists)

diff --git a/handlerlaunch/bin/Debug/net6.0-windows/WMconsole.dll b/handlerlaunch/bin/Debug/net6.0-windows/WMconsole.dll
diff --git a/handlerlaunch/bin/Debug/net6.0-windows/WMconsole.pdb b/handlerlaunch/bin/Debug/net6.0-windows/WMconsole.pdb
diff --git a/handlerlaunch/bin/Release/net6.0-windows/WMconsole.dll b/handlerlaunch/bin/Release/net6.0-windows/WMconsole.dll
diff --git a/handlerlaunch/bin/Release/net6.0-windows/WMconsole.pdb b/handlerlaunch/bin/Release/net6.0-windows/WMconsole.pdb
diff --git a/handlerlaunch/obj/Debug/net6.0-windows/WMconsole.dll b/handlerlaunch/obj/Debug/net6.0-windows/WMconsole.dll
diff --git a/handlerlaunch/obj/Debug/net6.0-windows/WMconsole.pdb b/handlerlaunch/obj/Debug/net6.0-windows/WMconsole.pdb
diff --git a/handlerlaunch/obj/Debug/net6.0-windows/handlerlaunch.csproj.AssemblyReference.cache b/handlerlaunch/obj/Debug/net6.0-windows/handlerlaunch.csproj.AssemblyReference.cache
diff --git a/handlerlaunch/obj/Debug/net6.0-windows/ref/WMconsole.dll b/handlerlaunch/obj/Debug/net6.0-windows/ref/WMconsole.dll
diff --git a/handlerlaunch/obj/Debug/net6.0-windows/refint/WMconsole.dll b/handlerlaunch/obj/Debug/net6.0-windows/refint/WMconsole.dll
diff --git a/handlerlaunch/obj/Release/net6.0-windows/WMconsole.dll b/handlerlaunch/obj/Release/net6.0-windows/WMconsole.dll
diff --git a/handlerlaunch/obj/Release/net6.0-windows/WMconsole.pdb b/handlerlaunch/obj/Release/net6.0-windows/WMconsole.pdb
diff --git a/handlerlaunch/obj/Release/net6.0-windows/handlerlaunch.csproj.AssemblyReference.cache b/handlerlaunch/obj/Release/net6.0-windows/handlerlaunch.csproj.AssemblyReference.cache