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

Improve error handling

Browse Source 
* Simplify regex and fix unconverted characters.
* Also use Start-BitsTransfer for cmdline downloads (Closes #56).
* Also remove -DisableProgress now that we use Start-BitsTransfer.
This commit is contained in:
Pete Batard
2023-02-06 01:22:02 +00:00
parent 4b24ae5795
commit 10acbf9f84
3 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.editorconfig
View File

@@ -2,7 +2,8 @@
root = true root = true
[*] [*]
trim_trailing_whitespace = true
insert_final_newline = true
# Must use a BOM else Unicode strings will not display # Must use a BOM else Unicode strings will not display
charset = utf-8-bom charset = utf-8-bom
insert_final_newline = true
indent_style = space
trim_trailing_whitespace = true

69
Fido.ps1
View File

@@ -1,5 +1,5 @@
# #
# Fido v1.42 - Feature ISO Downloader, for retail Windows images and UEFI Shell # Fido v1.43 - Feature ISO Downloader, for retail Windows images and UEFI Shell
# Copyright © 2019-2023 Pete Batard <pete@akeo.ie> # Copyright © 2019-2023 Pete Batard <pete@akeo.ie>
# Command line support: Copyright © 2021 flx5 # Command line support: Copyright © 2021 flx5
# ConvertTo-ImageSource: Copyright © 2016 Chris Carter # ConvertTo-ImageSource: Copyright © 2016 Chris Carter
@@ -45,9 +45,7 @@ param(
# (Optional) Only display the download URL [Toggles commandline mode] # (Optional) Only display the download URL [Toggles commandline mode]
[switch]$GetUrl = $False, [switch]$GetUrl = $False,
# (Optional) Increase verbosity # (Optional) Increase verbosity
[switch]$Verbose = $False, [switch]$Verbose = $False
# (Optional) Disable the progress bar
[switch]$DisableProgress = $False
) )
#endregion #endregion
@@ -830,13 +828,11 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease
$ref = "https://www.microsoft.com/software-download/windows11" $ref = "https://www.microsoft.com/software-download/windows11"
$r = Invoke-WebRequest -Method Post -Headers @{ "Referer" = $ref } -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url $r = Invoke-WebRequest -Method Post -Headers @{ "Referer" = $ref } -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url
if ($r -match "errorModalMessage") { if ($r -match "errorModalMessage") {
$regex = New-Object Text.RegularExpressions.Regex '<p id="errorModalMessage">(.+?)<\/p>' $Alt = [regex]::Match($r, '<p id="errorModalMessage">(.+?)<\/p>').Groups[1].Value -replace "<[^>]+>" -replace "\s+", " " -replace "\?\?\?", "-"
$m = $regex.Match($r)
# Make the typical error message returned by Microsoft's servers more presentable
$Alt = $m.Groups[1] -replace "<[^>]+>" -replace "\s+", " "
$Alt += " " + $SessionId + "."
if (-not $Alt) { if (-not $Alt) {
$Alt = "Could not retrieve architectures from server" $Alt = "Could not retrieve architectures from server"
} else {
$Alt += " " + $SessionId + "."
} }
Throw-Error -Req $r -Alt $Alt Throw-Error -Req $r -Alt $Alt
} }
@@ -886,10 +882,7 @@ function Process-Download-Link([string]$Url)
$tmp_size = [uint64]::Parse($str_size) $tmp_size = [uint64]::Parse($str_size)
$Size = Size-To-Human-Readable $tmp_size $Size = Size-To-Human-Readable $tmp_size
Write-Host "Downloading '$File' ($Size)..." Write-Host "Downloading '$File' ($Size)..."
if ($DisableProgress) { Start-BitsTransfer -Source $Url -Destination $File
$ProgressPreference = 'SilentlyContinue'
}
Invoke-WebRequest -UseBasicParsing -Uri $Url -OutFile $File
} else { } else {
Write-Host Download Link: $Url Write-Host Download Link: $Url
Start-Process -FilePath $Url Start-Process -FilePath $Url
@@ -1218,8 +1211,8 @@ exit $ExitCode
# SIG # Begin signature block # SIG # Begin signature block
# MIIkWAYJKoZIhvcNAQcCoIIkSTCCJEUCAQExDzANBglghkgBZQMEAgEFADB5Bgor # MIIkWAYJKoZIhvcNAQcCoIIkSTCCJEUCAQExDzANBglghkgBZQMEAgEFADB5Bgor
# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDa8PrIe1NSjXqW # KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAin+3j4moQLVFU
# rwtj7a1ha0/FMIwXSDFruNwgp2G8haCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU # tqR8rGAmmgj13m89LOKayGbAncwfZqCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
# jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI # jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
# DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM # DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
# EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy # EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1322,22 +1315,22 @@ exit $ExitCode
# aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ # aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
# YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK # YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
# KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG # KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
# 9w0BCQQxIgQgZt1L7FY2zlXGm+elfLNq4whr0tPpkCErcZFwHcLK42kwDQYJKoZI # 9w0BCQQxIgQgel+r/YQC+D0iNMGrveay91mPrAI0D8kUPZcul7Zh01kwDQYJKoZI
# hvcNAQEBBQAEggIAO7AqJKab0cMvAjNl+zVgKFQ9/8RSM1+6u9cJGz3boyIc8XHK # hvcNAQEBBQAEggIAnHvSbYCOjz/C743Fuk+AAnBU7WXRE4XbmpE90ECJyR+yO/tE
# YnKrhVIelU4+iwcD+KIHfZK9R5p30PhKB34QpxarEQ1g7VBc+BMKwaFPcke/gPr6 # 3r3v/68pYQJrGZHKN6T+Y9iNVTIMHNYPLaBmPziQNASPcaLRWC3lz1dWAnDb1oCZ
# hgIJZbvUogqVA9/evJjX1ulwyh5CSUosIYZUyXdV7t75PlbQ04ndzXtd1LUjPKp+ # m/IYpxr5rpt4p/9PRjaB1E1ERc3PZ/htdoqWPi/3EqdAo1UljGLUF2CI6X6DMJZB
# EGSOzObzpTzfrKKAH0T9IFafp5wV+w3Nt1KhT8UmpLEGuh0QURLp4YhYy/KmWo+2 # hHYUP/PuD6RdKCO1OUo4HMuPGA7h3BnEp2uTPG0gBH4AiwViAkbMCJ0yVgsGzWU7
# wHeZsro7r1vS9J7099kD8+p1KnlgY63t2M3fY+5X7fPZ8jwGbFeEh0WyyzhNlqUd # 6gNnTDXl5fS9pxyUKjfB9ckl2jynS56mfQOQYo4rM+NbYCBwl1pHyx3ZexojSRsG
# Ut8F931EnwnXXA+Re1FRNFd00JjdpmFQpqkQHY5HKh6FAbAxBmOGM5Zv3mpmkVjS # 69k9TOY9L13h3zko7gafKOmQBJy950NEjgwdCq5UX7oQ1dN85Jgq+FI5DMsKqvcY
# 9VVoX3RaQMoXGduYIF8RnfKN6DV8OKc0V1D9NOPJcK/XZur6vow5Htpikj2Dyrdm # O55zddW0+ssrJsKaK78RQS7mZwbhmRJj592fPBFog8ba+/FsuYQH267wXirsqbej
# kvMiK+sqkDGsqhIdiAYHfa8Pq2bMfB/AQs4kcF3gkBaRwZQSLr9blWF6H5mL01Qq # USvzxAjVs2wAGGv/0A9L0eMvoTlKNP3tb0AiH34fN3R+KecVT9eZSJY6hidnRiVH
# YwCE3umpacP/P48PEDQ2kL4QYTvkIY8YL6Y81TXGfOxBj/EwQNalyaytln5+I7/0 # Op5oBHd+r1Dez3Lzgd7BVn70hWkxwA/1SNQDpABL/8/ZLBCjUe29JPjCnG71mwom
# nn1/nfriVU91cFvf1CYaId4xWqCTboC/49KtSN1cUMZsHFZggoPk5wNJZ/UIEAd3 # z9TSVtwJ+sCjUHnTzewRrQ0JIynnZoS5Id+tXLDh38lfVu9HvxNWciRrj95abV9V
# 2K7NiWxbUQA3wDiNrymEgts3lg3zV5DWGgYosWottpzYfWBcZqiI/65JT42hgg48 # HoE1a6hvNruqVKbjTTLvfUIDGZXIbbVSPEni1UTaeB91vnjkGOfBYOZdPW+hgg48
# MIIOOAYKKwYBBAGCNwMDATGCDigwgg4kBgkqhkiG9w0BBwKggg4VMIIOEQIBAzEN # MIIOOAYKKwYBBAGCNwMDATGCDigwgg4kBgkqhkiG9w0BBwKggg4VMIIOEQIBAzEN
# MAsGCWCGSAFlAwQCATCCAQ4GCyqGSIb3DQEJEAEEoIH+BIH7MIH4AgEBBgtghkgB # MAsGCWCGSAFlAwQCATCCAQ4GCyqGSIb3DQEJEAEEoIH+BIH7MIH4AgEBBgtghkgB
# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCBgeYfVPt15f69ZGlb0XMap8ogxbbm0 # hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCCGqni2QlwqB21hyU6Rs+gDl1tPIOma
# dx/FX6105nFxYQIUUU2TzURLgm2l56wAV0nbgxAYczMYDzIwMjMwMTI3MTUxMTUy # qMmxXDGtqTM4EAIUUqSQEpawBA8DWrWIdtuxvP7TczgYDzIwMjMwMjA2MDExOTI0
# WjADAgEeoIGGpIGDMIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMg # WjADAgEeoIGGpIGDMIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMg
# Q29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAv # Q29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAv
# BgNVBAMTKFN5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcgU2lnbmVyIC0gRzOg # BgNVBAMTKFN5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcgU2lnbmVyIC0gRzOg
@@ -1401,13 +1394,13 @@ exit $ExitCode
# A1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRy # A1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRy
# dXN0IE5ldHdvcmsxKDAmBgNVBAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBp # dXN0IE5ldHdvcmsxKDAmBgNVBAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBp
# bmcgQ0ECEHvU5a+6zAc/oQEjBCJBTRIwCwYJYIZIAWUDBAIBoIGkMBoGCSqGSIb3 # bmcgQ0ECEHvU5a+6zAc/oQEjBCJBTRIwCwYJYIZIAWUDBAIBoIGkMBoGCSqGSIb3
# DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjMwMTI3MTUxMTUy # DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjMwMjA2MDExOTI0
# WjAvBgkqhkiG9w0BCQQxIgQgeeqIeo9Kcp71ZTFGCM4j8vvANl2gqXHGZO7PVGZz # WjAvBgkqhkiG9w0BCQQxIgQgLweTPLKPtanJVxxrIuCqGzru3xtAintj/2W8Y+R8
# 1ygwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTOdgB9AjlODaXk3nwUxoD54oIB # nXwwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTOdgB9AjlODaXk3nwUxoD54oIB
# PP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBAAx1R1UnC8znHFbV2JkK+/UklEJH # PP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBAE4XHtLfg6sAuof9wFzniSPNmYks
# 2vkucu8cyPp6TS84T5Zpf9+TYV1JLYy00bmkXFdsY4ioS+GRd+ocGpgv887bQXKw # BPkufnx3wPWvzQECIQ1cmfDDHh8TjPENpMpmosJz6WVtAOjlVlrgFfT/A/5J8fh5
# 7xEP4ouQ2MR2/o4wakDTy4GqzxL2awZSSJvaHLKk1H5+gkvkNcYV/vTkHgkpcUwC # vj7vdDHhkW+PozQyKJI2UROJrFyo1ZbD8fHIgBGalHT9PD+/BoN3yps6vLvgVUWX
# Qqfh4P5unQwnCsQwOVtzgjSbrmslS5ctac66Vvjs6/0ewnTYQncnA04Us5tR/UPH # +mMdH7g1gwcHvmLl2ocmPANNR7gfdw/8BUtLlnK5Jgta3DANEh/A7Wedo1Gt4ctN
# bWSajMeLGp4E1k/sWWU9V7+uiQqx1wo5Qs6AjXkEu0NpfFGgUM1Js7X4cRUpWumM # NVC2g3Vs1BhyF8EJj274wtQuSC/9Q9SoBQhrnBYD/pElwOkFCQB+VFAP0TOnyqvS
# /q23yClpxUHiDHPA1nhOHLuHlgn8RZwEdTB6ZOD0JIRVp3RpZ9Q+Qlu34qc= # YO9QM5G3Xd31TRkW9i83G1SNMhKf0du/voqtplcIEMqXfYGdagtzY+qSf1c=
# SIG # End signature block # SIG # End signature block

1
README.md
View File

@@ -87,7 +87,6 @@ The options are:
architecture as the one from the current system. architecture as the one from the current system.
- `GetUrl`: By default, the script attempts to automatically launch the download. But when using the `-GetUrl` switch, - `GetUrl`: By default, the script attempts to automatically launch the download. But when using the `-GetUrl` switch,
the script only displays the download URL, which can then be piped into another command or into a file. the script only displays the download URL, which can then be piped into another command or into a file.
- `DisableProgress`: Disable progress report. This may speed up downloads when using the command line.
Examples of a commandline download: Examples of a commandline download: