feat: Support +/- syntax in ini file instead of two add/remove sections

Author: UE4SS

UE4SS/src/SettingsManager.cpp

@@ -56,17 +56,16 @@ namespace RC
             mods_directories.insert(mods_directories.begin(), std::filesystem::path{Overrides.ModsFolderPath});
         }
 
-        auto mods_paths_add_list = parser.get_ordered_list(STR("Overrides.ModsFolderPaths.Add"));
-        mods_paths_add_list.for_each([](uint32_t i, const StringType& item) {
-            // Add if not already in the list.
-            // Moves to the bottom of the list if it already exists.
-            UE4SSProgram::get_program().add_mods_directory(item);
-        });
-
-        auto mods_paths_remove_list = parser.get_ordered_list(STR("Overrides.ModsFolderPaths.Remove"));
-        mods_paths_remove_list.for_each([](uint32_t i, const StringType& item) {
-            // Removes if it exists in the list.
-            UE4SSProgram::get_program().remove_mods_directory(item);
+        auto mods_paths_list = parser.get_list(section_overrides);
+        mods_paths_list.for_each(STR("ModsFolderPaths"), [](const StringType& key, const Ini::Value& value) {
+            if (key.starts_with(STR('+')))
+            {
+                UE4SSProgram::get_program().add_mods_directory(value.get_string_value());
+            }
+            else if (key.starts_with(STR('-')))
+            {
+                UE4SSProgram::get_program().remove_mods_directory(value.get_string_value());
+            }
         });
 
         constexpr static File::CharType section_general[] = STR("General");

assets/UE4SS-settings.ini

@@ -3,19 +3,14 @@
 ; Default: <dll_directory>/Mods
 ModsFolderPath =
 
-[Overrides.ModsFolderPaths.Add]
 ; Additional mods directories to load mods from.
-; Spaces are allowed, but do not use quotes!
-; Paths can be relative to the working directory (where UE4SS.dll is located), or absolute.
-; Mods will be loaded starting from the top of this list, with mods from further down overriding mods from further up.
-; The value of 'ModsFolderPath' is automatically inserted as the first value.
+; Use + prefix to add a directory, - prefix to remove.
+; Can be relative to working directory or absolute paths.
+; Note: If multiple directories contain mods with the same name, the last one found will be loaded.
 ; Example:
-;   ../SharedMods
-;   C:/MyMods
-; Default: None
-
-[Overrides.ModsFolderPaths.Remove]
-; Remove mods directories to load mods from.
+;   +ModsFolderPaths = ../SharedMods
+;   +ModsFolderPaths = C:/MyMods
+;   -ModsFolderPaths = ../SharedMods
 ; Default: None
 
 [General]

deps/first/IniParser/include/IniParser/Section.hpp

@@ -11,6 +11,7 @@ namespace RC::Ini
     {
         std::unordered_map<File::StringType, Value> key_value_pairs{};
         std::vector<File::StringType> ordered_list{};
+        std::vector<std::pair<File::StringType, Value>> key_value_array{};
         bool is_ordered_list{};
     };
 
@@ -59,6 +60,40 @@ namespace RC::Ini
                 }
             }
         }
+
+        template <typename Callable>
+        auto for_each(const StringType match_key, Callable callable)
+        {
+            if (!m_section)
+            {
+                return;
+            }
+            if constexpr (CallableWithKeyValuePair<Callable>)
+            {
+                for (const auto& [key, value] : m_section->key_value_array)
+                {
+                    // Skip '+' or '-'  when comparing.
+                    StringViewType key_view{key.begin() + 1, key.end()};
+                    if (key_view == match_key)
+                    {
+                        callable(key, value);
+                    }
+                }
+            }
+            else
+            {
+                for (size_t i = 0; i < m_section->key_value_array.size(); ++i)
+                {
+                    auto [key, value] = m_section->key_value_array[i];
+                    // Skip '+' or '-'  when comparing.
+                    StringViewType key_view{key.begin() + 1, key.end()};
+                    if (key_view == match_key)
+                    {
+                        callable(i, value.get_string_value());
+                    }
+                }
+            }
+        }
     };
 
     // Backwards compatibility just in case some external code made direct references to 'OrderedList'.

deps/first/IniParser/src/TokenParser.cpp

@@ -371,7 +371,15 @@ namespace RC::Ini
         }
 
         // Create the value with the correct key and an empty value and store a pointer to it so that the value can be set later
-        m_current_value = &m_current_section->key_value_pairs.emplace(m_current_character_data, Value{}).first->second;
+        if (!m_current_character_data.empty() && (m_current_character_data.starts_with(STR('+')) || m_current_character_data.starts_with(STR('-'))))
+        {
+            // Retaining '+' and '-' for the user to process later.
+            m_current_value = &m_current_section->key_value_array.emplace_back(m_current_character_data, Value{}).second;
+        }
+        else
+        {
+            m_current_value = &m_current_section->key_value_pairs.emplace(m_current_character_data, Value{}).first->second;
+        }
         m_current_value->add_string_value(STR(""));
         m_current_value->set_ref(m_current_value);
         m_current_character_data.clear();