ewilliams28/FFU
1
0
Fork 0
mirror of https://github.com/rbalsleyMSFT/FFU.git synced 2026-06-14 02:09:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactors ISO path handling for clarity and robustness

Browse Source 
Inverts the conditional logic for determining available Windows releases and versions based on whether an ISO path is provided.

This change improves code readability by checking for the positive case (an ISO is present) first. It also adds validation to ensure the file path ends with the `.iso` extension.
This commit is contained in:
rbalsleyMSFT
2025-07-09 13:26:09 -07:00
parent 9edbcc6f01
commit 878b93889f
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FFUDevelopment/FFUUI.Core/FFUUI.Core.WindowsSettings.psm1
+23 -21
View File
@@ -230,11 +230,11 @@ function Get-AvailableWindowsReleases {
[psobject]$State [psobject]$State
) )
if ([string]::IsNullOrEmpty($IsoPath)) { if (-not [string]::IsNullOrEmpty($IsoPath) -and $IsoPath.EndsWith('.iso', [System.StringComparison]::OrdinalIgnoreCase)) {
return $State.Defaults.WindowsSettingsDefaults.MctWindowsReleases return $State.Defaults.WindowsSettingsDefaults.AllWindowsReleases
} }
else { else {
return $State.Defaults.WindowsSettingsDefaults.AllWindowsReleases return $State.Defaults.WindowsSettingsDefaults.MctWindowsReleases
} }
} }
@@ -257,27 +257,12 @@ function Get-AvailableWindowsVersions {
} }
if (-not $State.Defaults.WindowsSettingsDefaults.WindowsVersionMap.ContainsKey($SelectedRelease)) { if (-not $State.Defaults.WindowsSettingsDefaults.WindowsVersionMap.ContainsKey($SelectedRelease)) {
return $result return $result
} }
$validVersions = $State.Defaults.WindowsSettingsDefaults.WindowsVersionMap[$SelectedRelease] $validVersions = $State.Defaults.WindowsSettingsDefaults.WindowsVersionMap[$SelectedRelease]
if ([string]::IsNullOrEmpty($IsoPath)) { if (-not [string]::IsNullOrEmpty($IsoPath) -and $IsoPath.EndsWith('.iso', [System.StringComparison]::OrdinalIgnoreCase)) {
# Logic for when no ISO is specified (MCT scenario)
switch ($SelectedRelease) {
10 { $result.DefaultVersion = "22H2" }
11 { $result.DefaultVersion = "24H2" }
# Server versions typically require an ISO, but handle just in case
2016 { $result.DefaultVersion = "1607" }
2019 { $result.DefaultVersion = "1809" }
2022 { $result.DefaultVersion = "21H2" }
2025 { $result.DefaultVersion = "24H2" }
default { $result.DefaultVersion = $validVersions[0] }
}
$result.Versions = @($result.DefaultVersion) # Only the default is available/relevant
$result.IsEnabled = $false # Combo should be disabled
}
else {
# Logic for when an ISO is specified # Logic for when an ISO is specified
$result.Versions = $validVersions $result.Versions = $validVersions
# Set default selection logic (e.g., latest for Win11) # Set default selection logic (e.g., latest for Win11)
@@ -287,7 +272,24 @@ function Get-AvailableWindowsVersions {
elseif ($validVersions.Count -gt 0) { elseif ($validVersions.Count -gt 0) {
$result.DefaultVersion = $validVersions[0] $result.DefaultVersion = $validVersions[0]
} }
$result.IsEnabled = $true $result.IsEnabled = $true
}
else {
# Logic for when no ISO is specified (MCT scenario)
switch ($SelectedRelease) {
10 { $result.DefaultVersion = "22H2" }
11 { $result.DefaultVersion = "24H2" }
# Server versions typically require an ISO, but handle just in case
2016 { $result.DefaultVersion = "1607" }
2019 { $result.DefaultVersion = "1809" }
2022 { $result.DefaultVersion = "21H2" }
2025 { $result.DefaultVersion = "24H2" }
default {
if ($validVersions.Count -gt 0) { $result.DefaultVersion = $validVersions[0] }
}
}
$result.Versions = @($result.DefaultVersion) # Only the default is available/relevant
$result.IsEnabled = $false # Combo should be disabled
} }
return $result return $result