Improve root directory behavior and AddMods.

xivdev · Jun 17, 2024 · 250c403 · 250c403
1 parent b3f8762
commit 250c403
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/Penumbra/Api/Api/ModsApi.cs b/Penumbra/Api/Api/ModsApi.cs
@@ -75,7 +75,9 @@ public PenumbraApiEc AddMod(string modDirectory)
         if (!dir.Exists)
             return ApiHelpers.Return(PenumbraApiEc.FileMissing, args);
 
-        if (dir.Parent == null || Path.GetFullPath(_modManager.BasePath.FullName) != Path.GetFullPath(dir.Parent.FullName))
+        if (dir.Parent == null
+         || Path.TrimEndingDirectorySeparator(Path.GetFullPath(_modManager.BasePath.FullName))
+         != Path.TrimEndingDirectorySeparator(Path.GetFullPath(dir.Parent.FullName)))
             return ApiHelpers.Return(PenumbraApiEc.InvalidArgument, args);
 
         _modManager.AddMod(dir);

diff --git a/Penumbra/Mods/Manager/ModManager.cs b/Penumbra/Mods/Manager/ModManager.cs
@@ -47,15 +47,15 @@ public ModManager(Configuration config, CommunicatorService communicator, ModDat
         DataEditor    = dataEditor;
         OptionEditor  = optionEditor;
         Creator       = creator;
-        SetBaseDirectory(config.ModDirectory, true);
+        SetBaseDirectory(config.ModDirectory, true, out _);
         _communicator.ModPathChanged.Subscribe(OnModPathChange, ModPathChanged.Priority.ModManager);
         DiscoverMods();
     }
 
     /// <summary> Change the mod base directory and discover available mods. </summary>
-    public void DiscoverMods(string newDir)
+    public void DiscoverMods(string newDir, out string resultNewDir)
     {
-        SetBaseDirectory(newDir, false);
+        SetBaseDirectory(newDir, false, out resultNewDir);
         DiscoverMods();
     }
 
@@ -264,8 +264,9 @@ public void Dispose()
     /// If its not the first time, check if it is the same directory as before.
     /// Also checks if the directory is available and tries to create it if it is not.
     /// </summary>
-    private void SetBaseDirectory(string newPath, bool firstTime)
+    private void SetBaseDirectory(string newPath, bool firstTime, out string resultNewDir)
     {
+        resultNewDir = newPath;
         if (!firstTime && string.Equals(newPath, _config.ModDirectory, StringComparison.Ordinal))
             return;
 
@@ -278,7 +279,7 @@ private void SetBaseDirectory(string newPath, bool firstTime)
         }
         else
         {
-            var newDir = new DirectoryInfo(newPath);
+            var newDir = new DirectoryInfo(Path.TrimEndingDirectorySeparator(newPath));
             if (!newDir.Exists)
                 try
                 {
@@ -290,8 +291,9 @@ private void SetBaseDirectory(string newPath, bool firstTime)
                     Penumbra.Log.Error($"Could not create specified mod directory {newDir.FullName}:\n{e}");
                 }
 
-            BasePath = newDir;
-            Valid    = Directory.Exists(newDir.FullName);
+            BasePath     = newDir;
+            Valid        = Directory.Exists(newDir.FullName);
+            resultNewDir = BasePath.FullName;
             if (!firstTime && _config.ModDirectory != BasePath.FullName)
                 TriggerModDirectoryChange(BasePath.FullName, Valid);
         }

diff --git a/Penumbra/UI/Tabs/SettingsTab.cs b/Penumbra/UI/Tabs/SettingsTab.cs
@@ -269,7 +269,7 @@ private void DrawRootFolder()
         if (_config.ModDirectory != _newModDirectory
          && _newModDirectory.Length != 0
          && DrawPressEnterWarning(_newModDirectory, _config.ModDirectory, pos, save, selected))
-            _modManager.DiscoverMods(_newModDirectory);
+            _modManager.DiscoverMods(_newModDirectory, out _newModDirectory);
     }
 
     /// <summary> Draw the Open Directory and Rediscovery buttons.</summary>