Lib folder now supports loading from a direct subdirectory

soopercool101 · Mar 5, 2024 · e3a2d4a · e3a2d4a
1 parent 99fa8a5
commit e3a2d4a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/BrawlCrate/API/BrawlAPIInternal.cs b/BrawlCrate/API/BrawlAPIInternal.cs
@@ -54,12 +54,7 @@ static BrawlAPIInternal()
                 Directory.Delete($"{Application.StartupPath}\\BrawlAPI\\Python", true);
             }
             // Setup IronPython engine
-            Engine.SetSearchPaths(new[]
-            {
-                $"{Application.StartupPath}\\BrawlAPI\\Lib\\Python",
-                $"{Application.StartupPath}\\BrawlAPI\\Lib"
-            });
-
+            UpdateSearchPaths();
             fsi_path = Properties.Settings.Default.FSharpInstallationPath;
 
             //Import BrawlCrate and Brawllib
@@ -76,6 +71,15 @@ static BrawlAPIInternal()
             MainForm.Instance.resourceTree.SelectionChanged += ResourceTree_SelectionChanged;
         }
 
+        internal static void UpdateSearchPaths()
+        {
+            string libPath = Path.GetFullPath($"{Application.StartupPath}\\BrawlAPI\\Lib");
+            if (!string.IsNullOrEmpty(libPath))
+            {
+                Engine.SetSearchPaths(Directory.GetDirectories(libPath).Append(libPath).ToArray());
+            }
+        }
+
         internal static ScriptEngine Engine { get; set; }
         internal static ScriptRuntime Runtime { get; set; }
 

diff --git a/BrawlCrate/UI/MainForm.cs b/BrawlCrate/UI/MainForm.cs
@@ -1458,6 +1458,7 @@ public void reloadPluginsToolStripMenuItem_Click(object sender, EventArgs e)
             pluginToolStripMenuItem.DropDown.Items.Clear();
             AddPlugins(pluginToolStripMenuItem, Program.ApiPluginPath);
             pluginToolStripMenuItem.Enabled = pluginToolStripMenuItem.HasDropDownItems;
+            BrawlAPIInternal.UpdateSearchPaths();
         }
 
         public static List<FileInfo> GetScripts(string path)