add full installer exe download option to DownloadInBrowser(), add await for extract urls (got stuck otherwise),

Author: unitycoder

UnityLauncherPro/GetUnityUpdates.cs

@@ -51,7 +51,7 @@ public static async Task<string> FetchDownloadUrl(string unityVersion)
             try
             {
                 string responseString = await Client.GetStringAsync(apiUrl);
-                return ExtractDownloadUrl(responseString, unityVersion);
+                return await ExtractDownloadUrlAsync(responseString, unityVersion);
             }
             catch (Exception e)
             {
@@ -60,8 +60,9 @@ public static async Task<string> FetchDownloadUrl(string unityVersion)
             }
         }
 
-        private static string ExtractDownloadUrl(string json, string unityVersion)
+        private static async Task<string> ExtractDownloadUrlAsync(string json, string unityVersion)
         {
+
             int resultsIndex = json.IndexOf("\"results\":");
             if (resultsIndex == -1) return null;
 
@@ -87,10 +88,9 @@ private static string ExtractDownloadUrl(string json, string unityVersion)
             if (!string.IsNullOrEmpty(downloadUrl) && !string.IsNullOrEmpty(shortRevision))
             {
                 int revisionPosition = downloadUrl.LastIndexOf(shortRevision, StringComparison.Ordinal) + shortRevision.Length + 1;
-                string assistantUrl = downloadUrl.Substring(0, revisionPosition) +
-                    $"UnityDownloadAssistant-{unityVersion}.exe";
+                string assistantUrl = downloadUrl.Substring(0, revisionPosition) + $"UnityDownloadAssistant-{unityVersion}.exe";
 
-                if (CheckAssistantUrl(assistantUrl).Result)
+                if (await CheckAssistantUrl(assistantUrl))
                 {
                     Console.WriteLine("Assistant download URL found.");
                     return assistantUrl;
@@ -115,8 +115,9 @@ private static async Task<bool> CheckAssistantUrl(string assistantUrl)
                     return response.IsSuccessStatusCode;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Console.WriteLine($"Request failed: {ex.Message}");
                 return false;
             }
         }

UnityLauncherPro/MainWindow.xaml.cs

@@ -1517,7 +1517,7 @@ private void BtnDownloadInBrowser_Click(object sender, RoutedEventArgs e)
         private void BtnDownloadInBrowserFull_Click(object sender, RoutedEventArgs e)
         {
             var unity = GetSelectedUpdate();
-            Tools.DownloadInBrowser(unity?.Version);
+            Tools.DownloadInBrowser(unity?.Version, true);
         }
 
         private void btnDownloadInstallUpdate_Click(object sender, RoutedEventArgs e)

UnityLauncherPro/Tools.cs

@@ -659,11 +659,16 @@ public static void OpenURL(string url)
             Process.Start(url);
         }
 
-        public static async void DownloadInBrowser(string version)
+        public static async void DownloadInBrowser(string version, bool preferFullInstaller = false)
         {
             if (version == null) return;
             string exeURL = await GetUnityUpdates.FetchDownloadUrl(version);
 
+            if (preferFullInstaller == true)
+            {
+                exeURL = exeURL.Replace("UnityDownloadAssistant-" + version + ".exe", "Windows64EditorInstaller/UnitySetup64-" + version + ".exe");
+            }
+
             Console.WriteLine("DownloadInBrowser exeURL= '" + exeURL + "'");
 
             if (string.IsNullOrEmpty(exeURL) == false && exeURL.StartsWith("https"))