handle missing releases, comparing batches to all cached versions (since releases api is not in order)

Author: unitycoder

Diff for: UnityLauncherPro/GetUnityUpdates.cs

@@ -20,12 +20,7 @@ public static class GetUnityUpdates
         public static async Task<List<UnityVersion>> FetchAll()
         {
             var cachedVersions = LoadCachedVersions();
-            //Console.WriteLine("cachedVersions: "+ cachedVersions);
-            var latestCachedVersion = cachedVersions.FirstOrDefault();
-
-            //Console.WriteLine("FetchAll "+ latestCachedVersion);
-            var newVersions = await FetchNewVersions(latestCachedVersion);
-            //Console.WriteLine("newVersions " + newVersions);
+            var newVersions = await FetchNewVersions(cachedVersions);
 
             var allVersions = newVersions.Concat(cachedVersions).ToList();
 
@@ -34,8 +29,6 @@ public static async Task<List<UnityVersion>> FetchAll()
                 SaveCachedVersions(allVersions);
             }
 
-            //Console.WriteLine("all "+ allVersions);
-
             return allVersions;
         }
 
@@ -62,7 +55,6 @@ public static async Task<string> FetchDownloadUrl(string unityVersion)
 
         private static async Task<string> ExtractDownloadUrlAsync(string json, string unityVersion)
         {
-
             int resultsIndex = json.IndexOf("\"results\":");
             if (resultsIndex == -1) return null;
 
@@ -122,28 +114,39 @@ private static async Task<bool> CheckAssistantUrl(string assistantUrl)
             }
         }
 
-        private static async Task<List<UnityVersion>> FetchNewVersions(UnityVersion latestCachedVersion)
+        private static async Task<List<UnityVersion>> FetchNewVersions(List<UnityVersion> cachedVersions)
         {
             var newVersions = new List<UnityVersion>();
+            var cachedVersionSet = new HashSet<string>(cachedVersions.Select(v => v.Version));
             int offset = 0;
             int total = int.MaxValue;
+            bool foundNewVersionInBatch;
 
             while (offset < total)
             {
                 var batchUpdates = await FetchBatch(offset);
-                if (batchUpdates == null || batchUpdates.Count == 0)
-                    break;
+                if (batchUpdates == null || batchUpdates.Count == 0) break;
+
+                foundNewVersionInBatch = false;
 
                 foreach (var version in batchUpdates)
                 {
-                    if (version.Version == latestCachedVersion?.Version)
-                        return newVersions;
+                    if (!cachedVersionSet.Contains(version.Version))
+                    {
+                        newVersions.Add(version);
+                        foundNewVersionInBatch = true;
+                    }
+                }
 
-                    newVersions.Add(version);
+                if (!foundNewVersionInBatch)
+                {
+                    // Exit if no new versions are found in the current batch
+                    break;
                 }
 
                 offset += batchUpdates.Count;
 
+                // Apply delay if reaching batch limit
                 if (offset % (BatchSize * RequestsPerBatch) == 0)
                 {
                     await Task.Delay(DelayBetweenBatches);
@@ -153,6 +156,8 @@ private static async Task<List<UnityVersion>> FetchNewVersions(UnityVersion late
             return newVersions;
         }
 
+
+
         private static async Task<List<UnityVersion>> FetchBatch(int offset)
         {
             string url = $"{BaseApiUrl}?limit={BatchSize}&offset={offset}&architecture=X86_64&platform=WINDOWS";
@@ -187,6 +192,7 @@ private static List<UnityVersion> ParseUnityVersions(string json)
                         ReleaseDate = DateTime.TryParse(GetStringValue(item, "releaseDate"), out var date) ? date : default,
                         Stream = Enum.TryParse<UnityVersionStream>(GetStringValue(item, "stream"), true, out var stream) ? stream : UnityVersionStream.Tech
                     };
+                    //Console.WriteLine(version.Version);
                     versions.Add(version);
                 }
             }

Diff for: UnityLauncherPro/Tools.cs

@@ -520,8 +520,8 @@ public static Process LaunchExe(string path, string param = null)
                 }
                 return newProcess;
             }
-            Console.WriteLine("Failed to run exe: " + path + " " + param);
-            return null;
+           // Console.WriteLine("Failed to run exe: " + path + " " + param);
+           // return null;
         }
 
 
@@ -868,8 +868,6 @@ public static string CleanVersionNumber(string version)
 
         private static string FetchUnityVersionNumberFromHTML(string url)
         {
-            string version = null;
-
             string sourceHTML = DownloadHTML(url);
 
             if (string.IsNullOrEmpty(sourceHTML)) return null;
@@ -882,7 +880,7 @@ private static string FetchUnityVersionNumberFromHTML(string url)
                 {
                     Console.WriteLine("Extracted number: " + match.Value);
                     return match.Value;
-                    break;
+                    //break;
                 }
             }
             else
@@ -902,7 +900,7 @@ private static string FetchUnityVersionNumberFromHTML(string url)
             //        version = match.Value.Replace("UnityDownloadAssistant-", "").Replace(".exe", "");
             //    }
             //}
-            return version;
+            //return version;
         }
 
         public static string FindNearestVersion(string currentVersion, List<string> allAvailable, bool checkBelow = false)