elie/Fido
1
0
Fork 0
mirror of https://github.com/pbatard/Fido.git synced 2025-09-16 22:28:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Speed up initial UI display by performing query locale check in stage 1

Browse Source 
* UI display should now only be constrained by the time it takes to launch PowerShell
This commit is contained in:
Pete Batard
2019-03-18 11:09:54 +00:00
parent bc488df01a
commit 9c19e1c671
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Fido.ps1
View File

@@ -1,5 +1,5 @@
# #
# Fido v1.08 - Retail Windows ISO Downloader # Fido v1.09 - Retail Windows ISO Downloader
# Copyright © 2019 Pete Batard <pete@akeo.ie> # Copyright © 2019 Pete Batard <pete@akeo.ie>
# ConvertTo-ImageSource: Copyright © 2016 Chris Carter # ConvertTo-ImageSource: Copyright © 2016 Chris Carter
# #
@@ -438,14 +438,7 @@ if ($LocData -and (-not $LocData.StartsWith("en-US"))) {
} }
$Locale = $Localized[0] $Locale = $Localized[0]
} }
# Test if the Microsoft servers can handle our locale. If not, fall back to en-US.
$QueryLocale = $Locale $QueryLocale = $Locale
try {
$url = "https://www.microsoft.com/" + $QueryLocale + "/software-download/"
Invoke-WebRequest -UseBasicParsing -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
} catch {
$QueryLocale = "en-US"
}
# Make sure PowerShell 3.0 or later is used (for Invoke-WebRequest) # Make sure PowerShell 3.0 or later is used (for Invoke-WebRequest)
if ($PSVersionTable.PSVersion.Major -lt 3) { if ($PSVersionTable.PSVersion.Major -lt 3) {
@@ -513,6 +506,16 @@ $Continue.add_click({
switch ($Stage) { switch ($Stage) {
1 { # Windows Version selection 1 { # Windows Version selection
$XMLForm.Title = Get-Translation($English[12])
Refresh-Control($XMLForm)
# Check if the locale we want is available - Fall back to en-US otherwise
try {
$url = "https://www.microsoft.com/" + $QueryLocale + "/software-download/"
Invoke-WebRequest -UseBasicParsing -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
} catch {
$script:QueryLocale = "en-US"
}
$i = 0 $i = 0
$array = @() $array = @()
foreach ($Version in $WindowsVersions[$WindowsVersion.SelectedValue.Index]) { foreach ($Version in $WindowsVersions[$WindowsVersion.SelectedValue.Index]) {
@@ -524,6 +527,7 @@ $Continue.add_click({
$script:WindowsRelease = Add-Entry $Stage "Release" $array $script:WindowsRelease = Add-Entry $Stage "Release" $array
$Back.Content = Get-Translation($English[8]) $Back.Content = Get-Translation($English[8])
$XMLForm.Title = $AppTitle
} }
2 { # Windows Release selection => Populate Product Edition 2 { # Windows Release selection => Populate Product Edition