Add extension folders to IronPython search path

bonsai-rx · Nov 14, 2022 · b146977 · b146977
1 parent 259e716
commit b146977
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/Bonsai.Scripting.IronPython.Design/Bonsai.Scripting.IronPython.Design.csproj b/Bonsai.Scripting.IronPython.Design/Bonsai.Scripting.IronPython.Design.csproj
@@ -6,7 +6,7 @@
     <PackageTags>Bonsai Rx Scripting Iron Python Design</PackageTags>
     <UseWindowsForms>true</UseWindowsForms>
     <TargetFramework>net462</TargetFramework>
-    <VersionPrefix>2.7.0</VersionPrefix>
+    <VersionPrefix>2.7.1</VersionPrefix>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="jacobslusser.ScintillaNET" Version="3.6.3" />

diff --git a/Bonsai.Scripting.IronPython/Bonsai.Scripting.IronPython.csproj b/Bonsai.Scripting.IronPython/Bonsai.Scripting.IronPython.csproj
@@ -5,7 +5,7 @@
     <Description>Bonsai Scripting Library containing IronPython scripting infrastructure for Bonsai.</Description>
     <PackageTags>Bonsai Rx Scripting Iron Python</PackageTags>
     <TargetFramework>net462</TargetFramework>
-    <VersionPrefix>2.7.0</VersionPrefix>
+    <VersionPrefix>2.7.1</VersionPrefix>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="IronPython" Version="2.7.5" />

diff --git a/Bonsai.Scripting.IronPython/PythonEngine.cs b/Bonsai.Scripting.IronPython/PythonEngine.cs
@@ -1,22 +1,37 @@
 using Microsoft.Scripting.Hosting;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 
 namespace Bonsai.Scripting.IronPython
 {
     static class PythonEngine
     {
+        const string ExtensionsPath = "Extensions";
+        const string RepositoryPath = "Packages";
+
         internal static ScriptEngine Create()
         {
-            var engine = global::IronPython.Hosting.Python.CreateEngine();
-            var basePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            var libPath = Directory.GetDirectories(Path.Combine(basePath, "../../../"), "IronPython.StdLib.*");
+            var searchPaths = new List<string>();
+            var editorPath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+            var editorExtensionsPath = Path.Combine(editorPath, ExtensionsPath);
+            var editorRepositoryPath = Path.Combine(editorPath, RepositoryPath);
+            var customExtensionsPath = Path.Combine(Environment.CurrentDirectory, ExtensionsPath);
+            searchPaths.Add(customExtensionsPath);
+            searchPaths.Add(editorExtensionsPath);
+
+            var libPath = Directory.GetDirectories(editorRepositoryPath, "IronPython.StdLib.*");
             if (libPath.Length == 1)
             {
-                var lib = Path.Combine(libPath[0], $"content/Lib");
+                var lib = Path.Combine(libPath[0], "content", "Lib");
                 var sitePackages = Path.Combine(lib, "site-packages");
-                engine.SetSearchPaths(new[] { lib, sitePackages });
+                searchPaths.Add(lib);
+                searchPaths.Add(sitePackages);
             }
+
+            var engine = global::IronPython.Hosting.Python.CreateEngine();
+            engine.SetSearchPaths(searchPaths);
             return engine;
         }
     }