work in improving install control flow

this branch is not yet working

Signed-off-by: Kian <[email protected]>

functions/private/Get-WinUtilCheckBoxes.ps1

@@ -36,18 +36,15 @@ Function Get-WinUtilCheckBoxes {
         $group = if ($CheckBox.Key.StartsWith("WPFInstall")) { "Install" }
                 elseif ($CheckBox.Key.StartsWith("WPFTweaks")) { "WPFTweaks" }
                 elseif ($CheckBox.Key.StartsWith("WPFFeature")) { "WPFFeature" }
-
+//
         if ($group) {
             if ($CheckBox.Value.IsChecked -eq $true) {
                 $feature = switch ($group) {
                     "Install" {
                         # Get the winget value
-                        $wingetValue = $sync.configs.applications.$($CheckBox.Name).winget
-
-                        if (-not [string]::IsNullOrWhiteSpace($wingetValue) -and $wingetValue -ne "na") {
-                            $wingetValue -split ";"
-                        } else {
-                            $sync.configs.applications.$($CheckBox.Name).choco
+                        @{
+                            "winget"=$sync.configs.applications.$($CheckBox.Name).winget;
+                            "choco"=$sync.configs.applications.$($CheckBox.Name).choco
                         }
                     }
                     default {

functions/private/Install-WinUtilProgramChoco.ps1

@@ -0,0 +1,3 @@
+function Install-WinUtilProgramChoco {
+    throw "Not implemented";
+}

functions/private/Install-WinUtilProgramWinget.ps1

@@ -20,64 +20,60 @@ Function Install-WinUtilProgramWinget {
     )
 
     $x = 0
-    $count = $($ProgramsToInstall -split ",").Count
+    $count = $ProgramsToInstall.Count
 
     Write-Progress -Activity "$manage Applications" -Status "Starting" -PercentComplete 0
 
-    Foreach ($Program in $($ProgramsToInstall -split ",")){
-
+    Foreach ($Program in $ProgramsToInstall){
+        $failedPackages = @()
         Write-Progress -Activity "$manage Applications" -Status "$manage $Program $($x + 1) of $count" -PercentComplete $($x/$count*100)
         if($manage -eq "Installing"){
             # Install package via ID, if it fails try again with different scope and then with an unelevated prompt. 
             # Since Install-WinGetPackage might not be directly available, we use winget install command as a workaround.
             # Winget, not all installers honor any of the following: System-wide, User Installs, or Unelevated Prompt OR Silent Install Mode.
             # This is up to the individual package maintainers to enable these options. Aka. not as clean as Linux Package Managers.
             try {
-                $status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $Program --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru).ExitCode
+                $status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $($Program.winget) --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru).ExitCode
                 if($status -eq 0){
                     Write-Host "$Program installed successfully."
                     continue
                 }
                 Write-Host "Attempt with User scope"
-                $status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $Program --scope user --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru).ExitCode
+                $status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $($Program.winget) --scope user --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru).ExitCode
                 if($status -eq 0){
                     Write-Host "$Program installed successfully with User scope."
                     continue
                 }
                 Write-Host "Attempt with Unelevated prompt"
-                $process = Start-Process -FilePath "powershell" -ArgumentList "-Command Start-Process winget -ArgumentList 'install --id $Program --silent --accept-source-agreements --accept-package-agreements' -Verb runAsUser" -Wait -PassThru
+                $process = Start-Process -FilePath "powershell" -ArgumentList "-Command Start-Process winget -ArgumentList 'install --id $($Program.winget) --silent --accept-source-agreements --accept-package-agreements' -Verb runAsUser" -Wait -PassThru
                 if($process.ExitCode -eq 0){
                     Write-Host "$Program installed successfully with Unelevated prompt."
                     continue
                 }
-                Write-Host "Attempting installation with Chocolatey as a fallback method"
-                $chocoStatus = $(Start-Process -FilePath "choco" -ArgumentList "install $Program -y" -Wait -PassThru).ExitCode
-                if($chocoStatus -eq 0){
-                    Write-Host "$Program installed successfully using Chocolatey."
-                    continue
-                } else {
-                    Write-Host "Failed to install $Program using Chocolatey."
-                }
-                Write-Host "Failed to install $Program."
+                Write-Host "Failed to install $Program. With winget"
+                $failedPackages += $Program
     } catch {
                 Write-Host "Failed to install $Program due to an error: $_"
+                $failedPackages += $Program
                 }
         }
         if($manage -eq "Uninstalling"){
             # Uninstall package via ID using winget directly.
             try {
-                $status = $(Start-Process -FilePath "winget" -ArgumentList "uninstall --id $Program --silent" -Wait -PassThru).ExitCode
+                $status = $(Start-Process -FilePath "winget" -ArgumentList "uninstall --id $($Program.winget) --silent" -Wait -PassThru).ExitCode
                 if($status -ne 0){
                     Write-Host "Failed to uninstall $Program."
                 } else {
                     Write-Host "$Program uninstalled successfully."
+                    $failedPackages += $Program
                 }
             } catch {
                 Write-Host "Failed to uninstall $Program due to an error: $_"
+                $failedPackages += $Program
             }
         }
         $X++
     }
-
     Write-Progress -Activity "$manage Applications" -Status "Finished" -Completed
+    return $failedPackages;
 }

functions/public/Invoke-WPFInstall.ps1

@@ -22,13 +22,29 @@ function Invoke-WPFInstall {
 
     Invoke-WPFRunspace -ArgumentList $WingetInstall -DebugPreference $DebugPreference -ScriptBlock {
         param($WingetInstall, $DebugPreference)
+        $packagesWinget, $packagesChoco = {
+            $packagesWinget = @()
+            $packagesChoco = @()
+            foreach ($package in $WingetInstall) {
+                if ($package.winget -eq "na") {
+                    $packagesChoco += $package
+                    Write-Host "Queueing $($package) for Chocolatey install"
+                } else {
+                    $packagesWinget += $package
+                    Write-Host "Queueing $($package) for Winget install"
+                }
+            }
+            return $packages, $packagesChoco
+        }.Invoke($WingetInstall)
 
         try{
             $sync.ProcessRunning = $true
-
+            $errorPackages = @()
             Install-WinUtilWinget
-            Install-WinUtilProgramWinget -ProgramsToInstall $WingetInstall
-
+            $errorPackages += Install-WinUtilProgramWinget -ProgramsToInstall $packagesWinget
+            #not yet implemented please fix this..
+            $errorPackages| ForEach-Object {if($_.choco -ne "na") {$packagesChoco += $_}}
+            Install-WinUtilProgramChoco -ProgramsToInstall $packagesChoco
             Write-Host "==========================================="
             Write-Host "--      Installs have finished          ---"
             Write-Host "==========================================="