improve chipset detection and error indication

realies · Jul 8, 2024 · 611cfd8 · 611cfd8
1 parent e8cd80e
commit 611cfd8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -52,8 +52,11 @@ async Task InitializeAsync()
                 if (this.detectedChipset != null)
                 {
                     this.latestVersionUrl = await this.FetchLatestVersionUrl(this.detectedChipset);
-                    this.latestVersion = this.latestVersionUrl.Split('_').Last().Replace(".exe", string.Empty);
-                    this.InstallDriversButton.IsEnabled = true;
+                    this.latestVersion = this.latestVersionUrl?.Split('_').Last().Replace(".exe", string.Empty);
+                    if (this.latestVersion != null)
+                    {
+                        this.InstallDriversButton.IsEnabled = true;
+                    }
                 }
 
                 this.LatestVersionText.Text = this.latestVersion ?? "Error fetching";
@@ -129,12 +132,12 @@ public async Task<string> FetchLatestVersionUrl(string chipset)
             {
                 string driversPageUrl = "https://www.amd.com/en/support/download/drivers.html";
                 string driversPageContent = await this.client.GetStringAsync(driversPageUrl);
-                string driversPagePattern = $@"https://[^\s""']*{Regex.Escape(chipset)}\.html";
+                string driversPagePattern = $@"https://[^""&]+{Regex.Escape(chipset)}\.html";
                 Match driversUrlMatch = Regex.Match(driversPageContent, driversPagePattern, RegexOptions.IgnoreCase);
                 if (driversUrlMatch.Success)
                 {
                     string chipsetPageContent = await this.client.GetStringAsync(driversUrlMatch.Value);
-                    string chipsetUrlPattern = $@"https://[^\s""']*.exe";
+                    string chipsetUrlPattern = $@"https://[^""]+\.exe";
                     Match chipsetUrlMatch = Regex.Match(chipsetPageContent, chipsetUrlPattern, RegexOptions.IgnoreCase);
                     if (chipsetUrlMatch.Success)
                     {

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -47,4 +47,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.0.2.0")]
+[assembly: AssemblyFileVersion("0.0.3.0")]