Include DLC information for GOG and Heroic

Author: erri120

CHANGELOG.md

@@ -8,6 +8,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com) and this p
 
 ## [Released](https://github.com/erri120/GameFinder/releases)
 
+## [4.9.0](https://github.com/erri120/GameFinder/compare/v4.8.0...v4.9.0) - 2025-07-20
+
+- GOG: parse parent game ID for DLCs.
+- Heroic: parse installed DLCs.
+
 ## [4.8.0](https://github.com/erri120/GameFinder/compare/v4.7.3...v4.8.0) - 2025-06-23
 
 - EGS: [#161](https://github.com/erri120/GameFinder/pull/161) by @[halgari](https://github.com/halgari)

src/GameFinder.Launcher.Heroic/DTOs/Json.cs

@@ -11,7 +11,7 @@ internal record Installed(
     [property: JsonPropertyName("is_dlc")] bool IsDlc,
     [property: JsonPropertyName("version")] string? Version,
     [property: JsonPropertyName("appName")] string AppName,
-    [property: JsonPropertyName("installedDLCs")] IReadOnlyList<object> InstalledDLCs,
+    [property: JsonPropertyName("installedDLCs")] IReadOnlyList<string> InstalledDLCs,
     [property: JsonPropertyName("language")] string Language,
     [property: JsonPropertyName("versionEtag")] string VersionEtag,
     [property: JsonPropertyName("buildId")] string BuildId,

src/GameFinder.Launcher.Heroic/HeroicGOGGame.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using GameFinder.Common;
 using GameFinder.StoreHandlers.GOG;
 using GameFinder.Wine;
 using JetBrains.Annotations;
@@ -17,7 +18,8 @@ public record HeroicGOGGame(
     AbsolutePath Path,
     ulong BuildId,
     WineData? WineData,
-    OSPlatform Platform) : GOGGame(Id, Name, Path, BuildId)
+    OSPlatform Platform,
+    IReadOnlyList<GOGGameId> InstalledDLCs) : IGame
 {
     /// <summary>
     /// Gets the wine prefix, if any.

src/GameFinder.Launcher.Heroic/HeroicGOGHandler.cs

@@ -17,7 +17,7 @@
 namespace GameFinder.Launcher.Heroic;
 
 [PublicAPI]
-public class HeroicGOGHandler : AHandler<GOGGame, GOGGameId>
+public class HeroicGOGHandler : AHandler<HeroicGOGGame, GOGGameId>
 {
     private readonly IFileSystem _fileSystem;
     private readonly ILogger _logger;
@@ -39,13 +39,13 @@ public HeroicGOGHandler(IFileSystem fileSystem, ILogger logger)
     }
 
     /// <inheritdoc/>
-    public override Func<GOGGame, GOGGameId> IdSelector { get; } = static game => game.Id;
+    public override Func<HeroicGOGGame, GOGGameId> IdSelector { get; } = static game => game.Id;
 
     /// <inheritdoc/>
     public override IEqualityComparer<GOGGameId>? IdEqualityComparer => null;
 
     /// <inheritdoc/>
-    public override IEnumerable<OneOf<GOGGame, ErrorMessage>> FindAllGames()
+    public override IEnumerable<OneOf<HeroicGOGGame, ErrorMessage>> FindAllGames()
     {
         var configDirectory = FindConfigDirectory(_fileSystem)
             .FirstOrDefault(path => path.DirectoryExists());
@@ -72,7 +72,7 @@ public override IEnumerable<OneOf<GOGGame, ErrorMessage>> FindAllGames()
     }
 
     [RequiresUnreferencedCode("Calls System.Text.Json.JsonSerializer.Deserialize<TValue>(Stream, JsonSerializerOptions)")]
-    internal IEnumerable<OneOf<GOGGame, ErrorMessage>> ParseInstalledJsonFile(AbsolutePath path, AbsolutePath configPath)
+    internal IEnumerable<OneOf<HeroicGOGGame, ErrorMessage>> ParseInstalledJsonFile(AbsolutePath path, AbsolutePath configPath)
     {
         using var stream = path.Open(FileMode.Open, FileAccess.Read, FileShare.Read);
         var root = JsonSerializer.Deserialize<DTOs.Root>(stream, JsonSerializerOptions);
@@ -84,7 +84,7 @@ internal IEnumerable<OneOf<GOGGame, ErrorMessage>> ParseInstalledJsonFile(Absolu
 
         foreach (var installed in root.Installed)
         {
-            OneOf<GOGGame, ErrorMessage> res;
+            OneOf<HeroicGOGGame, ErrorMessage> res;
             try
             {
                 res = Parse(installed, configPath, path.FileSystem);
@@ -99,7 +99,7 @@ internal IEnumerable<OneOf<GOGGame, ErrorMessage>> ParseInstalledJsonFile(Absolu
     }
 
     [RequiresUnreferencedCode("Calls GameFinder.Launcher.Heroic.HeroicGOGHandler.GetWineData(Installed, AbsolutePath, Int64)")]
-    internal OneOf<GOGGame, ErrorMessage> Parse(
+    internal OneOf<HeroicGOGGame, ErrorMessage> Parse(
         DTOs.Installed installed,
         AbsolutePath configPath,
         IFileSystem fileSystem)
@@ -136,8 +136,17 @@ internal OneOf<GOGGame, ErrorMessage> Parse(
             }
         }
 
+        var installedDLCs = new List<GOGGameId>();
+        foreach (var sRawId in installed.InstalledDLCs)
+        {
+            if (long.TryParse(sRawId, NumberStyles.Integer, CultureInfo.InvariantCulture, out var rawId))
+            {
+                installedDLCs.Add(GOGGameId.From(rawId));
+            }
+        }
+
         var path = fileSystem.FromUnsanitizedFullPath(installed.InstallPath);
-        return new HeroicGOGGame(GOGGameId.From(id), installed.AppName, path, buildId, wineData, installedPlatform);
+        return new HeroicGOGGame(GOGGameId.From(id), installed.AppName, path, buildId, wineData, installedPlatform, installedDLCs);
     }
 
     [RequiresUnreferencedCode("Calls System.Text.Json.JsonSerializer.Deserialize<TValue>(JsonSerializerOptions)")]

src/GameFinder.StoreHandlers.GOG/GOGGame.cs

@@ -1,3 +1,4 @@
+using System;
 using GameFinder.Common;
 using JetBrains.Annotations;
 using NexusMods.Paths;
@@ -8,4 +9,4 @@ namespace GameFinder.StoreHandlers.GOG;
 /// Represents a game installed with GOG Galaxy.
 /// </summary>
 [PublicAPI]
-public record GOGGame(GOGGameId Id, string Name, AbsolutePath Path, ulong BuildId) : IGame;
+public record GOGGame(GOGGameId Id, string Name, AbsolutePath Path, ulong BuildId, Nullable<GOGGameId> ParentGameId = null) : IGame;

src/GameFinder.StoreHandlers.GOG/GOGHandler.cs

@@ -120,11 +120,21 @@ private OneOf<GOGGame, ErrorMessage> ParseSubKey(IRegistryKey gogKey, string sub
                 return new ErrorMessage($"The value \"buildId\" of {subKey.GetName()} is not a number: \"{sBuildId}\"");
             }
 
+            Nullable<GOGGameId> parentGameId = null;
+            if (subKey.TryGetString("dependsOn", out var dependsOn))
+            {
+                if (long.TryParse(dependsOn, NumberStyles.Integer, CultureInfo.InvariantCulture, out var rawParentGameId))
+                {
+                    parentGameId = GOGGameId.From(rawParentGameId);
+                }
+            }
+
             var game = new GOGGame(
                 GOGGameId.From(idResult.AsT0),
                 name,
                 _fileSystem.FromUnsanitizedFullPath(path),
-                buildId
+                buildId,
+                parentGameId
             );
 
             return game;

tests/GameFinder.StoreHandlers.GOG.Tests/ArrangeHelpers.cs

@@ -18,7 +18,7 @@ public static IEnumerable<GOGGame> SetupGames(IFileSystem fileSystem, InMemoryRe
         var fixture = new Fixture();
 
         fixture.Customize<GOGGame>(composer => composer
-            .FromFactory<long, string, ulong>((id, name, buildId) =>
+            .FromFactory<long, string, ulong, long>((id, name, buildId, parentId) =>
             {
                 var path = fileSystem
                     .GetKnownPath(KnownPath.TempDirectory)
@@ -29,8 +29,9 @@ public static IEnumerable<GOGGame> SetupGames(IFileSystem fileSystem, InMemoryRe
                 gameKey.AddValue("gameName", name);
                 gameKey.AddValue("path", path.GetFullPath());
                 gameKey.AddValue("buildId", $"{buildId}");
+                gameKey.AddValue("dependsOn", parentId.ToString(CultureInfo.InvariantCulture));
 
-                return new GOGGame(GOGGameId.From(id), name, path, buildId);
+                return new GOGGame(GOGGameId.From(id), name, path, buildId, GOGGameId.From(parentId));
             })
             .OmitAutoProperties());