From 047881934af0aa9bc1f3ba8320eb7a196cefbb0d Mon Sep 17 00:00:00 2001
From: Doctair <centit@outlook.com>
Date: Tue, 30 Jul 2024 13:57:54 -0400
Subject: [PATCH 1/2] Add Logic to catch the disk selection of USB External
 drives so that it will not accept a Letter

---
 FFUDevelopment/BuildFFUVM.ps1 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 7923cc0..b03eff3 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -2935,7 +2935,14 @@ Function Get-USBDrive {
                 }
                 $inputChoice = Read-Host "Enter the number corresponding to the external hard disk media drive you want to use"
                 $selectedIndex = $inputChoice - 1
-                $USBDrives = $ExternalHardDiskDrives[$selectedIndex]
+    
+                if ($selectedIndex -ge 0 -and $selectedIndex -lt $ExternalHardDiskDrives.Count) {
+                    $USBDrives = $ExternalHardDiskDrives[$selectedIndex]
+                } else {
+                    Write-Error "Invalid selection. Exiting."
+                    exit 1
+                }
+
             }
         }
         

From 39b9d06d21e4e932ee98cdf3e5db1cd5c0b1214b Mon Sep 17 00:00:00 2001
From: Doctair <centit@outlook.com>
Date: Tue, 30 Jul 2024 16:11:07 -0400
Subject: [PATCH 2/2] Correct Logic for Dirve letters and add Dirve Info to the
 write-host selection for Disks.

---
 FFUDevelopment/BuildFFUVM.ps1 | 36 ++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index b03eff3..5d8b058 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -2927,22 +2927,44 @@ Function Get-USBDrive {
                 WriteLog 'Found external hard disk media drives'
                 WriteLog 'Will prompt for user input to select the drive to use to prevent accidental data loss'
                 WriteLog 'If you do not want to be prompted for this in the future, set -PromptExternalHardDiskMedia to $false'
+                
                 for ($i = 0; $i -lt $ExternalHardDiskDrives.Count; $i++) {
+                     $ExternalDiskNumber = $ExternalHardDiskDrives[$i].DeviceID.Replace("\\.\PHYSICALDRIVE", "")
+                     $ExternalDisk = Get-Disk -Number $ExternalDiskNumber
                     if ($VerbosePreference -ne 'Continue'){
-                        Write-Host ("{0}: {1}" -f ($i + 1), $ExternalHardDiskDrives[$i].Model)
+                       # Write-Host ("{0}: {1}" -f ($i + 1), $ExternalHardDiskDrives[$i].Model)
+                       Write-Host ("Drive {0}: {1} SN/{2} PartitionStyle={3} Status={4}" -f ($i + 1), $ExternalDisk.FriendlyName , $ExternalHardDiskDrives[$i].serialnumber, $ExternalDisk.PartitionStyle,$ExternalDisk.OperationalStatus ) -ForegroundColor Green
                     }
-                    WriteLog ("{0}: {1}" -f ($i + 1), $ExternalHardDiskDrives[$i].Model)
+                    WriteLog ("Drive {0}: {1} SN/{2} PartitionStyle={3} Status={4}" -f ($i + 1), $ExternalDisk.FriendlyName , $ExternalHardDiskDrives[$i].serialnumber, $ExternalDisk.PartitionStyle,$ExternalDisk.OperationalStatus )
                 }
-                $inputChoice = Read-Host "Enter the number corresponding to the external hard disk media drive you want to use"
-                $selectedIndex = $inputChoice - 1
-    
+                    while ($true) {
+                        try {
+                            # Ask the user for input
+                            #$userInput = Read-Host "Please enter a number"
+                            $inputChoice = $(Write-Host "Enter the number corresponding to the external hard disk media drive you want to use: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
+                
+                            # Convert the input to a float
+                            $ISnumber = [float]$inputChoice
+                
+                            # Display the entered number
+                            Write-Host "You selected Disk: $ISnumber"
+                            $selectedIndex = $inputChoice - 1
+                            break
+                        }
+                        catch {
+                            # If the input is not a valid number, display an error message
+                            Write-Host "Invalid input. Please try again."
+                        }
+                    }
+                
+
                 if ($selectedIndex -ge 0 -and $selectedIndex -lt $ExternalHardDiskDrives.Count) {
                     $USBDrives = $ExternalHardDiskDrives[$selectedIndex]
                 } else {
-                    Write-Error "Invalid selection. Exiting."
+                    Write-Warning "Invalid selection. Exiting." | Out-Null
                     exit 1
                 }
-
+                
             }
         }