cleanup

Author: goswinr

Fesh.Revit/Src/Addin.fs

@@ -1,4 +1,4 @@
-namespace Fesh.Revit
+namespace Fesh.Revit
 
 open Autodesk.Revit.UI
 open Autodesk.Revit.DB
@@ -57,7 +57,7 @@ type DebugUtils private () =
     static member logToFile filePrefix (content:string) =
        let checkedPrefix = if isNull filePrefix then "NULL-PREFIX" else filePrefix
        let checkedContent = if String.IsNullOrWhiteSpace content then "content is String.IsNullOrWhiteSpace" else content
-       let time = DateTime.UtcNow.ToString("yyyy-MM-dd_HH-mm-ss-fff") // ensure unique name
+       let time = DateTime.UtcNow.ToString "yyyy-MM-dd_HH-mm-ss-fff" // ensure unique name
        let filename = sprintf "%sFesh.AutoCAD.Log-%s.txt" checkedPrefix time
        async {
            try
@@ -80,12 +80,12 @@ type DebugUtils private () =
                 DebugUtils.logToFile "App.alertFailed-" errMsg
                 TaskDialog.Show("Fesh AddIn. normal alert failed", errMsg) |> ignore
 
-        | _ when logFileOnDesktopCount.Value < 10 ->
+        | _ when logFileOnDesktopCount.Value < 5 ->
                     incr logFileOnDesktopCount
                     DebugUtils.logToFile "App.alert-" msg
                     TaskDialog.Show("Fesh AddIn alert", msg) |> ignore
 
-        | _ -> () // do nothing , there are already 10 log files on the desktop
+        | _ -> () // do nothing , there are already 5 log files on the desktop
 
 
     /// logs text to Fesh editor window in green
@@ -101,6 +101,7 @@ type DebugUtils private () =
 [<Transaction(TransactionMode.Manual)>]
 type internal FsiRunEventHandler (fesh:Fesh, queue: ConcurrentQueue< UIApplication->unit >) =
     member this.GetName() = "Run in Fesh"
+
     member this.Execute(app:UIApplication) =
         let f = ref Unchecked.defaultof<UIApplication->unit>
         while queue.TryDequeue(f) do //using a queue is only needed if a single script calls into a transaction more than once
@@ -111,7 +112,7 @@ type internal FsiRunEventHandler (fesh:Fesh, queue: ConcurrentQueue< UIApplicati
 
     interface IExternalEventHandler with
         member this.GetName() = this.GetName()
-        member this.Execute(app:UIApplication)  = this.Execute(app)
+        member this.Execute(app:UIApplication)  = this.Execute app
 
 
 [<Regeneration(RegenerationOption.Manual)>]
@@ -128,8 +129,8 @@ type FeshAddin()= // : IExternalApplication = // don't rename ! This is referenc
 
     /// Runs a F# function via the IExternalEventHandler pattern for mode-less dialogs
     /// This is the only way to run code from mode-less dialogs such as Fesh editor
-    member this.RunOnApp (f:UIApplication -> unit) =
-        this.RequestQueue.Enqueue(f)
+    member this.RunOnApp (transaction:UIApplication -> unit) =
+        this.RequestQueue.Enqueue transaction
         match this.ExternalEv with
         |None ->
             DebugUtils.alert "ExternalEvent not set up yet"
@@ -143,8 +144,8 @@ type FeshAddin()= // : IExternalApplication = // don't rename ! This is referenc
 
     /// runs a F# function via the IExternalEventHandler pattern for mode-less dialogs
     /// this is the only way to run code from mode-less dialogs such as Fesh editor
-    member this.RunOnDoc (f:Document->unit) =
-        this.RunOnApp (fun app -> f app.ActiveUIDocument.Document)
+    member this.RunOnDoc (transaction:Document->unit) =
+        this.RunOnApp (fun app -> transaction app.ActiveUIDocument.Document)
 
 
     member this.OnStartup(uiConApp:UIControlledApplication) =
@@ -157,15 +158,15 @@ type FeshAddin()= // : IExternalApplication = // don't rename ! This is referenc
             let button = new PushButtonData("Fesh", "Open Fesh F# Editor", thisAssemblyPath, "Fesh.Revit.StartEditorCommand") // a reference to type StartEditorCommand()
             button.ToolTip <- "This will open Fesh in a new window, the F# Scripting Editor."
 
-            let uriImage32 = new Uri("pack://application:,,,/Fesh.Revit;component/Media32/logo32.png") // build from VS not via "dotnet build"  to include. <Resource Include="Media\LogoCursorTr32.png" />
-            let uriImage16 = new Uri("pack://application:,,,/Fesh.Revit;component/Media32/logo16.png")
-            button.LargeImage <- Media.Imaging.BitmapImage(uriImage32)//for ribbon in tab
-            button.Image      <- Media.Imaging.BitmapImage(uriImage16)//for quick access toolbar
+            let uriImage32 = new Uri "pack://application:,,,/Fesh.Revit;component/Media32/logo32.png" // build from VS not via "dotnet build"  to include. <Resource Include="Media\LogoCursorTr32.png" />
+            let uriImage16 = new Uri "pack://application:,,,/Fesh.Revit;component/Media32/logo16.png"
+            button.LargeImage <- Media.Imaging.BitmapImage uriImage32 //for ribbon in tab
+            button.Image      <- Media.Imaging.BitmapImage uriImage16 //for quick access toolbar
 
             let tabId = "Fesh"
             uiConApp.CreateRibbonTab(tabId)
             let panel = uiConApp.CreateRibbonPanel(tabId,"Fesh")
-            panel.AddItem(button) |> ignore
+            panel.AddItem button |> ignore
 
             Result.Succeeded
 
@@ -192,8 +193,8 @@ type FeshAddin()= // : IExternalApplication = // don't rename ! This is referenc
 
 
     interface IExternalApplication with
-        member this.OnStartup(uiConApp:UIControlledApplication) = this.OnStartup(uiConApp)
-        member this.OnShutdown(app:UIControlledApplication)     = this.OnShutdown(app)
+        member this.OnStartup(uiConApp:UIControlledApplication) = this.OnStartup uiConApp
+        member this.OnShutdown(app:UIControlledApplication)     = this.OnShutdown app
 
         //member this.Queue = queue
 
@@ -237,18 +238,18 @@ type StartEditorCommand() = // don't rename ! string referenced in  OnStartup ->
                         // If Document.IsModifiable returns TRUE, then there is an active transaction open in that document.
                         // https://thebuildingcoder.typepad.com/blog/2015/06/archsample-active-transaction-and-adnrme-for-revit-mep-2016.html#3
 
-                    let appName = AppName.get(commandData.Application.Application.VersionNumber)
-                    let logo = new Uri("pack://application:,,,/Fesh.Revit;component/Media32/logo.ico")
+                    let appName = AppName.get commandData.Application.Application.VersionNumber
+                    let logo = new Uri "pack://application:,,,/Fesh.Revit;component/Media32/logo.ico"
                     let hostData = {
                         hostName = appName
                         mainWindowHandel = winHandle
                         fsiCanRun =  canRun
                         logo = Some logo
-                        defaultCode = Some (DefaultCode.get(appName))
-                        hostAssembly = Some (Reflection.Assembly.GetAssembly(typeof<FeshAddin>))
+                        defaultCode = Some (DefaultCode.get appName)
+                        hostAssembly = Some (Reflection.Assembly.GetAssembly typeof<FeshAddin>)
                         }
 
-                    let feshApp = Fesh.App.createEditorForHosting(hostData)
+                    let feshApp = Fesh.App.createEditorForHosting hostData
                     DebugUtils.Fesh <- Some feshApp
 
                     //TODO make a C# plugin that loads Fesh.addin once uiConApp.ControlledApplication.ApplicationInitialized to avoid missing method exceptions in FSI

Fesh.Revit/Src/ScriptingSyntax.fs

@@ -11,7 +11,7 @@ module ScriptingSyntax =
 
     /// Runs a function in a transaction
     /// Will log errors to Fesh Log if transaction has problems
-    let run (f: Document-> unit)  =
+    let run (transaction: Document-> unit)  =
         FeshAddin.Instance.RunOnDoc (fun (doc:Document) ->
             use t = new Transaction(doc, "Fesh F# script")
             let s = t.Start()
@@ -28,7 +28,7 @@ module ScriptingSyntax =
             |_ ->   eprintfn "Transaction.Start returned unknown state: %A" s
 
             try
-                f(doc)
+                transaction doc
             with ex ->
                 match DebugUtils.Fesh with
                 |None -> ()
@@ -50,7 +50,7 @@ module ScriptingSyntax =
 
     /// Runs a function in a transaction
     /// Will log errors to Fesh Log if transaction has problems
-    let runApp (f: UIApplication-> unit)  = 
+    let runApp (transaction: UIApplication-> unit)  =
         FeshAddin.Instance.RunOnApp (fun (app:UIApplication) ->
             let doc = app.ActiveUIDocument.Document
             use t = new Transaction(doc, "Fesh F# script")
@@ -68,10 +68,10 @@ module ScriptingSyntax =
             |_ ->   eprintfn "Transaction.Start returned unknown state: %A" s
 
             try
-                f(app)
+                transaction app
             with ex ->
-                match DebugUtils.Fesh with 
-                |None -> () 
+                match DebugUtils.Fesh with
+                |None -> ()
                 |Some fesh -> fesh.Log.PrintfnColor 240  0 0 "Function in transaction failed with:\r\n%A" ex
 
             let r = t.Commit()

Fesh.Revit/Src/Velo.fs

@@ -101,25 +101,27 @@ module Velo =
 
                 with e ->
                     updateManager <- None
-                    fesh.Log.PrintfnInfoMsg "Could not check for Velopack updates:\r\n%A" e
+                    fesh.Log.PrintfnAppErrorMsg "Checking for updates of Fesh.Revit via Velopack failed."
+                    fesh.Log.PrintfnAppErrorMsg "If this error keeps repeating, reintall Fesh.Revit from https://github.com/goswinr/Fesh.Revit/releases"
+                    fesh.Log.PrintfnInfoMsg "Details:\r\n%A" e
 
             } |> Async.Start
 
 
-    let  updateOnRevitClose(revit:UIApplication, alert: string -> unit) =
+    let updateOnRevitClose(revit:UIApplication, alert: string -> unit) =
         // This event is raised when the Revit application is just about to be closed.
         // Event is not cancellable. The 'Cancellable' property of event's argument is always False.
         // No document may be modified at the time of the event.
         // The sender object of this event is UIControlledApplication object.
         revit.ApplicationClosing.Add(fun _ ->
             if updatesDownloaded then
-                let revitProcesses = System.Diagnostics.Process.GetProcessesByName("Revit")
+                let revitProcesses = System.Diagnostics.Process.GetProcessesByName "Revit"
                 if revitProcesses.Length = 1 then
                     let exe = Reflection.Assembly.GetAssembly(typeof<FeshRevitDummy>).Location
-                    let exeFolder = IO.Path.GetDirectoryName(exe)
-                    let parentFolder = IO.Path.GetDirectoryName(exeFolder)
+                    let exeFolder = IO.Path.GetDirectoryName exe
+                    let parentFolder = IO.Path.GetDirectoryName exeFolder
                     let updater = IO.Path.Combine(parentFolder, "Update.exe")
-                    if IO.File.Exists(updater) then
+                    if IO.File.Exists updater then
                         match updateManager with
                         | Some um  ->
                             if isNull um.UpdatePendingRestart then

README.md

@@ -4,7 +4,7 @@
 # Fesh.Revit
 [![Build](https://github.com/goswinr/Fesh.Revit/actions/workflows/build.yml/badge.svg?event=push)](https://github.com/goswinr/Fesh.Revit/actions/workflows/build.yml)
 [![Check NuGet](https://github.com/goswinr/Fesh.Revit/actions/workflows/outdatedNuget.yml/badge.svg)](https://github.com/goswinr/Fesh.Revit/actions/workflows/outdatedNuget.yml)
-[![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Fgoswinr%2FFesh.Revit&count_bg=%2379C83D&title_bg=%23555555&icon=github.svg&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://hits.seeyoufarm.com)
+
 ![code size](https://img.shields.io/github/languages/code-size/goswinr/Fesh.Revit.svg)
 [![license](https://img.shields.io/github/license/goswinr/Fesh.Revit)](LICENSE)