Skip to content

Commit

Permalink
Fix Sorting of Errored Packages by using 'Sort-Object' instead of 'IC…
Browse files Browse the repository at this point in the history
…omparer' approach
  • Loading branch information
og-mrk committed Oct 6, 2024
1 parent 02d96de commit e677621
Showing 1 changed file with 1 addition and 26 deletions.
27 changes: 1 addition & 26 deletions functions/private/Invoke-WinUtilMicroWin-Helper.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,6 @@ class ErroredPackage {
}
}

class ErroredPackageComparer : System.Collections.Generic.IComparer[ErroredPackage] {
[string]$PropertyName
[bool]$Descending = $false

ErroredPackageComparer([string]$property) {
$this.PropertyName = $property
}

ErroredPackageComparer([string]$property, [bool]$descending) {
$this.PropertyName = $property
$this.Descending = $descending
}

[int]Compare([ErroredPackage]$a, [ErroredPackage]$b) {
if ($a.$($this.PropertyName) -eq $b.$($this.PropertyName)) { $res = 0 }
elseif ($a.$($this.PropertyName) -lt $b.$($this.PropertyName)) { $res = -1 }
else { $res = 1 }

if ($this.Descending) { $res *= -1 }

return $res
}
}

function Get-FidoLangFromCulture {

param (
Expand Down Expand Up @@ -223,8 +199,7 @@ function Remove-Packages {
Write-Host "$failedCount package(s) could not be removed. Your image will still work fine, however. Below is information on what packages failed to be removed and why."
if ($erroredPackages.Count -gt 0)
{
$ErrorMessageComparer = [ErroredPackageComparer]::new("ErrorMessage")
$erroredPackages.Sort($ErrorMessageComparer)
$erroredPackages = $erroredPackages | Sort-Object -Property ErrorMessage

$previousErroredPackage = $erroredPackages[0]
$counter = 0
Expand Down

0 comments on commit e677621

Please sign in to comment.