v4.6.11

pyrevitlabs · Jan 12, 2019 · 8b4534e · 8b4534e
2 parents 745591e + 17d083c
commit 8b4534e
Show file tree

Hide file tree

Showing 48 changed files with 853 additions and 111 deletions.
diff --git a/bin/engines/273/pyRevitLoader.dll b/bin/engines/273/pyRevitLoader.dll
diff --git a/bin/engines/273/pyRevitLoader.pdb b/bin/engines/273/pyRevitLoader.pdb
diff --git a/bin/engines/273/pyRevitRunner.dll b/bin/engines/273/pyRevitRunner.dll
diff --git a/bin/engines/273/pyRevitRunner.pdb b/bin/engines/273/pyRevitRunner.pdb
diff --git a/bin/engines/277/pyRevitLoader.dll b/bin/engines/277/pyRevitLoader.dll
diff --git a/bin/engines/277/pyRevitLoader.pdb b/bin/engines/277/pyRevitLoader.pdb
diff --git a/bin/engines/277/pyRevitRunner.dll b/bin/engines/277/pyRevitRunner.dll
diff --git a/bin/engines/277/pyRevitRunner.pdb b/bin/engines/277/pyRevitRunner.pdb
diff --git a/bin/engines/278/pyRevitLoader.dll b/bin/engines/278/pyRevitLoader.dll
diff --git a/bin/engines/278/pyRevitLoader.pdb b/bin/engines/278/pyRevitLoader.pdb
diff --git a/bin/engines/278/pyRevitRunner.dll b/bin/engines/278/pyRevitRunner.dll
diff --git a/bin/engines/278/pyRevitRunner.pdb b/bin/engines/278/pyRevitRunner.pdb
diff --git a/bin/engines/279/pyRevitLoader.dll b/bin/engines/279/pyRevitLoader.dll
diff --git a/bin/engines/279/pyRevitLoader.pdb b/bin/engines/279/pyRevitLoader.pdb
diff --git a/bin/engines/279/pyRevitRunner.dll b/bin/engines/279/pyRevitRunner.dll
diff --git a/bin/engines/279/pyRevitRunner.pdb b/bin/engines/279/pyRevitRunner.pdb
diff --git a/bin/engines/pyRevitLoader.py b/bin/engines/pyRevitLoader.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+#pylint: disable=C0103,W1401,E0401,E0602
 """
    ██▓███▓██   ██▓ ██▀███  ▓█████ ██▒   █▓ ██▓▄▄▄█████▓
   ▓██░  ██▒██  ██▒▓██ ▒ ██▒▓█   ▀▓██░   █▒▓██▒▓  ██▒ ▓▒

diff --git a/bin/pyRevitLabs.Common.dll b/bin/pyRevitLabs.Common.dll
diff --git a/bin/pyRevitLabs.Common.pdb b/bin/pyRevitLabs.Common.pdb
diff --git a/bin/pyRevitLabs.CommonCLI.dll b/bin/pyRevitLabs.CommonCLI.dll
diff --git a/bin/pyRevitLabs.CommonCLI.pdb b/bin/pyRevitLabs.CommonCLI.pdb
diff --git a/bin/pyRevitLabs.DeffrelDB.dll b/bin/pyRevitLabs.DeffrelDB.dll
diff --git a/bin/pyRevitLabs.Language.dll b/bin/pyRevitLabs.Language.dll
diff --git a/bin/pyRevitLabs.Language.pdb b/bin/pyRevitLabs.Language.pdb
diff --git a/bin/pyRevitLabs.TargetApps.Revit.dll b/bin/pyRevitLabs.TargetApps.Revit.dll
diff --git a/bin/pyRevitUpdater.exe b/bin/pyRevitUpdater.exe
diff --git a/bin/pyrevit.exe b/bin/pyrevit.exe
diff --git a/bin/pyrevit.pdb b/bin/pyrevit.pdb
diff --git a/dev/pyRevitLoader/Source/PyRevitLoaderApplication.cs b/dev/pyRevitLoader/Source/PyRevitLoaderApplication.cs
@@ -4,67 +4,49 @@
 using Autodesk.Revit.UI;
 using Autodesk.Revit.Attributes;
 
-namespace PyRevitLoader
-{
+namespace PyRevitLoader {
     [Regeneration(RegenerationOption.Manual)]
     [Transaction(TransactionMode.Manual)]
-    class PyRevitLoaderApplication : IExternalApplication
-    {
-        private static string versionNumber;
-
+    class PyRevitLoaderApplication : IExternalApplication {
         // Hook into Revit to allow starting a command.
-        Result IExternalApplication.OnStartup(UIControlledApplication application)
-        {
-
-            try
-            {
-                versionNumber = application.ControlledApplication.VersionNumber;
-                if (application.ControlledApplication.VersionName.ToLower().Contains("vasari"))
-                {
-                    versionNumber = "_Vasari";
-                }
-
-                ExecuteStartupScript(application);
-
-                return Result.Succeeded;
+        Result IExternalApplication.OnStartup(UIControlledApplication application) {
+            try {
+                return ExecuteStartupScript(application);
             }
-            catch (Exception ex)
-            {
-                TaskDialog.Show("Error setting up PyRevitLoader", ex.ToString());
+            catch (Exception ex) {
+                TaskDialog.Show("Error Loading Startup Script", ex.ToString());
                 return Result.Failed;
             }
         }
 
-        private static void ExecuteStartupScript(UIControlledApplication uiControlledApplication)
-        {
+        private static Result ExecuteStartupScript(UIControlledApplication uiControlledApplication) {
             // we need a UIApplication object to assign as `__revit__` in python...
             var versionNumber = uiControlledApplication.ControlledApplication.VersionNumber;
-            var fieldName = int.Parse(versionNumber) >= 2017 ? "m_uiapplication": "m_application";
+            var fieldName = int.Parse(versionNumber) >= 2017 ? "m_uiapplication" : "m_application";
             var fi = uiControlledApplication.GetType().GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance);
 
             var uiApplication = (UIApplication)fi.GetValue(uiControlledApplication);
             // execute StartupScript
+            Result result = Result.Succeeded;
             var startupScript = GetStartupScriptPath();
-            if (startupScript != null)
-            {
+            if (startupScript != null) {
                 var executor = new ScriptExecutor(uiApplication); // uiControlledApplication);
-                var result = executor.ExecuteScript(startupScript);
-                if (result == (int)Result.Failed)
-                {
-                    TaskDialog.Show("PyRevitLoader", executor.Message);
+                result = executor.ExecuteScript(startupScript);
+                if (result == Result.Failed) {
+                    TaskDialog.Show("Error Loading pyRevit", executor.Message);
                 }
             }
+
+            return result;
         }
 
-        private static string GetStartupScriptPath()
-        {
+        private static string GetStartupScriptPath() {
             var loaderDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
             var dllDir = Path.GetDirectoryName(loaderDir);
-            return Path.Combine(dllDir, String.Format("{0}.py", Assembly.GetExecutingAssembly().GetName().Name));
+            return Path.Combine(dllDir, string.Format("{0}.py", Assembly.GetExecutingAssembly().GetName().Name));
         }
 
-        Result IExternalApplication.OnShutdown(UIControlledApplication application)
-        {
+        Result IExternalApplication.OnShutdown(UIControlledApplication application) {
             // FIXME: deallocate the python shell...
             return Result.Succeeded;
         }

diff --git a/dev/pyRevitLoader/Source/PyRevitRunnerApplication.cs b/dev/pyRevitLoader/Source/PyRevitRunnerApplication.cs
@@ -0,0 +1,43 @@
+using System;
+using Autodesk.Revit.Attributes;
+using Autodesk.Revit.UI;
+
+namespace PyRevitRunner {
+    [Regeneration(RegenerationOption.Manual)]
+    [Transaction(TransactionMode.Manual)]
+    class PyRevitRunnerApplication : IExternalApplication {
+        // Hook into Revit to allow starting a command.
+        Result IExternalApplication.OnStartup(UIControlledApplication application) {
+            try {
+                return RegisterExternalCommand(application);
+            }
+            catch (Exception ex) {
+                TaskDialog.Show("Error Loading Script Runner Application", ex.ToString());
+                return Result.Failed;
+            }
+        }
+
+        private static Result RegisterExternalCommand(UIControlledApplication application) {
+            var assembly = typeof(PyRevitRunnerApplication).Assembly;
+
+            RibbonPanel ribbonPanel = application.CreateRibbonPanel("pyRevitRunner");
+
+            // Run service button
+            var pbData = new PushButtonData(
+                "PyRevitRunnerCommand",
+                "PyRevitRunnerCommand",
+                assembly.Location,
+                "PyRevitRunner.PyRevitRunnerCommand");
+            pbData.AvailabilityClassName = "PyRevitRunner.PyRevitRunnerCommandAvail";
+
+            ribbonPanel.AddItem(pbData);
+
+            return Result.Succeeded;
+        }
+
+        Result IExternalApplication.OnShutdown(UIControlledApplication application) {
+            // FIXME: deallocate the python shell...
+            return Result.Succeeded;
+        }
+    }
+}
diff --git a/dev/pyRevitLoader/Source/PyRevitRunnerCommand.cs b/dev/pyRevitLoader/Source/PyRevitRunnerCommand.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+
+using Autodesk.Revit.Attributes;
+using Autodesk.Revit.UI;
+using Autodesk.Revit.DB;
+
+using PyRevitLoader;
+using System.Reflection;
+using System.IO;
+
+namespace PyRevitRunner {
+    [Regeneration(RegenerationOption.Manual)]
+    [Transaction(TransactionMode.Manual)]
+    public class PyRevitRunnerCommand : IExternalCommand {
+
+        public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements) {
+            // grab application and command data, skip elements since this is a batch runner and user doesn't 
+            // see the gui to make selections
+            Application = commandData.Application;
+            CommandData = commandData;
+
+            try {
+                // 1
+                // Processing Journal Data and getting the script path to be executed in IronPython engine
+                IDictionary<string, string> dataMap = commandData.JournalData;
+                ScriptSourceFile = dataMap["ScriptSource"];
+                ModuleSearchPaths = new List<string>(dataMap["SearchPaths"].Split(';'));
+                ModelPaths = new List<string>();
+                var modelPaths = dataMap["Models"];
+                if (modelPaths != null && modelPaths != string.Empty)
+                    ModelPaths.AddRange(modelPaths.Split(';'));
+                LogFile = dataMap["LogFile"];
+
+                // add pyrevit library path and script directory path to search paths
+                ModuleSearchPaths.Add(GetPyRevitLibsPath());
+                ModuleSearchPaths.Add(GetSitePkgsPath());
+                ModuleSearchPaths.Add(Path.GetDirectoryName(ScriptSourceFile));
+
+                // 2
+                // Executing the script
+                var executor = new ScriptExecutor(Application, fullFrame: true); // uiControlledApplication);
+                var resultCode = executor.ExecuteScript(
+                    ScriptSourceFile,
+                    sysPaths: ModuleSearchPaths.ToArray(),
+                    logFilePath: LogFile,
+                    variables: new Dictionary<string, object>() {
+                        {"__batchexec__",  true },
+                        {"__logfile__", LogFile },
+                        {"__models__", ModelPaths },
+                    });
+
+                // 3
+                // Log results
+                if (resultCode == 0)
+                    return Result.Succeeded;
+                else
+                    return Result.Cancelled;
+            }
+            catch (Exception ex) {
+                commandData.JournalData.Add("pyRevitRunner Execution Failure", ex.Message);
+                return Result.Cancelled;
+            }
+        }
+
+        public UIApplication Application { get; private set; }
+        public ExternalCommandData CommandData { get; private set; }
+
+        public string ScriptSourceFile { get; private set; }
+        public List<string> ModuleSearchPaths { get; private set; }
+        public List<string> ModelPaths { get; private set; }
+        public string LogFile { get; private set; }
+        public bool DebugMode { get; private set; }
+
+        private static string GetDeployPath() {
+            var loaderDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            var engineDir = Path.GetDirectoryName(loaderDir);
+            var binDir = Path.GetDirectoryName(engineDir);
+            return Path.GetDirectoryName(binDir);
+        }
+
+        private static string GetPyRevitLibsPath() => Path.Combine(GetDeployPath(), "pyrevitlib");
+        private static string GetSitePkgsPath() => Path.Combine(GetDeployPath(), "site-packages");
+    }
+
+
+    public class PyRevitRunnerCommandAvail : IExternalCommandAvailability {
+        public PyRevitRunnerCommandAvail() {
+        }
+
+        public bool IsCommandAvailable(UIApplication uiApp, CategorySet selectedCategories) {
+            return true;
+        }
+    }
+
+}