mirror of
https://github.com/ChrisTitusTech/winutil.git
synced 2026-08-10 01:51:18 +10:00
* fix: repair popup install binding, dialog titles, presets switch, radio groups, JSON, tests - Invoke-WPFInstall: add param block so the right-click app popup binds -PackagesToInstall. It previously dropped the argument into $args and installed the whole selected list instead of the clicked app (or warned that nothing was selected). - Replace undefined $AppTitle with "WinUtil" in Install/UnInstall warning boxes, matching the XAML window title and sibling dialogs. - tweaks.json: remove stray nested "link" inside the WPFToggleScrollbars registry entry (dead property; registry entries expose only the six consumed fields). - Invoke-WPFPresets: fix dead switch cases to the wildcard-pattern convention so selectedFeatures/selectedToggles clear correctly. - Invoke-WPFUIElements: store the group StackPanel in radioButtonGroups so grouped radio buttons share one container (else branch was unreachable). - sanity.Tests.ps1: pass the Windows PowerShell parser script via -EncodedCommand; -Command string marshaling corrupted backticks/quotes and produced false parse failures. - install-workflow.Tests.ps1: remove the AppTitle workaround and update title assertions to "WinUtil"; drop orphaned cleanup lines. - Add CHANGES.md with technical and plain-language explanations. Verified: each bug reproduced against HEAD, fixes demonstrated to change behavior, full Pester suite 471/471. * Delete * test: cover the explicit popup install parameter path Add a regression test invoking Invoke-WPFInstall -PackagesToInstall with a package different from the default sync.selectedApps selection and assert the runspace receives the explicit object, mirroring the Initialize-WPFUI popup call shape. Existing default-path coverage is unchanged.
115 lines
6.0 KiB
PowerShell
115 lines
6.0 KiB
PowerShell
function Invoke-WPFInstall {
|
|
<#
|
|
.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.
|
|
#>
|
|
param(
|
|
[Parameter(Mandatory = $false)]
|
|
[PSObject[]]$PackagesToInstall = $($sync.selectedApps | Foreach-Object { $sync.configs.applicationsHashtable.$_ })
|
|
)
|
|
|
|
|
|
if($sync.ProcessRunning) {
|
|
$msg = "[Invoke-WPFInstall] An Install process is currently running."
|
|
Show-WinUtilMessage -Message $msg -Title "WinUtil" -Button "OK" -Icon "Warning"
|
|
return
|
|
}
|
|
|
|
if ($PackagesToInstall.Count -eq 0) {
|
|
$WarningMsg = "Please select the program(s) to install or upgrade."
|
|
Show-WinUtilMessage -Message $WarningMsg -Title "WinUtil" -Button "OK" -Icon "Warning"
|
|
return
|
|
}
|
|
|
|
$ManagerPreference = $sync.preferences.packagemanager
|
|
Write-WinUtilLog -Component "Install" -Message "Install requested for $(@($PackagesToInstall).Count) selected package(s) using preference: $ManagerPreference"
|
|
$packageSummary = Get-WinUtilPackageLogSummary -Packages $PackagesToInstall -Preference $ManagerPreference
|
|
Write-WinUtilLog -Component "Install" -Message "Install selected package(s): $($packageSummary -join '; ')"
|
|
|
|
Invoke-WPFRunspace -ParameterList @(("PackagesToInstall", $PackagesToInstall),("ManagerPreference", $ManagerPreference)) -ScriptBlock {
|
|
param($PackagesToInstall, $ManagerPreference)
|
|
|
|
$packagesSorted = Get-WinUtilSelectedPackages -PackageList $PackagesToInstall -Preference $ManagerPreference
|
|
|
|
$packagesWinget = $packagesSorted['Winget']
|
|
$packagesChoco = $packagesSorted['Choco']
|
|
$totalPackages = @($packagesWinget).Count + @($packagesChoco).Count
|
|
$completedPackages = 0
|
|
$hasUI = $null -ne $sync.Form -and $null -ne $sync.Form.Dispatcher
|
|
Write-WinUtilLog -Component "Install" -Message "Install package manager split: winget=$(@($packagesWinget).Count), choco=$(@($packagesChoco).Count)"
|
|
|
|
try {
|
|
$sync.ProcessRunning = $true
|
|
if ($hasUI) {
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Preparing app install (0/$totalPackages)" -Percent 0
|
|
Invoke-WPFUIThread -ScriptBlock {
|
|
if ($null -ne $sync.ItemsControl) {
|
|
$sync.ItemsControl.IsEnabled = $false
|
|
}
|
|
}
|
|
}
|
|
|
|
if($packagesWinget.Count -gt 0 -and $packagesWinget -ne "0") {
|
|
Install-WinUtilWinget
|
|
foreach ($program in $packagesWinget) {
|
|
$position = $completedPackages + 1
|
|
$startPercent = [int](($completedPackages / $totalPackages) * 100)
|
|
if ($hasUI) {
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Installing $program ($position/$totalPackages)" -Percent $startPercent
|
|
}
|
|
|
|
Install-WinUtilProgramWinget -Action Install -Programs @($program)
|
|
$completedPackages++
|
|
$completedPercent = [int](($completedPackages / $totalPackages) * 100)
|
|
if ($hasUI) {
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Installed $program ($completedPackages/$totalPackages)" -Percent $completedPercent
|
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($completedPercent / 100) }
|
|
}
|
|
}
|
|
}
|
|
if($packagesChoco.Count -gt 0) {
|
|
$position = $completedPackages + 1
|
|
$startPercent = [int](($completedPackages / $totalPackages) * 100)
|
|
if ($hasUI) {
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Installing Chocolatey packages ($position/$totalPackages)" -Percent $startPercent
|
|
}
|
|
|
|
Install-WinUtilChoco
|
|
Install-WinUtilProgramChoco -Action Install -Programs $packagesChoco
|
|
$completedPackages += @($packagesChoco).Count
|
|
$completedPercent = [int](($completedPackages / $totalPackages) * 100)
|
|
if ($hasUI) {
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Installed Chocolatey packages ($completedPackages/$totalPackages)" -Percent $completedPercent
|
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($completedPercent / 100) }
|
|
}
|
|
}
|
|
Write-Host "==========================================="
|
|
Write-Host "-- Installs have finished ---"
|
|
Write-Host "==========================================="
|
|
Write-WinUtilLog -Component "Install" -Message "Install workflow completed."
|
|
if ($hasUI) {
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "App install finished" -Percent 100
|
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
|
|
}
|
|
} catch {
|
|
Write-Host "==========================================="
|
|
Write-Host "Error: $_"
|
|
Write-Host "==========================================="
|
|
Write-WinUtilLog -Level "ERROR" -Component "Install" -Message "Install workflow failed: $($_.Exception.Message)"
|
|
if ($hasUI) {
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "App install failed" -Percent 100
|
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" -overlay "warning" }
|
|
}
|
|
} finally {
|
|
if ($hasUI) {
|
|
Invoke-WPFUIThread -ScriptBlock {
|
|
if ($null -ne $sync.ItemsControl) {
|
|
$sync.ItemsControl.IsEnabled = $true
|
|
}
|
|
}
|
|
}
|
|
$sync.ProcessRunning = $False
|
|
}
|
|
}
|
|
}
|