From 85a65ffdfd47ecd22dcb27e64260d25bc7847cb9 Mon Sep 17 00:00:00 2001
From: Rosalie Wanders <rosalie@mailbox.org>
Date: Thu, 9 Nov 2023 14:49:16 +0100
Subject: [PATCH] SporeModManager: improve argument parsing

---
 SporeModManager/main.cpp | 89 ++++++++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 31 deletions(-)

diff --git a/SporeModManager/main.cpp b/SporeModManager/main.cpp
index ed53244..49b5a89 100644
--- a/SporeModManager/main.cpp
+++ b/SporeModManager/main.cpp
@@ -10,7 +10,6 @@
 #include "SporeModManager.hpp"
 #include "SporeModManagerHelpers.hpp"
 
-#include <algorithm>
 #include <filesystem>
 #include <iostream>
 #include <cstring>
@@ -23,9 +22,11 @@ using namespace SporeModManagerHelpers;
 
 #ifdef _WIN32
 #define arg_str(str) L##str
+#define arg_char(c) L##c
 #define arg_str_type std::wstring
 #else
 #define arg_str(str) str
+#define arg_char(c) c
 #define arg_str_type std::string
 #endif // _WIN32
 
@@ -98,54 +99,80 @@ int main(int argc, char** argv)
 
     struct option_argument optionArgs[] =
     {
-        { arg_str("-n"), arg_str("--no-input"),      hasNoInputOption },
-        { arg_str("-u"), arg_str("--update-needed"), hasUpdateOption },
-        { arg_str("-s"), arg_str("--save-paths"),    hasSavePathsOption },
+        { arg_str("n"), arg_str("no-input"),      hasNoInputOption },
+        { arg_str("u"), arg_str("update-needed"), hasUpdateOption },
+        { arg_str("s"), arg_str("save-paths"),    hasSavePathsOption },
     };
 
     struct path_argument pathArgs[] =
     {
-        { arg_str("--corelibs-path"), coreLibsPath },
-        { arg_str("--modlibs-path"),  modLibsPath },
-        { arg_str("--data-path"),     dataPath },
-        { arg_str("--ep1-path"),      ep1Path },
+        { arg_str("corelibs-path"), coreLibsPath },
+        { arg_str("modlibs-path"),  modLibsPath },
+        { arg_str("data-path"),     dataPath },
+        { arg_str("ep1-path"),      ep1Path },
     };
 
     for (size_t i = 0; i < args.size(); i++)
     {
         arg_str_type arg = args.at(i);
 
-        for (const auto& optionArg : optionArgs)
+        if (arg.at(0) == arg_char('-'))
         {
-            if (arg == optionArg.shortArgument ||
-                arg == optionArg.longArgument)
-            {
-                optionArg.value = true;
-                args.erase(args.begin() + i);
-                i -= 1;
+            if (arg.at(1) != arg_char('-'))
+            { // short option
+                // strip '-'
+                arg.erase(0, 1);
+                for (const auto& optionArg : optionArgs)
+                {
+                    auto pos = arg.find(optionArg.shortArgument);
+                    if (pos != arg_str_type::npos)
+                    {
+                        optionArg.value = true;
+                        arg.erase(pos, 1);
+                    }
+                }
             }
-        }
-
-        for (const auto& pathArg : pathArgs)
-        {
-            if (arg == pathArg.argument)
-            {
-                if (i == (args.size() - 1))
+            else
+            { // long option
+                // strip '--'
+                arg.erase(0, 2);
+                for (const auto& optionArg : optionArgs)
                 {
-                    ShowUsage();
-                    return 1;
+                    if (arg == optionArg.longArgument)
+                    {
+                        optionArg.value = true;
+                        arg.clear();
+                    }
                 }
-                pathArg.path = args.at(i + 1);
-                if (!std::filesystem::is_directory(pathArg.path))
+                for (const auto& pathArg : pathArgs)
                 {
-                    ShowUsage();
-                    return 1;
+                    if (arg == pathArg.argument)
+                    {
+                        if (i == (args.size() - 1))
+                        {
+                            ShowUsage();
+                            return 1;
+                        }
+                        pathArg.path = args.at(i + 1);
+                        if (!std::filesystem::is_directory(pathArg.path))
+                        {
+                            ShowUsage();
+                            return 1;
+                        }
+                        args.erase(args.begin() + i + 1);
+                        arg.clear();
+                    }
                 }
-                args.erase(args.begin() + i + 1);
-                args.erase(args.begin() + i);
-                i -= 1;
             }
         }
+
+        // when all options have been parsed,
+        // strip the arg and continue
+        if (arg.empty())
+        {
+            args.erase(args.begin() + i);
+            i -= 1;
+        }
     }
 
     // apply options