NoUI mode and Concurrency edits (#4092)

* Autorun changes

* Missed a handle

* Remove todo

---------

Co-authored-by: Chris Titus <dfm.titus@gmail.com>

functions/private/Get-WinUtilSelectedPackages.ps1

@@ -15,9 +15,9 @@ function Get-WinUtilSelectedPackages
     )
 
     if ($PackageList.count -eq 1) {
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" }
     } else {
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" }
     }
 
     $packages = [System.Collections.Hashtable]::new()

functions/private/Hide-WPFInstallAppBusy.ps1

@@ -4,9 +4,9 @@ function Hide-WPFInstallAppBusy {
         Hides the busy overlay in the install app area of the WPF form.
         This is used to indicate that an install or uninstall has finished.
     #>
-    $sync.form.Dispatcher.Invoke([action]{
+    Invoke-WPFUIThread -ScriptBlock {
         $sync.InstallAppAreaOverlay.Visibility = [Windows.Visibility]::Collapsed
         $sync.InstallAppAreaBorder.IsEnabled = $true
         $sync.InstallAppAreaScrollViewer.Effect.Radius = 0
-    })
+    }
 }

functions/private/Install-WinUtilProgramChoco.ps1

@@ -113,7 +113,7 @@ function Install-WinUtilProgramChoco {
             [int]$totalPrograms
         )
         $progressState = if ($currentIndex -eq $totalPrograms) { "Normal" } else { "Error" }
-        $sync.form.Dispatcher.Invoke([action] { Set-WinUtilTaskbaritem -state $progressState -value ($currentIndex / $totalPrograms) })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state $progressState -value ($currentIndex / $totalPrograms) }
     }
 
     function Install-ChocoPackage {
@@ -234,7 +234,7 @@ function Install-WinUtilProgramChoco {
     for ($currentIndex = 0; $currentIndex -lt $totalPrograms; $currentIndex++) {
         $Program = $Programs[$currentIndex]
         Set-WinUtilProgressBar -label "$Action $($Program)" -percent ($currentIndex / $totalPrograms * 100)
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($currentIndex / $totalPrograms)})
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($currentIndex / $totalPrograms)}
 
         switch ($Action) {
             "Install" {

functions/private/Install-WinUtilProgramWinget.ps1

@@ -117,7 +117,7 @@ Function Install-WinUtilProgramWinget {
         $Program = $Programs[$i]
         $result = $false
         Set-WinUtilProgressBar -label "$Action $($Program)" -percent ($i / $count * 100)
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i / $count)})
+        Invoke-WPFUIThread -ScriptBlock{ Set-WinUtilTaskbaritem -value ($i / $count)}
 
         $result = switch ($Action) {
             "Install" {Invoke-Install -Program $Program}

functions/private/Invoke-WinUtilExplorerUpdate.ps1

@@ -8,7 +8,7 @@ function Invoke-WinUtilExplorerUpdate {
     )
 
     if ($action -eq "refresh") {
-        Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
+        Invoke-WPFRunspace -ScriptBlock {
             # Define the Win32 type only if it doesn't exist
             if (-not ([System.Management.Automation.PSTypeName]'Win32').Type) {
                 Add-Type -TypeDefinition @"

functions/private/Invoke-WinUtilFeatureInstall.ps1

@@ -10,46 +10,40 @@ function Invoke-WinUtilFeatureInstall {
         $CheckBox
     )
 
-    $x = 0
+    if($sync.configs.feature.$CheckBox.feature) {
+        Foreach( $feature in $sync.configs.feature.$CheckBox.feature ) {
+            try {
+                Write-Host "Installing $feature"
+                Enable-WindowsOptionalFeature -Online -FeatureName $feature -All -NoRestart
+            } catch {
+                if ($CheckBox.Exception.Message -like "*requires elevation*") {
+                    Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
+                } else {
 
-    $CheckBox | ForEach-Object {
-        if($sync.configs.feature.$psitem.feature) {
-            Foreach( $feature in $sync.configs.feature.$psitem.feature ) {
-                try {
-                    Write-Host "Installing $feature"
-                    Enable-WindowsOptionalFeature -Online -FeatureName $feature -All -NoRestart
-                } catch {
-                    if ($psitem.Exception.Message -like "*requires elevation*") {
-                        Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
-                        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" })
-                    } else {
-
-                        Write-Warning "Unable to Install $feature due to unhandled exception"
-                        Write-Warning $psitem.Exception.StackTrace
-                    }
+                    Write-Warning "Unable to Install $feature due to unhandled exception"
+                    Write-Warning $CheckBox.Exception.StackTrace
                 }
             }
         }
-        if($sync.configs.feature.$psitem.InvokeScript) {
-            Foreach( $script in $sync.configs.feature.$psitem.InvokeScript ) {
-                try {
-                    $Scriptblock = [scriptblock]::Create($script)
+    }
+    if($sync.configs.feature.$CheckBox.InvokeScript) {
+        Foreach( $script in $sync.configs.feature.$CheckBox.InvokeScript ) {
+            try {
+                $Scriptblock = [scriptblock]::Create($script)
 
-                    Write-Host "Running Script for $psitem"
-                    Invoke-Command $scriptblock -ErrorAction stop
-                } catch {
-                    if ($psitem.Exception.Message -like "*requires elevation*") {
-                        Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
-                        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" })
-                    } else {
-                        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" })
-                        Write-Warning "Unable to Install $feature due to unhandled exception"
-                        Write-Warning $psitem.Exception.StackTrace
-                    }
+                Write-Host "Running Script for $CheckBox"
+                Invoke-Command $scriptblock -ErrorAction stop
+            } catch {
+                if ($CheckBox.Exception.Message -like "*requires elevation*") {
+                    Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
+                } else {
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
+                    Write-Warning "Unable to Install $feature due to unhandled exception"
+                    Write-Warning $CheckBox.Exception.StackTrace
                 }
             }
         }
-        $X++
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($x/$CheckBox.Count) })
     }
 }

functions/private/Set-WinUtilProgressbar.ps1

@@ -14,11 +14,15 @@ function Set-WinUtilProgressbar{
         [int]$Percent
     )
 
-    $sync.form.Dispatcher.Invoke([action]{$sync.progressBarTextBlock.Text = $label})
-    $sync.form.Dispatcher.Invoke([action]{$sync.progressBarTextBlock.ToolTip = $label})
+    if($PARAM_NOUI) {
+        return;
+    }
+
+    Invoke-WPFUIThread -ScriptBlock {$sync.progressBarTextBlock.Text = $label}
+    Invoke-WPFUIThread -ScriptBlock {$sync.progressBarTextBlock.ToolTip = $label}
     if ($percent -lt 5 ) {
         $percent = 5 # Ensure the progress bar is not empty, as it looks weird
     }
-    $sync.form.Dispatcher.Invoke([action]{ $sync.ProgressBar.Value = $percent})
+    Invoke-WPFUIThread -ScriptBlock { $sync.ProgressBar.Value = $percent}
 
 }

functions/private/Show-WPFInstallAppBusy.ps1

@@ -10,12 +10,12 @@ function Show-WPFInstallAppBusy {
     param (
         $text = "Installing apps..."
     )
-    $sync.form.Dispatcher.Invoke([action]{
+    Invoke-WPFUIThread -ScriptBlock {
         $sync.InstallAppAreaOverlay.Visibility = [Windows.Visibility]::Visible
         $sync.InstallAppAreaOverlay.Width = $($sync.InstallAppAreaScrollViewer.ActualWidth * 0.4)
         $sync.InstallAppAreaOverlay.Height = $($sync.InstallAppAreaScrollViewer.ActualWidth * 0.4)
         $sync.InstallAppAreaOverlayText.Text = $text
         $sync.InstallAppAreaBorder.IsEnabled = $false
         $sync.InstallAppAreaScrollViewer.Effect.Radius = 5
-        })
     }
+}