Updates Microsoft Surface driver model discovery

Transitions the Microsoft Surface driver model list retrieval to use a centralized Learn-based index. This change unifies the scraping logic between the CLI and UI components, ensuring consistency and simplified maintenance. Cached model lists now serve both interfaces efficiently, reducing unnecessary network requests while retaining fallback mechanisms.
2026-06-14 02:09:35 -06:00 · 2026-03-23 14:47:39 -07:00
parent eac8be3d31
commit cfdf0af878
3 changed files with 184 additions and 171 deletions
@@ -15,100 +15,8 @@ function Get-MicrosoftDriversModelList {
        [string]$DriversFolder
    )

-    $url = "https://support.microsoft.com/en-us/surface/download-drivers-and-firmware-for-surface-09bb2e09-2a4b-cb69-0951-078a7739e120"
-    $models = @()
-
-    # Load cached model list first (Source B) to keep the UI fast.
-    # The cache is refreshed automatically when missing or invalid.
-    try {
-        $cachePath = Get-SurfaceDriverIndexCachePath -DriversFolder $DriversFolder
-        if (Test-Path -Path $cachePath -PathType Leaf) {
-            $cacheAgeDays = ((Get-Date) - (Get-Item -Path $cachePath).LastWriteTime).TotalDays
-            if ($cacheAgeDays -lt 7) {
-                $cache = Import-SurfaceDriverIndexCache -DriversFolder $DriversFolder
-                if ($cache.ModelIndex -and $cache.ModelIndex.Count -gt 0) {
-                    WriteLog "Surface cache: Using cached Microsoft model list ($($cache.ModelIndex.Count) models)."
-                    return @($cache.ModelIndex)
-                }
-            }
-        }
-    }
-    catch {
-        WriteLog "Surface cache: Failed to load cached Microsoft model list. Falling back to online parse. Error: $($_.Exception.Message)"
-    }
-
-    try {
-        WriteLog "Getting Surface driver information from $url"
-        $OriginalVerbosePreference = $VerbosePreference
-        $VerbosePreference = 'SilentlyContinue'
-        # Use passed-in UserAgent and Headers
-        $webContent = Invoke-WebRequest -Uri $url -UseBasicParsing -Headers $Headers -UserAgent $UserAgent
-        $VerbosePreference = $OriginalVerbosePreference
-        WriteLog "Complete"
-
-        WriteLog "Parsing web content for models and download links"
-        $html = $webContent.Content
-        $divPattern = '<div[^>]*class="selectable-content-options__option-content(?: ocHidden)?"[^>]*>(.*?)</div>'
-        $divMatches = [regex]::Matches($html, $divPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
-        foreach ($divMatch in $divMatches) {
-            $divContent = $divMatch.Groups[1].Value
-            $tablePattern = '<table[^>]*>(.*?)</table>'
-            $tableMatches = [regex]::Matches($divContent, $tablePattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
-            foreach ($tableMatch in $tableMatches) {
-                $tableContent = $tableMatch.Groups[1].Value
-                $rowPattern = '<tr[^>]*>(.*?)</tr>'
-                $rowMatches = [regex]::Matches($tableContent, $rowPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
-                foreach ($rowMatch in $rowMatches) {
-                    $rowContent = $rowMatch.Groups[1].Value
-                    $cellPattern = '<td[^>]*>\s*(?:<p[^>]*>)?(.*?)(?:</p>)?\s*</td>'
-                    $cellMatches = [regex]::Matches($rowContent, $cellPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
-                    if ($cellMatches.Count -ge 2) {
-                        $modelName = ([System.Net.WebUtility]::HtmlDecode(($cellMatches[0].Groups[1].Value).Trim()))
-                        $secondTdContent = $cellMatches[1].Groups[1].Value.Trim()
-                        # $linkPattern = '<a[^>]+href="([^"]+)"[^>]*>'
-                        # Change linkPattern to match https://www.microsoft.com/download/details.aspx?id=
-                        $linkPattern = '<a[^>]+href="(https://www\.microsoft\.com/download/details\.aspx\?id=\d+)"[^>]*>'
-                        $linkMatch = [regex]::Match($secondTdContent, $linkPattern, [System.Text.RegularExpressions.RegexOptions]::IgnoreCase)
-
-                        if ($linkMatch.Success) {
-                            $modelLink = $linkMatch.Groups[1].Value
-                        }
-                        else {
-                            continue
-                        }
-
-                        $models += [PSCustomObject]@{
-                            Make  = 'Microsoft'
-                            Model = $modelName
-                            Link  = $modelLink
-                        }
-                    }
-                }
-            }
-        }
-        WriteLog "Parsing complete. Found $($models.Count) models."
-
-        # Persist model list (Source B) into the local cache for fast UI population.
-        try {
-            $cache = Import-SurfaceDriverIndexCache -DriversFolder $DriversFolder
-            $cache.ModelIndex = @($models)
-            Save-SurfaceDriverIndexCache -Cache $cache -DriversFolder $DriversFolder
-            WriteLog "Surface cache: Saved Microsoft model list to cache."
-        }
-        catch {
-            WriteLog "Surface cache: Failed to save Microsoft model list. Error: $($_.Exception.Message)"
-        }
-
-        return $models
-    }
-    catch {
-        WriteLog "Error getting Microsoft models: $($_.Exception.Message)"
-        throw "Failed to retrieve Microsoft Surface models."
-    }
+    # Keep the UI signature unchanged while using the shared Learn-based source.
+    return @(Get-SurfaceDriverModelIndex -DriversFolder $DriversFolder)
 }
 # Function to download and extract drivers for a specific Microsoft model (Modified for ForEach-Object -Parallel)
 function Save-MicrosoftDriversTask {