Merge branch 'develop'

pyrevitlabs · Apr 4, 2021 · 7eb0a4e · 7eb0a4e
2 parents 9eb5df2 + 1f24228
commit 7eb0a4e
Show file tree

Hide file tree

Showing 82 changed files with 662 additions and 217 deletions.
diff --git a/Pipfile b/Pipfile
@@ -12,7 +12,7 @@ black = "*"
 docopt = "*"
 requests = "*"
 pygount = "*"
-pyyaml = "*"
+pyyaml = ">=5.4"
 
 [requires]
 python_version = "3.9"

diff --git a/Pipfile.lock b/Pipfile.lock
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-products.json b/bin/pyrevit-products.json
@@ -1,4 +1,10 @@
 [
+ {
+  "product": "pyRevit",
+  "release": "4.8.7",
+  "version": "4.8.7",
+  "key": "{FED5DEF7-8D3B-4832-BB3E-55C10FCF9ACF}"
+ },
  {
   "product": "pyRevit",
   "release": "4.8.6",
@@ -227,6 +233,12 @@
   "version": "4.6.1",
   "key": "{EF91A585-DC0C-43B8-B88B-4C130F430E84}"
  },
+ {
+  "product": "pyRevit CLI",
+  "release": "4.8.7",
+  "version": "4.8.7",
+  "key": "{E61BB97E-6FF1-4706-A92E-D9F38EB9C77B}"
+ },
  {
   "product": "pyRevit CLI",
   "release": "4.8.6",

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.exe b/bin/pyrevit.exe
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.6")]
-[assembly: AssemblyFileVersion("4.8.6")]
+[assembly: AssemblyVersion("4.8.7")]
+[assembly: AssemblyFileVersion("4.8.7")]
diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs
@@ -80,6 +80,7 @@ internal static class PyRevitCLI {
         internal static bool IsHelpUsagePatternMode = false;
 
         // cli version property
+        public static string CLIPath => Assembly.GetExecutingAssembly().Location;
         public static Version CLIVersion => Assembly.GetExecutingAssembly().GetName().Version;
 
         // cli entry point:
@@ -218,12 +219,20 @@ private static void ProcessArguments() {
                 else if (all("open"))
                     PyRevitCLICloneCmds.OpenClone(TryGetValue("<clone_name>"));
 
-                else if (all("add"))
-                    PyRevitCLICloneCmds.RegisterClone(
-                        TryGetValue("<clone_name>"),
-                        TryGetValue("<clone_path>"),
-                        force: arguments["--force"].IsTrue
-                        );
+                else if (all("add")) {
+                    if(all("this"))
+                        PyRevitCLICloneCmds.RegisterClone(
+                            TryGetValue("<clone_name>"),
+                            Path.GetDirectoryName(CLIPath),
+                            force: arguments["--force"].IsTrue
+                            );
+                    else
+                        PyRevitCLICloneCmds.RegisterClone(
+                            TryGetValue("<clone_name>"),
+                            TryGetValue("<clone_path>"),
+                            force: arguments["--force"].IsTrue
+                            );
+                }
 
                 else if (all("forget"))
                     PyRevitCLICloneCmds.ForgetClone(

diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIAppHelps.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLIAppHelps.cs
@@ -97,6 +97,7 @@ internal static void
                             { "info",                   "Print info about clone" },
                             { "open",                   "Open clone directory in file browser" },
                             { "add",                    "Register an existing clone" },
+                            { "add this",               "Register clone that contains this utility" },
                             { "forget",                 "Forget a registered clone" },
                             { "rename",                 "Rename a clone" },
                             { "delete",                 "Delete a clone" },
@@ -116,6 +117,7 @@ internal static void
                             { "<tag_name>",             "Clone tag to rebase to" },
                             { "<commit_hash>",          "Clone commit rebase to" },
                             { "<origin_url>",           "New clone remote origin url" },
+                            { "--force",                "Just do it; I know what I am doing" },
                             { "--reset",                "Reset remote origin url to default" },
                             { "--clearconfigs",         "Clear pyRevit configurations." },
                             { "--all",                  "All clones" },

diff --git a/dev/pyRevitLabs/pyRevitCLI/Resources/UsagePatterns.txt b/dev/pyRevitLabs/pyRevitCLI/Resources/UsagePatterns.txt
@@ -11,6 +11,7 @@ Usage:
 	pyrevit clone <clone_name> [--dest=<dest_path>] [--source=<repo_url>] [--branch=<branch_name>] [--log=<log_file>] [(--username=<username> --password=<password> | --token=<auth_token>)]
 	pyrevit clones [(-h | --help)]
 	pyrevit clones (info | open) <clone_name>
+	pyrevit clones add this <clone_name> [--force] [--log=<log_file>]
 	pyrevit clones add <clone_name> <clone_path> [--force] [--log=<log_file>]
 	pyrevit clones forget (--all | <clone_name>) [--log=<log_file>]
 	pyrevit clones rename <clone_name> <clone_new_name> [--log=<log_file>]

diff --git a/dev/pyRevitLabs/pyRevitLabs.Common/CommonUtils.cs b/dev/pyRevitLabs/pyRevitLabs.Common/CommonUtils.cs
@@ -13,6 +13,7 @@
 using pyRevitLabs.Common.Extensions;
 using pyRevitLabs.NLog;
 using System.Linq;
+using System.Threading;
 
 namespace pyRevitLabs.Common {
     public static class CommonUtils {
@@ -29,6 +30,44 @@ public static bool VerifyFile(string filePath) {
             return false;
         }
 
+        // https://stackoverflow.com/a/937558/2350244
+        public static bool IsFileLocked(FileInfo file) {
+            try {
+                using (FileStream stream = file.Open(FileMode.Open, FileAccess.Read, FileShare.None)) {
+                    stream.Close();
+                }
+            }
+            catch (IOException) {
+                //the file is unavailable because it is:
+                //still being written to
+                //or being processed by another thread
+                //or does not exist (has already been processed)
+                return true;
+            }
+
+            //file is not locked
+            return false;
+        }
+
+        public static void VerifyFileAccessible(string filePath) {
+            // make sure file is accessible,
+            // try multiple times and wait a little in between
+            // fail after trying
+            var finfo = new FileInfo(filePath);
+
+            uint tries = 3;
+            do {
+                if (IsFileLocked(finfo)) {
+                    Thread.Sleep(200);
+                    tries--;
+                }
+                else
+                    return;
+            } while (tries > 0);
+
+            throw new PyRevitException("File is not accessible");
+        }
+
         public static bool VerifyPath(string path) {
             if (path != null && path != string.Empty)
                 return Directory.Exists(path);
@@ -157,8 +196,8 @@ public static string DownloadFile(string url, string destPath, string progressTo
                     //    while (client.IsBusy) ;
                     //}
                     //else {
-                        logger.Debug("Downloading \"{0}\"", url);
-                        client.DownloadFile(url, destPath);
+                    logger.Debug("Downloading \"{0}\"", url);
+                    client.DownloadFile(url, destPath);
                     //}
                 }
             }

diff --git a/dev/pyRevitLabs/pyRevitLabs.Common/UserEnv.cs b/dev/pyRevitLabs/pyRevitLabs.Common/UserEnv.cs
@@ -93,6 +93,11 @@ public static string GetLoggedInUserName() {
             return null;
         }
 
+        public static bool IsRunAsElevated() {
+            WindowsIdentity id = WindowsIdentity.GetCurrent();
+            return id.Owner != id.User;
+        }
+
         public static bool IsRunAsAdmin() {
             WindowsIdentity id = WindowsIdentity.GetCurrent();
             WindowsPrincipal principal = new WindowsPrincipal(id);

diff --git a/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfig.cs b/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfig.cs
@@ -19,6 +19,7 @@ public class PyRevitConfig {
         public PyRevitConfig(string cfgFilePath) {
             if (cfgFilePath != null) {
                 if (CommonUtils.VerifyFile(cfgFilePath)) {
+                    CommonUtils.VerifyFileAccessible(cfgFilePath);
                     ConfigFilePath = cfgFilePath;
 
                     // INI formatting

diff --git a/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfigs.cs b/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConfigs.cs
@@ -65,6 +65,7 @@ public static void SeedConfig(bool makeCurrentUserAsOwner = false, string setupF
             try {
                 if (File.Exists(sourceFile)) {
                     CommonUtils.EnsureFile(targetFile);
+                    CommonUtils.VerifyFileAccessible(targetFile);
                     File.Copy(sourceFile, targetFile, true);
 
                     if (makeCurrentUserAsOwner) {

diff --git a/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConsts.cs b/dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConsts.cs
@@ -198,8 +198,9 @@ public static string FindConfigFileInDirectory(string sourcePath) {
         // @reviewed
         public static string ConfigFilePath {
             get {
-                var cfgFile = FindConfigFileInDirectory(PyRevitLabsConsts.PyRevitPath);
-                return cfgFile != null ? cfgFile : Path.Combine(PyRevitLabsConsts.PyRevitPath, DefaultConfigsFileName);
+                string configRoot = UserEnv.IsRunAsElevated() ? PyRevitLabsConsts.PyRevitProgramDataPath : PyRevitLabsConsts.PyRevitPath;
+                var cfgFile = FindConfigFileInDirectory(configRoot);
+                return cfgFile != null ? cfgFile : Path.Combine(configRoot, DefaultConfigsFileName);
             }
         }
 

diff --git a/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/RevitAddons.cs b/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/RevitAddons.cs
@@ -54,6 +54,9 @@ public static string GetRevitAddonsFolder(int revitYear, bool allUsers = false)
         }
 
         public static string GetRevitAddonsFilePath(int revitYear, string addinFileName, bool allusers = false) {
+            if (UserEnv.IsRunAsElevated())
+                allusers = true;
+
             var rootFolder =
                 allusers ? System.Environment.SpecialFolder.CommonApplicationData : System.Environment.SpecialFolder.ApplicationData;
             return Path.Combine(GetRevitAddonsFolder(revitYear, allUsers: allusers), addinFileName + ".addin");

diff --git a/dev/pyRevitLoader/Source/PyRevitLoaderApplication.cs b/dev/pyRevitLoader/Source/PyRevitLoaderApplication.cs
@@ -4,13 +4,26 @@
 using Autodesk.Revit.UI;
 using Autodesk.Revit.Attributes;
 
+/* Note:
+ * It is necessary that this code object do not have any references to IronPython.
+ * To ensure the correct version of IronPython dlls are loaded, the OnStartup()
+ * methods manually loads the IronPython assemblies before calling into the 
+ * ScriptExecutor that has IronPython references
+ */
 namespace PyRevitLoader {
     [Regeneration(RegenerationOption.Manual)]
     [Transaction(TransactionMode.Manual)]
     class PyRevitLoaderApplication : IExternalApplication {
+        public static string LoaderPath => Path.GetDirectoryName(typeof(PyRevitLoaderApplication).Assembly.Location);
+
         // Hook into Revit to allow starting a command.
         Result IExternalApplication.OnStartup(UIControlledApplication application) {
             try {
+                // load all engine assemblies
+                // this is to ensure pyRevit is loaded on its own assemblies
+                foreach (var engineDll in Directory.GetFiles(LoaderPath, "*.dll"))
+                    Assembly.LoadFrom(engineDll);
+
                 return ExecuteStartupScript(application);
             }
             catch (Exception ex) {