Fix problems with updating games with manifest v1

#17
hawkeye116477 · Nov 19, 2024 · 58cbc78 · 58cbc78
1 parent 8ec5f09
commit 58cbc78
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/src/GogOssGameController.cs b/src/GogOssGameController.cs
@@ -605,7 +605,19 @@ public async Task<Dictionary<string, UpdateInfo>> CheckGameUpdates(string gameTi
             var newGameInfo = await Gogdl.GetGameInfo(oldGameData, false, true, forceRefreshCache);
             if (newGameInfo.buildId != null)
             {
-                if (installedInfo.build_id != newGameInfo.buildId)
+                bool updateAvailable = false;
+                if (installedInfo.build_id == newGameInfo.buildId)
+                {
+                    if (installedInfo.build_id != newGameInfo.builds.items[0].legacy_build_id)
+                    {
+                        updateAvailable = true;
+                    }
+                }
+                else
+                {
+                    updateAvailable = true;
+                }
+                if (updateAvailable)
                 {
                     var updateSize = await Gogdl.CalculateGameSize(gameId, installedInfo);
                     DateTimeFormatInfo formatInfo = CultureInfo.CurrentCulture.DateTimeFormat;

diff --git a/src/GogOssGameInstallerView.xaml.cs b/src/GogOssGameInstallerView.xaml.cs
@@ -581,7 +581,12 @@ private async Task RefreshVersions()
                             versionNameFirstPart = "";
                         }
                         var versionName = $"{versionNameFirstPart}{build.date_published.ToLocalTime().ToString("d", formatInfo)}";
-                        gameVersions.Add(build.build_id, versionName);
+                        var buildId = build.legacy_build_id;
+                        if (buildId.IsNullOrEmpty())
+                        {
+                            buildId = build.build_id;
+                        }
+                        gameVersions.Add(buildId, versionName);
                     }
                 }
                 GameVersionCBo.ItemsSource = gameVersions;

diff --git a/src/Models/GogDownloadGameInfo.cs b/src/Models/GogDownloadGameInfo.cs
@@ -8,12 +8,12 @@ public class GogDownloadGameInfo
         public bool errorDisplayed = false;
         public Dictionary<string, SizeType> size { get; set; } = new Dictionary<string, SizeType>();
         public List<Dlc> dlcs { get; set; } = new List<Dlc>();
-        public string buildId { get; set; }
+        public string buildId { get; set; } = "";
         public List<string> languages { get; set; } = new List<string>();
         public string folder_name { get; set; } = "";
         public List<string> dependencies { get; set; } = new List<string>();
         public string versionEtag { get; set; }
-        public string versionName { get; set; }
+        public string versionName { get; set; } = "";
         public List<string> available_branches { get; set; } = new List<string>();
         public Builds builds { get; set; } = new Builds();
         public GogDownloadRedistManifest.Executable executable { get; set; } = new GogDownloadRedistManifest.Executable();
@@ -42,13 +42,14 @@ public class Builds
 
         public class Item
         {
-            public string build_id { get; set; }
-            public string product_id { get; set; }
-            public string os { get; set; }
+            public string legacy_build_id { get; set; } = "";
+            public string build_id { get; set; } = "";
+            public string product_id { get; set; } = "";
+            public string os { get; set; } = "";
             public string branch { get; set; }
-            public string version_name { get; set; }
+            public string version_name { get; set; } = "";
             public string[] tags { get; set; }
-            public bool _public { get; set; }
+            public bool _public { get; set; } = false;
             public DateTime date_published { get; set; }
             public int generation { get; set; }
             public string link { get; set; }