SporeModManager: add commandline options

Rosalie241 · Nov 2, 2023 · b8aaa11 · b8aaa11
1 parent c000cdf
commit b8aaa11
Show file tree

Hide file tree

Showing 6 changed files with 238 additions and 40 deletions.
diff --git a/SporeModManager/SporeModManager.cpp b/SporeModManager/SporeModManager.cpp
@@ -66,7 +66,7 @@ bool SporeModManager::InstallMod(std::filesystem::path path)
     return true;
 }
 
-bool SporeModManager::UpdateMod(std::filesystem::path path)
+bool SporeModManager::UpdateMod(std::filesystem::path path, bool requiresInstalled)
 {
     Zip::ZipFile zipFile;
     std::vector<char> modInfoFileBuffer;
@@ -126,12 +126,22 @@ bool SporeModManager::UpdateMod(std::filesystem::path path)
 
     if (!SporeMod::FindInstalledMod(installedSporeModUniqueName, installedSporeModId))
     {
-        std::cerr << "No mod found with the same unique name" << std::endl
-                  << "Did you mean install?" << std::endl;
-        return false;
+        if (requiresInstalled)
+        {
+            std::cerr << "No mod found with the same unique name" << std::endl
+                    << "Did you mean install?" << std::endl;
+            return false;
+        }
+    }
+    else
+    {
+        if (!UninstallMods({ installedSporeModId }))
+        {
+            return false;
+        }
     }
 
-    return UninstallMods({ installedSporeModId }) && InstallMod(path);
+    return InstallMod(path);
 }
 
 bool SporeModManager::UninstallMods(std::vector<int> ids)

diff --git a/SporeModManager/SporeModManager.hpp b/SporeModManager/SporeModManager.hpp
@@ -28,7 +28,7 @@ namespace SporeModManager
     /// <summary>
     ///  Updates mod
     /// </summary>
-    bool UpdateMod(std::filesystem::path path);
+    bool UpdateMod(std::filesystem::path path, bool requiresInstalled = true);
 
     /// <summary>
     ///  Uninstalls mods with ids

diff --git a/SporeModManager/SporeModManagerHelpers.hpp b/SporeModManager/SporeModManagerHelpers.hpp
@@ -198,6 +198,11 @@ namespace SporeModManagerHelpers
 
     namespace Path
     {
+        /// <summary>
+        ///     Sets directories for current session
+        /// </summary>>
+        void SetDirectories(std::filesystem::path coreLibsPath, std::filesystem::path modLibsPath, std::filesystem::path galacticAdventuresDataPath, std::filesystem::path coreSporeDataPath);
+
         /// <summary>
         ///     Returns wether all required paths exist
         /// </summary>
@@ -231,6 +236,11 @@ namespace SporeModManagerHelpers
 
     namespace UI
     {
+        /// <summary>
+        ///     Sets no input mode
+        /// </summary>
+        void SetNoInputMode(bool value);
+
         /// <summary>
         ///     Asks user for an integer
         /// </summary>

diff --git a/SporeModManager/SporeModManagerHelpers/Path.cpp b/SporeModManager/SporeModManagerHelpers/Path.cpp
@@ -60,8 +60,25 @@ std::filesystem::path MakeAbsolutePath(std::filesystem::path path)
 // Exported Functions
 //
 
+void Path::SetDirectories(std::filesystem::path coreLibsPath, std::filesystem::path modLibsPath, std::filesystem::path galacticAdventuresDataPath, std::filesystem::path coreSporeDataPath)
+{
+    l_CoreLibsPath               = coreLibsPath;
+    l_ModLibsPath                = modLibsPath;
+    l_GalacticAdventuresDataPath = galacticAdventuresDataPath;
+    l_CoreSporeDataPath          = coreSporeDataPath;
+}
+
 bool Path::CheckIfPathsExist(void)
 {
+    // when the paths have been set for the current session,
+    // we know that those directories already exist, so
+    // we can safely return true here
+    if (!l_CoreLibsPath.empty() && !l_ModLibsPath.empty() &&
+        !l_GalacticAdventuresDataPath.empty() && !l_CoreSporeDataPath.empty()) 
+    {
+        return true;
+    }
+
     if (!SporeMod::Xml::GetDirectories(l_CoreLibsPath, l_ModLibsPath, l_GalacticAdventuresDataPath, l_CoreSporeDataPath))
     {
         std::cerr << "SporeMod::Xml::GetDirectories() Failed!" << std::endl;

diff --git a/SporeModManager/SporeModManagerHelpers/UI.cpp b/SporeModManager/SporeModManagerHelpers/UI.cpp
@@ -14,6 +14,21 @@
 
 using namespace SporeModManagerHelpers;
 
+//
+// Local Variables
+//
+
+static bool l_NoInputMode = false;
+
+//
+// Exported Functions
+//
+
+void UI::SetNoInputMode(bool value)
+{
+    l_NoInputMode = value;
+}
+
 void UI::AskUserInput(std::string text, int& number, std::optional<int> defaultNumber, int min, int max)
 {
     std::string inputLine;
@@ -22,6 +37,13 @@ void UI::AskUserInput(std::string text, int& number, std::optional<int> defaultN
     {
         std::cout << text;
 
+        if (l_NoInputMode)
+        {
+            std::cout << std::endl;
+            number = defaultNumber.has_value() ? defaultNumber.value() : 0;
+            return;
+        }
+
         std::getline(std::cin, inputLine);
         if (inputLine.empty() && defaultNumber.has_value())
         {
@@ -58,6 +80,13 @@ void UI::AskUserInput(std::string text, char delimiter, std::vector<int>& number
 
         std::cout << text;
 
+        if (l_NoInputMode)
+        {
+            std::cout << std::endl;
+            numbers = defaultNumbers;
+            return;
+        }
+
         std::getline(std::cin, inputLine);
         if (inputLine.empty())
         {
@@ -103,6 +132,13 @@ void UI::AskUserInput(std::string text, bool& boolValue, bool defaultValue)
     {
         std::cout << text;
 
+        if (l_NoInputMode)
+        {
+            std::cout << std::endl;
+            boolValue = true;
+            return;
+        }
+
         std::getline(std::cin, inputLine);
         inputLine = String::Lowercase(inputLine);
         if (inputLine.empty())