From 51b0c060afe1d941481e62d08e6f7e08c19334c5 Mon Sep 17 00:00:00 2001
From: MyDrift <personal@mdiana.ch>
Date: Sat, 28 Sep 2024 19:18:56 +0200
Subject: [PATCH] move stuff around & define vars for runspace
---
functions/public/Invoke-WPFGetIso.ps1 | 158 ++++++++++++++------------
1 file changed, 83 insertions(+), 75 deletions(-)
diff --git a/functions/public/Invoke-WPFGetIso.ps1 b/functions/public/Invoke-WPFGetIso.ps1
index 2da29704..8f1cbf51 100644
--- a/functions/public/Invoke-WPFGetIso.ps1
+++ b/functions/public/Invoke-WPFGetIso.ps1
@@ -15,13 +15,96 @@ function Invoke-WPFGetIso {
$sync.BusyMessage.Visibility="Visible"
$sync.BusyText.Text="N Busy"
+ $sync.GetISOProcess.ISOmanual = if ($sync["ISOmanual"].IsChecked) { $true } else { $false }
+ $sync.GetISOProcess.ISOdownloader = if ($sync["ISOdownloader"].IsChecked) { $true } else { $false }
+ $sync.GetISOProcess.ISOReleaseItem = $sync["ISORelease"].SelectedItem
+ $sync.GetISOProcess.ISOLanguageItem = $sync["ISOLanguage"].SelectedItem
+ $sync.GetISOProcess.isoDownloaderFBD = if ($isoDownloaderFBD.SelectedPath -eq [System.Windows.Forms.DialogResult]::OK) { $true } else { $false }
+ $sync.GetISOProcess.ISOScratchDir = if ($sync["WPFMicrowinISOScratchDir"].IsChecked) { $true } else { $false }
+ $sync.GetISOProcess.ISOScratchDirPath = $sync["MicrowinScratchDirBox"].Text
+ $sync.GetISOProcess.DownloadFromGitHub = if ($sync.WPFMicrowinDownloadFromGitHub.IsChecked) { $true } else { $false }
+
+ if ($sync["ISOmanual"].IsChecked) {
+ # Open file dialog to let user choose the ISO file
+ [System.Reflection.Assembly]::LoadWithPartialName("System.windows.forms") | Out-Null
+ $openFileDialog = New-Object System.Windows.Forms.OpenFileDialog
+ $openFileDialog.initialDirectory = $initialDirectory
+ $openFileDialog.filter = "ISO files (*.iso)| *.iso"
+ $openFileDialog.ShowDialog() | Out-Null
+ $filePath = $openFileDialog.FileName
+
+ if ([string]::IsNullOrEmpty($filePath)) {
+ Write-Host "No ISO is chosen"
+ $sync.BusyMessage.Visibility="Hidden"
+ return
+ }
+ } elseif ($sync["ISOdownloader"].IsChecked) {
+ # Create folder browsers for user-specified locations
+ [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") | Out-Null
+ $isoDownloaderFBD = New-Object System.Windows.Forms.FolderBrowserDialog
+ $isoDownloaderFBD.Description = "Please specify the path to download the ISO file to:"
+ $isoDownloaderFBD.ShowNewFolderButton = $true
+ if ($isoDownloaderFBD.ShowDialog() -ne [System.Windows.Forms.DialogResult]::OK) {
+ return
+ }
+ }
Write-Host " _ __ __ _ "
Write-Host " /\/\ (_) ___ _ __ ___ / / /\ \ \(_) _ __ "
Write-Host " / \ | | / __|| '__| / _ \ \ \/ \/ /| || '_ \ "
Write-Host "/ /\/\ \| || (__ | | | (_) | \ /\ / | || | | | "
Write-Host "\/ \/|_| \___||_| \___/ \/ \/ |_||_| |_| "
+ Write-Host " "
+
+ if ($isoDownloaderFBD.SelectedPath -eq [System.Windows.Forms.DialogResult]::OK) {
+ # Grab the location of the selected path
+ $targetFolder = $isoDownloaderFBD.SelectedPath
+
+ # Auto download newest ISO
+ # Credit: https://github.com/pbatard/Fido
+ $fidopath = "$env:temp\Fido.ps1"
+ $originalLocation = $PSScriptRoot
+
+ write-host "Starting download Process, this will take a while ..."
+
+ Invoke-WebRequest "https://github.com/pbatard/Fido/raw/master/Fido.ps1" -OutFile $fidopath
+
+ Set-Location -Path $env:temp
+ # Detect if the first option ("System language") has been selected and get a Fido-approved language from the current culture
+ $lang = if ($sync["ISOLanguage"].SelectedIndex -eq 0) {
+ Get-FidoLangFromCulture -langName (Get-Culture).Name
+ } else {
+ $sync["ISOLanguage"].SelectedItem
+ }
+
+ & $fidopath -Win 'Windows 11' -Rel $sync["ISORelease"].SelectedItem -Arch "x64" -Lang $lang -Ed "Windows 11 Home/Pro/Edu"
+ if (-not $?) {
+ Write-Host "Could not download the ISO file. Look at the output of the console for more information."
+ $msg = "The ISO file could not be downloaded"
+ [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
+ return
+ }
+ Set-Location $originalLocation
+ # Use the FullName property to only grab the file names. Using this property is necessary as, without it, you're passing the usual output of Get-ChildItem
+ # to the variable, and let's be honest, that does NOT exist in the file system
+ $filePath = (Get-ChildItem -Path "$env:temp" -Filter "Win11*.iso").FullName | Sort-Object LastWriteTime -Descending | Select-Object -First 1
+ $fileName = [IO.Path]::GetFileName("$filePath")
+
+ if (($targetFolder -ne "") -and (Test-Path "$targetFolder")) {
+ try {
+ # "Let it download to $env:TEMP and then we **move** it to the file path." - CodingWonders
+ $destinationFilePath = "$targetFolder\$fileName"
+ Write-Host "Moving ISO file. Please wait..."
+ Move-Item -Path "$filePath" -Destination "$destinationFilePath" -Force
+ $filePath = $destinationFilePath
+ }
+ catch {
+ Write-Host "Unable to move the ISO file to the location you specified. The downloaded ISO is in the `"$env:TEMP`" folder"
+ Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
+ }
+ }
+ }
$oscdimgPath = Join-Path $env:TEMP 'oscdimg.exe'
$oscdImgFound = [bool] (Get-Command -ErrorAction Ignore -Type Application oscdimg.exe) -or (Test-Path $oscdimgPath -PathType Leaf)
@@ -62,81 +145,6 @@ function Invoke-WPFGetIso {
}
}
- if ($sync["ISOmanual"].IsChecked) {
- # Open file dialog to let user choose the ISO file
- [System.Reflection.Assembly]::LoadWithPartialName("System.windows.forms") | Out-Null
- $openFileDialog = New-Object System.Windows.Forms.OpenFileDialog
- $openFileDialog.initialDirectory = $initialDirectory
- $openFileDialog.filter = "ISO files (*.iso)| *.iso"
- $openFileDialog.ShowDialog() | Out-Null
- $filePath = $openFileDialog.FileName
-
- if ([string]::IsNullOrEmpty($filePath)) {
- Write-Host "No ISO is chosen"
- $sync.BusyMessage.Visibility="Hidden"
- return
- }
- } elseif ($sync["ISOdownloader"].IsChecked) {
- # Create folder browsers for user-specified locations
- [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") | Out-Null
- $isoDownloaderFBD = New-Object System.Windows.Forms.FolderBrowserDialog
- $isoDownloaderFBD.Description = "Please specify the path to download the ISO file to:"
- $isoDownloaderFBD.ShowNewFolderButton = $true
- if ($isoDownloaderFBD.ShowDialog() -ne [System.Windows.Forms.DialogResult]::OK)
- {
- return
- }
-
- # Grab the location of the selected path
- $targetFolder = $isoDownloaderFBD.SelectedPath
-
- # Auto download newest ISO
- # Credit: https://github.com/pbatard/Fido
- $fidopath = "$env:temp\Fido.ps1"
- $originalLocation = $PSScriptRoot
-
- Invoke-WebRequest "https://github.com/pbatard/Fido/raw/master/Fido.ps1" -OutFile $fidopath
-
- Set-Location -Path $env:temp
- # Detect if the first option ("System language") has been selected and get a Fido-approved language from the current culture
- $lang = if ($sync["ISOLanguage"].SelectedIndex -eq 0) {
- Get-FidoLangFromCulture -langName (Get-Culture).Name
- } else {
- $sync["ISOLanguage"].SelectedItem
- }
-
- & $fidopath -Win 'Windows 11' -Rel $sync["ISORelease"].SelectedItem -Arch "x64" -Lang $lang -Ed "Windows 11 Home/Pro/Edu"
- if (-not $?)
- {
- Write-Host "Could not download the ISO file. Look at the output of the console for more information."
- $msg = "The ISO file could not be downloaded"
- [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
- return
- }
- Set-Location $originalLocation
- # Use the FullName property to only grab the file names. Using this property is necessary as, without it, you're passing the usual output of Get-ChildItem
- # to the variable, and let's be honest, that does NOT exist in the file system
- $filePath = (Get-ChildItem -Path "$env:temp" -Filter "Win11*.iso").FullName | Sort-Object LastWriteTime -Descending | Select-Object -First 1
- $fileName = [IO.Path]::GetFileName("$filePath")
-
- if (($targetFolder -ne "") -and (Test-Path "$targetFolder"))
- {
- try
- {
- # "Let it download to $env:TEMP and then we **move** it to the file path." - CodingWonders
- $destinationFilePath = "$targetFolder\$fileName"
- Write-Host "Moving ISO file. Please wait..."
- Move-Item -Path "$filePath" -Destination "$destinationFilePath" -Force
- $filePath = $destinationFilePath
- }
- catch
- {
- Write-Host "Unable to move the ISO file to the location you specified. The downloaded ISO is in the `"$env:TEMP`" folder"
- Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
- }
- }
- }
-
Write-Host "File path $($filePath)"
if (-not (Test-Path -Path "$filePath" -PathType Leaf)) {
$msg = "File you've chosen doesn't exist"