NoUI mode and Concurrency edits (#4092)

* Autorun changes * Missed a handle * Remove todo --------- Co-authored-by: Chris Titus <dfm.titus@gmail.com>
2026-04-06 06:38:31 +00:00 · 2026-02-22 17:28:55 -06:00
parent e79e946e76
commit d005a225a2
21 changed files with 208 additions and 135 deletions
--- a/functions/public/Invoke-WPFFeatureInstall.ps1
+++ b/functions/public/Invoke-WPFFeatureInstall.ps1
@@ -12,21 +12,25 @@ function Invoke-WPFFeatureInstall {
        return
    }

-    $Features = $sync.selectedFeatures
-
-    Invoke-WPFRunspace -ArgumentList $Features -DebugPreference $DebugPreference -ScriptBlock {
-        param($Features, $DebugPreference)
+    $handle = Invoke-WPFRunspace -ScriptBlock {
+        $Features = $sync.selectedFeatures
        $sync.ProcessRunning = $true
        if ($Features.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" }
        }

-        Invoke-WinUtilFeatureInstall $Features
+        $x = 0
+
+        $Features | ForEach-Object {
+            Invoke-WinUtilFeatureInstall $Feature
+            $X++
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($x/$CheckBox.Count) }
+        }

        $sync.ProcessRunning = $false
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }

        Write-Host "==================================="
        Write-Host "---   Features are Installed    ---"
--- a/functions/public/Invoke-WPFGetInstalled.ps1
+++ b/functions/public/Invoke-WPFGetInstalled.ps1
@@ -20,13 +20,13 @@ function Invoke-WPFGetInstalled {
    }
    $managerPreference = $sync["ManagerPreference"]

-    Invoke-WPFRunspace -ParameterList @(("managerPreference", $managerPreference),("checkbox", $checkbox)) -DebugPreference $DebugPreference -ScriptBlock {
+    Invoke-WPFRunspace -ParameterList @(("managerPreference", $managerPreference),("checkbox", $checkbox)) -ScriptBlock {
        param (
            [string]$checkbox,
            [PackageManagers]$managerPreference
        )
        $sync.ProcessRunning = $true
-        $sync.form.Dispatcher.Invoke([action] { Set-WinUtilTaskbaritem -state "Indeterminate" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" }

        if ($checkbox -eq "winget") {
            Write-Host "Getting Installed Programs..."
@@ -48,6 +48,6 @@ function Invoke-WPFGetInstalled {

        Write-Host "Done..."
        $sync.ProcessRunning = $false
-        $sync.form.Dispatcher.Invoke([action] { Set-WinUtilTaskbaritem -state "None" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" }
    }
 }
--- a/functions/public/Invoke-WPFImpex.ps1
+++ b/functions/public/Invoke-WPFImpex.ps1
@@ -71,8 +71,10 @@ function Invoke-WPFImpex {
                    # $flattenedJson = $jsonFile.PSObject.Properties.Where({ $_.Name -ne "Install" }).ForEach({ $_.Value })
                    $flattenedJson = $jsonFile
                    Update-WinUtilSelections -flatJson $flattenedJson
-                    # TODO test with toggles
-                    Reset-WPFCheckBoxes -doToggles $true
+
+                    if (!$PARAM_NOUI) {
+                        Reset-WPFCheckBoxes -doToggles $true
+                    }
                }
            } catch {
                Write-Error "An error occurred while importing: $_"
--- a/functions/public/Invoke-WPFInstall.ps1
+++ b/functions/public/Invoke-WPFInstall.ps1
@@ -1,13 +1,12 @@
 function Invoke-WPFInstall {
-    param (
-        [Parameter(Mandatory=$false)]
-        [PSObject[]]$PackagesToInstall = $($sync.selectedApps | Foreach-Object { $sync.configs.applicationsHashtable.$_ })
-    )
    <#
    .SYNOPSIS
        Installs the selected programs using winget, if one or more of the selected programs are already installed on the system, winget will try and perform an upgrade if there's a newer version to install.
    #>

+    $PackagesToInstall = $sync.selectedApps | Foreach-Object { $sync.configs.applicationsHashtable.$_ }
+
+
    if($sync.ProcessRunning) {
        $msg = "[Invoke-WPFInstall] An Install process is currently running."
        [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
@@ -22,8 +21,8 @@ function Invoke-WPFInstall {

    $ManagerPreference = $sync["ManagerPreference"]

-    Invoke-WPFRunspace -ParameterList @(("PackagesToInstall", $PackagesToInstall),("ManagerPreference", $ManagerPreference)) -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToInstall, $ManagerPreference, $DebugPreference)
+    $handle = Invoke-WPFRunspace -ParameterList @(("PackagesToInstall", $PackagesToInstall),("ManagerPreference", $ManagerPreference)) -ScriptBlock {
+        param($PackagesToInstall, $ManagerPreference)

        $packagesSorted = Get-WinUtilSelectedPackages -PackageList $PackagesToInstall -Preference $ManagerPreference

@@ -45,12 +44,12 @@ function Invoke-WPFInstall {
            Write-Host "==========================================="
            Write-Host "--      Installs have finished          ---"
            Write-Host "==========================================="
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
        } catch {
            Write-Host "==========================================="
            Write-Host "Error: $_"
            Write-Host "==========================================="
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -overlay "warning" })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" -overlay "warning" }
        }
        $sync.ProcessRunning = $False
    }
--- a/functions/public/Invoke-WPFRunspace.ps1
+++ b/functions/public/Invoke-WPFRunspace.ps1
@@ -27,8 +27,7 @@ function Invoke-WPFRunspace {
    Param (
        $ScriptBlock,
        $ArgumentList,
-        $ParameterList,
-        $DebugPreference
+        $ParameterList
    )

    # Create a PowerShell instance
@@ -41,7 +40,7 @@ function Invoke-WPFRunspace {
    foreach ($parameter in $ParameterList) {
        $script:powershell.AddParameter($parameter[0], $parameter[1])
    }
-    $script:powershell.AddArgument($DebugPreference)  # Pass DebugPreference to the script block
+
    $script:powershell.RunspacePool = $sync.runspace

    # Execute the RunspacePool
--- a/functions/public/Invoke-WPFSSHServer.ps1
+++ b/functions/public/Invoke-WPFSSHServer.ps1
@@ -6,7 +6,7 @@ function Invoke-WPFSSHServer {

  #>

-    Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
+    Invoke-WPFRunspace -ScriptBlock {

        Invoke-WinUtilSSHServer

--- a/functions/public/Invoke-WPFUIThread.ps1
+++ b/functions/public/Invoke-WPFUIThread.ps1
@@ -0,0 +1,21 @@
+function Invoke-WPFUIThread {
+    <#
+
+    .SYNOPSIS
+        Creates and runs a task on Winutil's WPF Forms thread.
+
+    .PARAMETER ScriptBlock
+        The scriptblock to invoke in the thread
+    #>
+
+    [CmdletBinding()]
+    Param (
+        $ScriptBlock
+    )
+
+    if ($PARAM_NOUI) {
+        return;
+    }
+
+    $sync.form.Dispatcher.Invoke([action]$ScriptBlock)
+}
--- a/functions/public/Invoke-WPFUnInstall.ps1
+++ b/functions/public/Invoke-WPFUnInstall.ps1
@@ -32,8 +32,8 @@ function Invoke-WPFUnInstall {

    $ManagerPreference = $sync["ManagerPreference"]

-    Invoke-WPFRunspace -ParameterList @(("PackagesToUninstall", $PackagesToUninstall),("ManagerPreference", $ManagerPreference)) -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToUninstall, $ManagerPreference, $DebugPreference)
+    Invoke-WPFRunspace -ParameterList @(("PackagesToUninstall", $PackagesToUninstall),("ManagerPreference", $ManagerPreference)) -ScriptBlock {
+        param($PackagesToUninstall, $ManagerPreference)

        $packagesSorted = Get-WinUtilSelectedPackages -PackageList $PackagesToUninstall -Preference $ManagerPreference
        $packagesWinget = $packagesSorted[[PackageManagers]::Winget]
@@ -54,12 +54,12 @@ function Invoke-WPFUnInstall {
            Write-Host "==========================================="
            Write-Host "--       Uninstalls have finished       ---"
            Write-Host "==========================================="
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
        } catch {
            Write-Host "==========================================="
            Write-Host "Error: $_"
            Write-Host "==========================================="
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -overlay "warning" })
+           Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" -overlay "warning" }
        }
        $sync.ProcessRunning = $False

--- a/functions/public/Invoke-WPFtweaksbutton.ps1
+++ b/functions/public/Invoke-WPFtweaksbutton.ps1
@@ -25,30 +25,27 @@ function Invoke-WPFtweaksbutton {
  Write-Debug "Number of tweaks to process: $($Tweaks.Count)"

  # The leading "," in the ParameterList is necessary because we only provide one argument and powershell cannot be convinced that we want a nested loop with only one argument otherwise
-  Invoke-WPFRunspace -ParameterList @(,("tweaks",$tweaks)) -DebugPreference $DebugPreference -ScriptBlock {
-    param(
-      $tweaks,
-      $DebugPreference
-      )
+  $handle = Invoke-WPFRunspace -ParameterList @(,("tweaks",$tweaks)) -ScriptBlock {
+    param($tweaks)
    Write-Debug "Inside Number of tweaks to process: $($Tweaks.Count)"

    $sync.ProcessRunning = $true

    if ($Tweaks.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" }
    }
    # Execute other selected tweaks

    for ($i = 0; $i -lt $Tweaks.Count; $i++) {
      Set-WinUtilProgressBar -Label "Applying $($tweaks[$i])" -Percent ($i / $tweaks.Count * 100)
      Invoke-WinUtilTweaks $tweaks[$i]
-      $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i/$Tweaks.Count) })
+      Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($i/$Tweaks.Count) }
    }
    Set-WinUtilProgressBar -Label "Tweaks finished" -Percent 100
    $sync.ProcessRunning = $false
-    $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
    Write-Host "================================="
    Write-Host "--     Tweaks are Finished    ---"
    Write-Host "================================="
--- a/functions/public/Invoke-WPFundoall.ps1
+++ b/functions/public/Invoke-WPFundoall.ps1
@@ -20,26 +20,26 @@ function Invoke-WPFundoall {
        return
    }

-    Invoke-WPFRunspace -ArgumentList $tweaks -DebugPreference $DebugPreference -ScriptBlock {
-        param($tweaks, $DebugPreference)
+    Invoke-WPFRunspace -ArgumentList $tweaks -ScriptBlock {
+        param($tweaks)

        $sync.ProcessRunning = $true
        if ($tweaks.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" }
        }


        for ($i = 0; $i -lt $tweaks.Count; $i++) {
            Set-WinUtilProgressBar -Label "Undoing $($tweaks[$i])" -Percent ($i / $tweaks.Count * 100)
            Invoke-WinUtiltweaks $tweaks[$i] -undo $true
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i/$tweaks.Count) })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($i/$tweaks.Count) }
        }

        Set-WinUtilProgressBar -Label "Undo Tweaks Finished" -Percent 100
        $sync.ProcessRunning = $false
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
        Write-Host "=================================="
        Write-Host "---  Undo Tweaks are Finished  ---"
        Write-Host "=================================="
--- a/functions/public/Invoke-WinUtilAutoRun.ps1
+++ b/functions/public/Invoke-WinUtilAutoRun.ps1
@@ -0,0 +1,48 @@
+function Invoke-WinUtilAutoRun {
+    <#
+
+    .SYNOPSIS
+        Runs Install, Tweaks, and Features with optional UI invocation.
+    #>
+
+    function BusyWait {
+        Start-Sleep -Seconds 5
+        while ($sync.ProcessRunning) {
+                Start-Sleep -Seconds 5
+            }
+    }
+
+    BusyWait
+
+    Write-Host "Applying tweaks..."
+    Invoke-WPFtweaksbutton
+    BusyWait
+
+    Write-Host "Applying toggles..."
+    $handle = Invoke-WPFRunspace -ScriptBlock {
+        $Toggles = $sync.selectedToggles
+        Write-Debug "Inside Number of toggles to process: $($Toggles.Count)"
+
+        $sync.ProcessRunning = $true
+
+        for ($i = 0; $i -lt $Tweaks.Count; $i++) {
+            Invoke-WinUtilTweaks $Toggles[$i]
+        }
+
+        $sync.ProcessRunning = $false
+        Write-Host "================================="
+        Write-Host "--     Toggles are Finished    ---"
+        Write-Host "================================="
+    }
+    BusyWait
+
+    Write-Host "Applying features..."
+    Invoke-WPFFeatureInstall
+    BusyWait
+
+    Write-Host "Installing applications..."
+    Invoke-WPFInstall
+    BusyWait
+
+    Write-Host "Done."
+}