fix logic

- install work

config/tweaks.json

@@ -3091,8 +3091,8 @@
     "panel": "1",
     "Order": "a002_",
     "InvokeScript": [
-      "Get-ChildItem -Path \"C:\\Windows\\Temp\" *.* -Recurse | Remove-Item -Force -Recurse
-    Get-ChildItem -Path $env:TEMP *.* -Recurse | Remove-Item -Force -Recurse"
+      "Get-ChildItem -Path \"C:\\Windows\\Temp\" *.* -Recurse | Remove-Item -Force -Recurse -ErrorAction SilentlyContinue
+    Get-ChildItem -Path $env:TEMP *.* -Recurse | Remove-Item -Force -Recurse -ErrorAction SilentlyContinue"
     ],
     "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DeleteTempFiles"
   },

functions/private/Set-WinUtilTaskbarItem.ps1

@@ -43,44 +43,48 @@ function Set-WinUtilTaskbaritem {
         [string]$description
     )
 
-    if ($value) {
-        $sync["Form"].taskbarItemInfo.ProgressValue = $value
-    }
-
-    if ($state) {
-        switch ($state) {
-            'None' { $sync["Form"].taskbarItemInfo.ProgressState = "None" }
-            'Indeterminate' { $sync["Form"].taskbarItemInfo.ProgressState = "Indeterminate" }
-            'Normal' { $sync["Form"].taskbarItemInfo.ProgressState = "Normal" }
-            'Error' { $sync["Form"].taskbarItemInfo.ProgressState = "Error" }
-            'Paused' { $sync["Form"].taskbarItemInfo.ProgressState = "Paused" }
-            default { throw "[Set-WinUtilTaskbarItem] Invalid state" }
+    try {
+        if ($value) {
+            $sync["Form"].taskbarItemInfo.ProgressValue = $value
         }
-    }
 
-    if ($overlay) {
-        switch ($overlay) {
-            'logo' {
-                $sync["Form"].taskbarItemInfo.Overlay = "$env:LOCALAPPDATA\winutil\cttlogo.png"
+        if ($state) {
+            switch ($state) {
+                'None' { $sync["Form"].taskbarItemInfo.ProgressState = "None" }
+                'Indeterminate' { $sync["Form"].taskbarItemInfo.ProgressState = "Indeterminate" }
+                'Normal' { $sync["Form"].taskbarItemInfo.ProgressState = "Normal" }
+                'Error' { $sync["Form"].taskbarItemInfo.ProgressState = "Error" }
+                'Paused' { $sync["Form"].taskbarItemInfo.ProgressState = "Paused" }
+                default { throw "[Set-WinUtilTaskbarItem] Invalid state" }
             }
-            'checkmark' {
-                $sync["Form"].taskbarItemInfo.Overlay = "$env:LOCALAPPDATA\winutil\checkmark.png"
-            }
-            'warning' {
-                $sync["Form"].taskbarItemInfo.Overlay = "$env:LOCALAPPDATA\winutil\warning.png"
-            }
-            'None' {
-                $sync["Form"].taskbarItemInfo.Overlay = $null
-            }
-            default {
-                if (Test-Path $overlay) {
-                    $sync["Form"].taskbarItemInfo.Overlay = $overlay
+        }
+
+        if ($overlay) {
+            switch ($overlay) {
+                'logo' {
+                    $sync["Form"].taskbarItemInfo.Overlay = "$env:LOCALAPPDATA\winutil\cttlogo.png"
+                }
+                'checkmark' {
+                    $sync["Form"].taskbarItemInfo.Overlay = "$env:LOCALAPPDATA\winutil\checkmark.png"
+                }
+                'warning' {
+                    $sync["Form"].taskbarItemInfo.Overlay = "$env:LOCALAPPDATA\winutil\warning.png"
+                }
+                'None' {
+                    $sync["Form"].taskbarItemInfo.Overlay = $null
+                }
+                default {
+                    if (Test-Path $overlay) {
+                        $sync["Form"].taskbarItemInfo.Overlay = $overlay
+                    }
                 }
             }
         }
-    }
 
-    if ($description) {
-        $sync["Form"].taskbarItemInfo.Description = $description
+        if ($description) {
+            $sync["Form"].taskbarItemInfo.Description = $description
+        }
+    } catch {
+        #nothing
     }
 }

functions/public/Invoke-WPFFeatureInstall.ps1

@@ -6,16 +6,26 @@ function Invoke-WPFFeatureInstall {
 
     #>
 
+    param (
+        $FeatureConfig
+    )
+
     if($sync.ProcessRunning) {
         $msg = "[Invoke-WPFFeatureInstall] Install process is currently running."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
     }
 
-    $Features = (Get-WinUtilCheckBoxes)["WPFFeature"]
+    if ($FeatureConfig) {
+        $Features = $FeatureConfig
+        $automation = $true
+    } else {
+        $Features = (Get-WinUtilCheckBoxes)["WPFFeature"]
+        $automation = $false
+    }
 
-    Invoke-WPFRunspace -ArgumentList $Features -DebugPreference $DebugPreference -ScriptBlock {
-        param($Features, $DebugPreference)
+    Invoke-WPFRunspace -ArgumentList $Features, $automation -DebugPreference $DebugPreference -ScriptBlock {
+        param($Features, $automation, $DebugPreference)
         $sync.ProcessRunning = $true
         if ($Features.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })

functions/public/Invoke-WPFInstall.ps1

@@ -6,14 +6,24 @@ function Invoke-WPFInstall {
 
     #>
 
+    param (
+        $InstallConfig
+    )
+
     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)
         return
     }
 
-    $PackagesToInstall = (Get-WinUtilCheckBoxes)["Install"]
-    Write-Host $PackagesToInstall
+    if ($InstallConfig) {
+        $PackagesToInstall = $InstallConfig
+        $automation = $true
+    } else {
+        $PackagesToInstall = (Get-WinUtilCheckBoxes)["Install"]
+        $automation = $false
+    }
+
     if ($PackagesToInstall.Count -eq 0) {
         $WarningMsg = "Please select the program(s) to install or upgrade"
         [System.Windows.MessageBox]::Show($WarningMsg, $AppTitle, [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
@@ -21,8 +31,8 @@ function Invoke-WPFInstall {
     }
 
 
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToInstall, $DebugPreference)
+    Invoke-WPFRunspace -ArgumentList $PackagesToInstall, $automation -DebugPreference $DebugPreference -ScriptBlock {
+        param($PackagesToInstall, $automation, $DebugPreference)
         if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
         } else {

functions/public/Invoke-WPFRunspace.ps1

@@ -22,27 +22,32 @@ function Invoke-WPFRunspace {
     Param (
         $ScriptBlock,
         $ArgumentList,
-        $DebugPreference
+        $DebugPreference,
+        $automation
     )
 
-    # Create a PowerShell instance
-    $script:powershell = [powershell]::Create()
+    if ($automation = $true) {
+        & $ScriptBlock @ArgumentList @DebugPreference
+    } else {
+        # Create a PowerShell instance
+        $script:powershell = [powershell]::Create()
 
-    # Add Scriptblock and Arguments to runspace
-    $script:powershell.AddScript($ScriptBlock)
-    $script:powershell.AddArgument($ArgumentList)
-    $script:powershell.AddArgument($DebugPreference)  # Pass DebugPreference to the script block
-    $script:powershell.RunspacePool = $sync.runspace
+        # Add Scriptblock and Arguments to runspace
+        $script:powershell.AddScript($ScriptBlock)
+        $script:powershell.AddArgument($ArgumentList)
+        $script:powershell.AddArgument($DebugPreference)  # Pass DebugPreference to the script block
+        $script:powershell.RunspacePool = $sync.runspace
 
-    # Execute the RunspacePool
-    $script:handle = $script:powershell.BeginInvoke()
+        # Execute the RunspacePool
+        $script:handle = $script:powershell.BeginInvoke()
 
-    # Clean up the RunspacePool threads when they are complete, and invoke the garbage collector to clean up the memory
-    if ($script:handle.IsCompleted) {
-        $script:powershell.EndInvoke($script:handle)
-        $script:powershell.Dispose()
-        $sync.runspace.Dispose()
-        $sync.runspace.Close()
-        [System.GC]::Collect()
+        # Clean up the RunspacePool threads when they are complete, and invoke the garbage collector to clean up the memory
+        if ($script:handle.IsCompleted) {
+            $script:powershell.EndInvoke($script:handle)
+            $script:powershell.Dispose()
+            $sync.runspace.Dispose()
+            $sync.runspace.Close()
+            [System.GC]::Collect()
+        }
     }
 }

functions/public/Invoke-WPFtweaksbutton.ps1

@@ -6,13 +6,23 @@ function Invoke-WPFtweaksbutton {
 
   #>
 
+  param (
+    $TweaksConfig
+  )
+
   if($sync.ProcessRunning) {
     $msg = "[Invoke-WPFtweaksbutton] Install process is currently running."
     [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
     return
   }
 
-  $Tweaks = (Get-WinUtilCheckBoxes)["WPFTweaks"]
+  if ($TweaksConfig) {
+    $Tweaks = $TweaksConfig
+    $automation = $true
+  } else {
+    $Tweaks = (Get-WinUtilCheckBoxes)["WPFTweaks"]
+    $automation = $false
+  }
 
   Set-WinUtilDNS -DNSProvider $sync["WPFchangedns"].text
 
@@ -24,8 +34,8 @@ function Invoke-WPFtweaksbutton {
 
   Write-Debug "Number of tweaks to process: $($Tweaks.Count)"
 
-  Invoke-WPFRunspace -ArgumentList $Tweaks -DebugPreference $DebugPreference -ScriptBlock {
-    param($Tweaks, $DebugPreference)
+  Invoke-WPFRunspace -ArgumentList $Tweaks, $automation -DebugPreference $DebugPreference -ScriptBlock {
+    param($Tweaks, $automation, $DebugPreference)
     Write-Debug "Inside Number of tweaks to process: $($Tweaks.Count)"
 
     $sync.ProcessRunning = $true

scripts/main.ps1

@@ -146,12 +146,60 @@ Invoke-WPFRunspace -ScriptBlock {
 } | Out-Null
 
 #===========================================================================
-# Setup and Show the Form
+# Print Logo into Console
 #===========================================================================
 
-# Print the logo
 Invoke-WPFFormVariables
 
+#===========================================================================
+# Run Automation
+#===========================================================================
+
+if ($PARAM_CONFIG) {
+    if ($PARAM_RUN) {
+        $installConfig = Get-Content $PARAM_CONFIG -Raw | ConvertFrom-Json
+        if ($installConfig.WPFInstall) {
+            write-host "Installing Programs"
+
+            # Create a new array to hold the combined install configurations
+            $combinedInstallConfig = @()
+
+            # Iterate over each WPFInstall entry
+            for ($i = 0; $i -lt $installConfig.WPFInstall.Count; $i++) {
+                $wpfInstallEntry = $installConfig.WPFInstall[$i]
+                $installEntry = $installConfig.Install[$i]
+
+                # Create a new object with the combined values
+                $combinedEntry = @{
+                    Name = $wpfInstallEntry
+                    Winget = $installEntry.winget
+                    Choco = $installEntry.choco
+                }
+
+                # Add the combined entry to the array
+                $combinedInstallConfig += $combinedEntry
+            }
+
+            # Invoke the WPFInstall function with the combined configuration
+            Invoke-WPFInstall -InstallConfig $combinedInstallConfig
+        }
+        if ($installConfig.WPFTweaks) {
+            write-host "Running Tweaks"
+            Invoke-WPFtweaksbutton -TweaksConfig $installConfig.WPFTweaks
+        }
+        if ($installConfig.WPFFeature) {
+            write-host "Installing Features"
+            Invoke-WPFFeatureInstall -FeatureConfig $installConfig.WPFFeature
+        }
+    } else {
+        Invoke-WPFImpex -type "import" -Config $PARAM_CONFIG
+    }
+}
+
+#===========================================================================
+# Setup and Show the Form
+#===========================================================================
+
 # Progress bar in taskbaritem > Set-WinUtilProgressbar
 $sync["Form"].TaskbarItemInfo = New-Object System.Windows.Shell.TaskbarItemInfo
 Set-WinUtilTaskbaritem -state "None"
@@ -318,42 +366,6 @@ Add-Type @"
 
     Invoke-WPFTab "WPFTab1BT"
     $sync["Form"].Focus()
-
-    # maybe this is not the best place to load and execute config file?
-    # maybe community can help?
-    if ($PARAM_CONFIG) {
-        Invoke-WPFImpex -type "import" -Config $PARAM_CONFIG
-        if ($PARAM_RUN) {
-            while ($sync.ProcessRunning) {
-                Start-Sleep -Seconds 5
-            }
-            Start-Sleep -Seconds 5
-
-            Write-Host "Applying tweaks..."
-            Invoke-WPFtweaksbutton
-            while ($sync.ProcessRunning) {
-                Start-Sleep -Seconds 5
-            }
-            Start-Sleep -Seconds 5
-
-            Write-Host "Installing features..."
-            Invoke-WPFFeatureInstall
-            while ($sync.ProcessRunning) {
-                Start-Sleep -Seconds 5
-            }
-
-            Start-Sleep -Seconds 5
-            Write-Host "Installing applications..."
-            while ($sync.ProcessRunning) {
-                Start-Sleep -Seconds 1
-            }
-            Invoke-WPFInstall
-            Start-Sleep -Seconds 5
-
-            Write-Host "Done."
-        }
-    }
-
 })
 
 # Load Checkboxes and Labels outside of the Filter function only once on startup for performance reasons
@@ -528,5 +540,8 @@ $sync["SponsorMenuItem"].Add_Click({
     $Height = $sync.configs.themes.$ctttheme.CustomDialogHeight
     Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -IconSize $IconSize -EnableScroll $true
 })
-$sync["Form"].ShowDialog() | out-null
-Stop-Transcript
+
+if (!$PARAM_RUN) {
+    $sync["Form"].ShowDialog() | out-null
+    Stop-Transcript
+}