Merge pull request #150 from SixParQuatre/master

Alpha Release Notes: Add support for 6000.0f version and fix bugs in comparison.
unitycoder · May 6, 2024 · f7ec679 · f7ec679
2 parents 8056e1e + bbf6a64
commit f7ec679
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/UnityLauncherPro/GetUnityUpdates.cs b/UnityLauncherPro/GetUnityUpdates.cs
@@ -44,8 +44,12 @@ public static async Task<string> Scan()
             return result;
         }
 
-        public static Updates[] Parse(string items)
+        public static Updates[] Parse(string items, ref List<string> updatesAsString)
         {
+            if (updatesAsString == null)
+                updatesAsString = new List<string>();
+            updatesAsString.Clear();
+
             isDownloadingUnityList = false;
             //SetStatus("Downloading list of Unity versions ... done");
             var receivedList = items.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
@@ -68,6 +72,7 @@ public static Updates[] Parse(string items)
                     u.ReleaseDate = DateTime.ParseExact(row[3], "MM/dd/yyyy", CultureInfo.InvariantCulture);
                     u.Version = versionTemp;
                     releases.Add(versionTemp, u);
+                    updatesAsString.Add(versionTemp);
                 }
 
                 prevVersion = versionTemp;

diff --git a/UnityLauncherPro/MainWindow.xaml.cs b/UnityLauncherPro/MainWindow.xaml.cs
@@ -46,6 +46,7 @@ public partial class MainWindow : Window
         System.Windows.Forms.NotifyIcon notifyIcon;
 
         Updates[] updatesSource;
+        public static List<string> updatesAsStrings;
 
         string _filterString = null;
         bool multiWordSearch = false;
@@ -744,7 +745,7 @@ async Task CallGetUnityUpdates()
             var items = await task;
             //Console.WriteLine("CallGetUnityUpdates=" + items == null);
             if (items == null) return;
-            updatesSource = GetUnityUpdates.Parse(items);
+            updatesSource = GetUnityUpdates.Parse(items, ref updatesAsStrings);
             if (updatesSource == null) return;
             dataGridUpdates.ItemsSource = updatesSource;
         }
@@ -1034,7 +1035,7 @@ private async void OnTabSelectionChanged(object sender, SelectionChangedEventArg
                     var items = await task;
                     if (task.IsCompleted == false || task.IsFaulted == true) return;
                     if (items == null) return;
-                    updatesSource = GetUnityUpdates.Parse(items);
+                    updatesSource = GetUnityUpdates.Parse(items, ref updatesAsStrings);
                     if (updatesSource == null) return;
                     dataGridUpdates.ItemsSource = updatesSource;
                 }

diff --git a/UnityLauncherPro/Tools.cs b/UnityLauncherPro/Tools.cs
@@ -593,12 +593,17 @@ public static bool OpenReleaseNotes(string version)
 
             //var url = Tools.GetUnityReleaseURL(version);
             string url = null;
-            if (Properties.Settings.Default.useAlphaReleaseNotes && !version.Contains("6000"))
+            bool noAlphaReleaseNotesPage = version.Contains("6000") && !version.Contains("f");
+            if (Properties.Settings.Default.useAlphaReleaseNotes && !noAlphaReleaseNotesPage)
             {
+                //with the alpha release notes, we want a diff between the 2 versions, but the site just shows all the changes inclusive of from
+                // so we need to compare the currently selected version to the one right after it that is available (installed or not)
+
                 var closestVersion = Tools.FindNearestVersion(version, MainWindow.unityInstalledVersions.Keys.ToList(), true);
-                if (closestVersion == null) closestVersion = version;
+                var getNextVersionToClosest = closestVersion == null ? null : Tools.FindNearestVersion(version, MainWindow.updatesAsStrings);
+                if (getNextVersionToClosest == null) getNextVersionToClosest = version;
 
-                url = "https://alpha.release-notes.ds.unity3d.com/search?fromVersion=" + closestVersion + "&toVersion=" + version;
+                url = "https://alpha.release-notes.ds.unity3d.com/search?fromVersion=" + getNextVersionToClosest + "&toVersion=" + version;
             }
             else
             {