Merge branch 'develop'

pyrevitlabs · May 17, 2021 · b074f29 · b074f29
2 parents 7eb0a4e + 868e370
commit b074f29
Show file tree

Hide file tree

Showing 148 changed files with 1,117 additions and 250 deletions.
diff --git a/bin/engines/CPY378/pyRevitLabs.PythonNet.dll b/bin/engines/CPY378/pyRevitLabs.PythonNet.dll
diff --git a/bin/engines/CPY385/pyRevitLabs.PythonNet.dll b/bin/engines/CPY385/pyRevitLabs.PythonNet.dll
diff --git a/bin/engines/IPY2710/pyRevitLoader.dll b/bin/engines/IPY2710/pyRevitLoader.dll
diff --git a/bin/engines/IPY2710/pyRevitRunner.dll b/bin/engines/IPY2710/pyRevitRunner.dll
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Modules.dll b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Modules.dll
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.SQLite.dll b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.SQLite.dll
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Wpf.dll b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.Wpf.dll
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.IronPython.dll b/bin/engines/IPY2711PR/pyRevitLabs.IronPython.dll
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Dynamic.dll b/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Dynamic.dll
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.Metadata.dll b/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.Metadata.dll
diff --git a/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.dll b/bin/engines/IPY2711PR/pyRevitLabs.Microsoft.Scripting.dll
diff --git a/bin/engines/IPY2711PR/pyRevitLoader.dll b/bin/engines/IPY2711PR/pyRevitLoader.dll
diff --git a/bin/engines/IPY2711PR/pyRevitRunner.dll b/bin/engines/IPY2711PR/pyRevitRunner.dll
diff --git a/bin/engines/IPY273/pyRevitLoader.dll b/bin/engines/IPY273/pyRevitLoader.dll
diff --git a/bin/engines/IPY273/pyRevitRunner.dll b/bin/engines/IPY273/pyRevitRunner.dll
diff --git a/bin/engines/IPY277/pyRevitLoader.dll b/bin/engines/IPY277/pyRevitLoader.dll
diff --git a/bin/engines/IPY277/pyRevitRunner.dll b/bin/engines/IPY277/pyRevitRunner.dll
diff --git a/bin/engines/IPY278/pyRevitLoader.dll b/bin/engines/IPY278/pyRevitLoader.dll
diff --git a/bin/engines/IPY278/pyRevitRunner.dll b/bin/engines/IPY278/pyRevitRunner.dll
diff --git a/bin/engines/IPY279/pyRevitLoader.dll b/bin/engines/IPY279/pyRevitLoader.dll
diff --git a/bin/engines/IPY279/pyRevitRunner.dll b/bin/engines/IPY279/pyRevitRunner.dll
diff --git a/bin/pyRevitLabs.Common.dll b/bin/pyRevitLabs.Common.dll
diff --git a/bin/pyRevitLabs.CommonCLI.dll b/bin/pyRevitLabs.CommonCLI.dll
diff --git a/bin/pyRevitLabs.CommonWPF.dll b/bin/pyRevitLabs.CommonWPF.dll
diff --git a/bin/pyRevitLabs.DeffrelDB.dll b/bin/pyRevitLabs.DeffrelDB.dll
diff --git a/bin/pyRevitLabs.Emojis.dll b/bin/pyRevitLabs.Emojis.dll
diff --git a/bin/pyRevitLabs.Json.dll b/bin/pyRevitLabs.Json.dll
diff --git a/bin/pyRevitLabs.Language.dll b/bin/pyRevitLabs.Language.dll
diff --git a/bin/pyRevitLabs.MahAppsMetro.dll b/bin/pyRevitLabs.MahAppsMetro.dll
diff --git a/bin/pyRevitLabs.NLog.dll b/bin/pyRevitLabs.NLog.dll
diff --git a/bin/pyRevitLabs.PyRevit.dll b/bin/pyRevitLabs.PyRevit.dll
diff --git a/bin/pyRevitLabs.TargetApps.AutoCAD.dll b/bin/pyRevitLabs.TargetApps.AutoCAD.dll
diff --git a/bin/pyRevitLabs.TargetApps.Navisworks.dll b/bin/pyRevitLabs.TargetApps.Navisworks.dll
diff --git a/bin/pyRevitLabs.TargetApps.Revit.dll b/bin/pyRevitLabs.TargetApps.Revit.dll
diff --git a/bin/pyrevit-autocomplete.exe b/bin/pyrevit-autocomplete.exe
diff --git a/bin/pyrevit-doctor.exe b/bin/pyrevit-doctor.exe
diff --git a/bin/pyrevit-hosts.json b/bin/pyrevit-hosts.json
@@ -1366,5 +1366,53 @@
         "build": "20201109_1530",
         "target": "x64",
         "notes": "https://help.autodesk.com/view/RVT/2021/ENU/?guid=RevitReleaseNotes_2021updates_html"
+    },
+    {
+        "meta": {
+            "schema": "1.0",
+            "source": "https://help.autodesk.com/view/RVT/2022/ENU/?guid=RevitReleaseNotes_2022updates_html"
+        },
+        "product": "Autodesk Revit",
+        "release": "2022 First Customer Ship",
+        "version": "22.0.2.392",
+        "build": "20210224_1515",
+        "target": "x64",
+        "notes": "https://help.autodesk.com/view/RVT/2022/ENU/?guid=RevitReleaseNotes_2022updates_html"
+    },
+    {
+        "meta": {
+            "schema": "1.0",
+            "source": "https://up.autodesk.com/2019/RVT/Autodesk_Revit_2019_2_3_Hotfix_Readme.html"
+        },
+        "product": "Autodesk Revit",
+        "release": "2019.2.3",
+        "version": "19.2.30.41",
+        "build": "20210416_1515",
+        "target": "x64",
+        "notes": "https://up.autodesk.com/2019/RVT/Autodesk_Revit_2019_2_3_Hotfix_Readme.html"
+    },
+    {
+        "meta": {
+            "schema": "1.0",
+            "source": "https://help.autodesk.com/view/RVT/2020/ENU/?guid=RevitReleaseNotes_2020updates_html"
+        },
+        "product": "Autodesk Revit",
+        "release": "2020.2.4",
+        "version": "20.2.40.65",
+        "build": "20210420_1515",
+        "target": "x64",
+        "notes": "https://help.autodesk.com/view/RVT/2020/ENU/?guid=RevitReleaseNotes_2020updates_html"
+    },
+    {
+        "meta": {
+            "schema": "1.0",
+            "source": "https://help.autodesk.com/view/RVT/2021/ENU/?guid=RevitReleaseNotes_2021updates_html"
+        },
+        "product": "Autodesk Revit",
+        "release": "2021.1.3",
+        "version": "21.1.30.74",
+        "build": "20210426_1515",
+        "target": "x64",
+        "notes": "https://help.autodesk.com/view/RVT/2021/ENU/?guid=RevitReleaseNotes_2021updates_html"
     }
 ]
