review comments

DynamoDS · Dec 11, 2023 · 02efa74 · 02efa74
1 parent 6c0bede
commit 02efa74
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/IronPythonExtension/IronPythonExtension.cs b/IronPythonExtension/IronPythonExtension.cs
@@ -1,11 +1,11 @@
-using System;
+using Dynamo.Extensions;
+using Dynamo.Logging;
+using Dynamo.PythonServices;
+using System;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Loader;
-using Dynamo.Extensions;
-using Dynamo.Logging;
-using Dynamo.PythonServices;
 
 namespace IronPythonExtension
 {
@@ -63,12 +63,12 @@ public void Startup(StartupParams sp)
         /// <param name="sp"></param>
         public void Ready(ReadyParams sp)
         {
-            var extraPath = Path.Combine(new FileInfo(Assembly.GetAssembly(typeof(IronPythonExtension)).Location).Directory.Parent.FullName, "extra");
-            var alc = new IsolatedPythoContext(Path.Combine(extraPath,"DSIronPython.dll"));
-            var dsiron = alc.LoadFromAssemblyName(new AssemblyName("DSIronPython"));
+            var extraPath = Path.Combine(new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.Parent.FullName, "extra");
+            var alc = new IsolatedPythonContext(Path.Combine(extraPath,"DSIronPython.dll"));
+            var dsIronAssem = alc.LoadFromAssemblyName(new AssemblyName("DSIronPython"));
 
             //load the engine into Dynamo ourselves.
-            LoadPythonEngine(dsiron);
+            LoadPythonEngine(dsIronAssem);
         }
 
         /// <summary>
@@ -79,7 +79,7 @@ public void Shutdown()
             // Do nothing for now
         }
 
-        private void LoadPythonEngine(Assembly assembly)
+        private static void LoadPythonEngine(Assembly assembly)
         {
             if (assembly == null)
             {
@@ -112,7 +112,7 @@ private void LoadPythonEngine(Assembly assembly)
                     throw new Exception($"Could not get a valid PythonEngine instance by calling the {eType.Name}.Instance method");
                 }
 
-                if (!PythonEngineManager.Instance.AvailableEngines.Any(x=>x.Name == engine.Name))
+                if (PythonEngineManager.Instance.AvailableEngines.All(x => x.Name != engine.Name))
                 {
                     PythonEngineManager.Instance.AvailableEngines.Add(engine);
                 }
@@ -123,11 +123,11 @@ private void LoadPythonEngine(Assembly assembly)
             }
         }
     }
-    internal class IsolatedPythoContext : AssemblyLoadContext
+    internal class IsolatedPythonContext : AssemblyLoadContext
     {
         private AssemblyDependencyResolver resolver;
 
-        public IsolatedPythoContext(string libPath)
+        public IsolatedPythonContext(string libPath)
         {
             resolver = new AssemblyDependencyResolver(libPath);
         }