diff --git a/bin/pyrevit-products.json b/bin/pyrevit-products.json
@@ -1,4 +1,10 @@
 [
+ {
+  "product": "pyRevit",
+  "release": "4.8.8",
+  "version": "4.8.8",
+  "key": "{CA372AB6-355A-4270-91DD-144DF75E1B57}"
+ },
  {
   "product": "pyRevit",
   "release": "4.8.7",
@@ -233,6 +239,12 @@
   "version": "4.6.1",
   "key": "{EF91A585-DC0C-43B8-B88B-4C130F430E84}"
  },
+ {
+  "product": "pyRevit CLI",
+  "release": "4.8.8",
+  "version": "4.8.8",
+  "key": "{8E0191BC-C5DB-4F0E-8F52-6DF04C2B8CE8}"
+ },
  {
   "product": "pyRevit CLI",
   "release": "4.8.7",

diff --git a/bin/pyrevit-stubsbuilder.exe b/bin/pyrevit-stubsbuilder.exe
diff --git a/bin/pyrevit-telemetryserver.exe b/bin/pyrevit-telemetryserver.exe
diff --git a/bin/pyrevit-toast.exe b/bin/pyrevit-toast.exe
diff --git a/bin/pyrevit.admin b/bin/pyrevit.admin
diff --git a/bin/pyrevit.exe b/bin/pyrevit.exe
diff --git a/bin/pyrevit.user b/bin/pyrevit.user
diff --git a/dev/pyRevit/AssemblyVersion.cs b/dev/pyRevit/AssemblyVersion.cs
@@ -2,5 +2,5 @@
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("4.8.7")]
-[assembly: AssemblyFileVersion("4.8.7")]
+[assembly: AssemblyVersion("4.8.8")]
+[assembly: AssemblyFileVersion("4.8.8")]
diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs
@@ -310,7 +310,7 @@ private static void ProcessArguments() {
                     else {
                         // try parse the engine version as an integer e.g. 277 for 2.7.7
                         if (int.TryParse(engStrVer, out var engIntVer))
-                            engineVersion = (PyRevitEngineVersion)engIntVer;                        
+                            engineVersion = (PyRevitEngineVersion)engIntVer;
                     }
 
                     if (engineVersion is null) {
@@ -548,7 +548,8 @@ private static void ProcessArguments() {
                             revitYear: TryGetValue("--revit"),
                             runOptions: new PyRevitRunnerOptions() {
                                 PurgeTempFiles = arguments["--purge"].IsTrue,
-                                ImportPath = TryGetValue("--import", null)
+                                ImportPath = TryGetValue("--import", null),
+                                AllowDialogs = arguments["--allowdialogs"].IsTrue
                             },
                             targetIsFileList: true
                         );
@@ -560,7 +561,8 @@ private static void ProcessArguments() {
                             revitYear: TryGetValue("--revit"),
                             runOptions: new PyRevitRunnerOptions() {
                                 PurgeTempFiles = arguments["--purge"].IsTrue,
-                                ImportPath = TryGetValue("--import", null)
+                                ImportPath = TryGetValue("--import", null),
+                                AllowDialogs = arguments["--allowdialogs"].IsTrue
                             }
                         );
                 }
@@ -699,8 +701,8 @@ private static void ProcessArguments() {
                         Console.WriteLine(string.Format("User {0} config",
                                                         PyRevitConfigs.GetUserCanConfig() ? "CAN" : "CAN NOT"));
 
-                } 
-                
+                }
+
                 else if (all("colordocs")) {
                     if (any("enable", "disable"))
                         PyRevitConfigs.SetColorizeDocs(arguments["enable"].IsTrue);
@@ -889,7 +891,7 @@ private static void ProcessArguments() {
 
                 else if (TryGetValue("<doctor_command>") is var doctorCommand && doctorCommand != null)
                     PyRevitCLIAppCmds.RunDoctor(doctorCommand, dryRun: arguments["--dryrun"].IsTrue);
-                
+
                 else if (all("doctor", "--list"))
                     PyRevitCLIAppCmds.RunDoctor("--list");
 

diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIAppHelps.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIAppHelps.cs
@@ -11,7 +11,7 @@ internal static class PyRevitCLIAppHelps {
         internal static void
         PrintHelp(PyRevitCLICommandType commandType) {
             switch (commandType) {
-                
+
                 case PyRevitCLICommandType.Main:
                     BuildHelp(
                         null,
@@ -57,7 +57,7 @@ internal static void
                         }
                     );
                     break;
-                
+
                 case PyRevitCLICommandType.Env:
                     BuildHelp(
                         new List<string>() { "env" },
@@ -297,6 +297,7 @@ internal static void
                             { "<model_file>",           "Target Revit model file path" },
                             { "--purge",                "Remove temporary run environment after completion" },
                             { "--import=<import_path>", "Copy content of this folder into the runtime temp path." },
+                            { "--allowdialogs",         "To allow dialogs during journal playback" }
                         });
                     break;
 
@@ -447,7 +448,7 @@ private static string BuildOptions(string baseHelp, string header, IDictionary<s
             if (options != null) {
                 baseHelp += header + Environment.NewLine;
                 foreach (var optionPair in options) {
-                    baseHelp += 
+                    baseHelp +=
                         string.Format(outputFormat, optionPair.Key, optionPair.Value)
                         + Environment.NewLine;
                 }

diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIRevitCmds.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIRevitCmds.cs
@@ -163,7 +163,7 @@ internal static void
             int revitYearNumber = 0;
             int.TryParse(revitYear, out revitYearNumber);
 
-            
+
             // setup a list of models
             var modelFiles = new List<string>();
             // if target file is a list of model paths
@@ -176,7 +176,7 @@ internal static void
             else
                 modelFiles.Add(targetFile);
 
-            
+
             // verify all models are accessible
             foreach (string modelFile in modelFiles)
                 if (!CommonUtils.VerifyFile(modelFile))
@@ -197,8 +197,23 @@ internal static void
                         throw new Exception($"Can not detect the Revit version of model at \"{modelFile}\". Model might be newer than specified version {revitYearNumber}.");
                 }
             }
-            else
-                revitYearNumber = RevitProduct.ListInstalledProducts().Max(r => r.ProductYear);
+            else {
+                // determine revit model version from given files
+                foreach (string modelFile in modelFiles) {
+                    var modelInfo = new RevitModelFile(modelFile);
+                    if (modelInfo.RevitProduct != null) {
+                        if (revitYearNumber == 0)
+                            revitYearNumber = modelInfo.RevitProduct.ProductYear;
+                        else if (modelInfo.RevitProduct.ProductYear > revitYearNumber)
+                            revitYearNumber = modelInfo.RevitProduct.ProductYear;
+                    }
+                }
+
+                // if could not determine revit version from given files,
+                // use latest version
+                if (revitYearNumber == 0)
+                    revitYearNumber = RevitProduct.ListInstalledProducts().Max(r => r.ProductYear);
+            }
 
             // now run
             if (revitYearNumber != 0) {
@@ -288,7 +303,7 @@ internal static void
                     }
                 }
             }
-            
+
         }
 
         // privates:

diff --git a/dev/pyRevitLabs/pyRevitCLI/Resources/UsagePatterns.txt b/dev/pyRevitLabs/pyRevitCLI/Resources/UsagePatterns.txt
@@ -66,9 +66,9 @@ Usage:
 	pyrevit revits fileinfo <file_or_dir_path> [--csv=<output_file>] [--rvt] [--rte] [--rfa] [--rft]
 	pyrevit run (-h | --help)
 	pyrevit run commands
-	pyrevit run <script_or_command_name> [--revit=<revit_year>] [--purge] [--import=<import_path>]
-	pyrevit run <script_or_command_name> --models=<model_list_file> --revit=<revit_year> [--purge] [--import=<import_path>]
-	pyrevit run <script_or_command_name> <model_file> [--revit=<revit_year>] [--purge] [--import=<import_path>]
+	pyrevit run <script_or_command_name> [--revit=<revit_year>] [--purge] [--allowdialogs] [--import=<import_path>]
+	pyrevit run <script_or_command_name> --models=<model_list_file> --revit=<revit_year> [--purge] [--allowdialogs] [--import=<import_path>]
+	pyrevit run <script_or_command_name> <model_file> [--revit=<revit_year>] [--purge] [--allowdialogs] [--import=<import_path>]
 	pyrevit caches (-h | --help)
 	pyrevit caches [bim360] clear (--all | <revit_year>) [--log=<log_file>]
 	pyrevit config (-h | --help)

diff --git a/dev/pyRevitLabs/pyRevitLabs.Common/UserEnv.cs b/dev/pyRevitLabs/pyRevitLabs.Common/UserEnv.cs
@@ -74,6 +74,10 @@ public static List<string> GetInstalledDotnetCoreTargetPacks() {
             return targetPackPaths;
         }
 
+        public static string GetExecutingUserName() {
+            return string.Format("{0}\\{1}", Environment.UserDomainName, Environment.UserName);
+        }
+
         public static string GetLoggedInUserName() {
             try {
                 ConnectionOptions oConn = new ConnectionOptions();