Merge pull request #161 from halgari/master

More information for Epic Games

Author: erri120

src/GameFinder.StoreHandlers.EGS/EGSGame.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using GameFinder.Common;
 using JetBrains.Annotations;
 using NexusMods.Paths;
@@ -11,4 +12,4 @@ namespace GameFinder.StoreHandlers.EGS;
 /// <param name="DisplayName"></param>
 /// <param name="InstallLocation"></param>
 [PublicAPI]
-public record EGSGame(EGSGameId CatalogItemId, string DisplayName, AbsolutePath InstallLocation) : IGame;
+public record EGSGame(EGSGameId CatalogItemId, string DisplayName, AbsolutePath InstallLocation, IReadOnlyList<string> ManifestHash) : IGame;

src/GameFinder.StoreHandlers.EGS/EGSHandler.cs

@@ -11,7 +11,7 @@
 namespace GameFinder.StoreHandlers.EGS;
 
 [UsedImplicitly]
-internal record ManifestFile(string CatalogItemId, string DisplayName, string InstallLocation);
+internal record ManifestFile(string CatalogItemId, string DisplayName, string InstallLocation, string ManifestHash, string MainGameCatalogItemId);
 
 /// <summary>
 /// Handler for finding games installed with the Epic Games Store.
@@ -73,13 +73,38 @@ public override IEnumerable<OneOf<EGSGame, ErrorMessage>> FindAllGames()
             yield break;
         }
 
-        foreach (var itemFile in itemFiles)
+        // Parse all the files
+        var allItems = itemFiles.Select(DeserializeItem).ToList();
+
+        // Group by the MainGameCatalogItemId, and collect all the manifest hashes
+        // for each game. If a game has multiple DLCs, all the DLCs will reference the
+        // same MainGameCatalogItemId.
+        var itemsGrouped = allItems
+            .Where(f => f.Match(f0: static _ => true, f1: static _ => false))
+            .Select(f => f.AsT0)
+            .GroupBy(c => c.MainGameCatalogItemId, StringComparer.OrdinalIgnoreCase)
+            .Select(group =>
+            {
+                return new EGSGame(
+                    EGSGameId.From(group.Key),
+                    group.First().DisplayName,
+                    _fileSystem.FromUnsanitizedFullPath(group.First().InstallLocation),
+                    group.Select(g => g.ManifestHash).ToArray());
+            });
+
+        foreach (var game in itemsGrouped)
         {
-            yield return DeserializeGame(itemFile);
+            yield return game;
+        }
+
+        foreach (var errorMessage in allItems
+                     .Where(f => f.Match(f0: static _ => false, f1: static _ => true)))
+        {
+            yield return errorMessage.AsT1;
         }
     }
 
-    private OneOf<EGSGame, ErrorMessage> DeserializeGame(AbsolutePath itemFile)
+    private OneOf<ManifestFile, ErrorMessage> DeserializeItem(AbsolutePath itemFile)
     {
         using var stream = _fileSystem.ReadFile(itemFile);
 
@@ -109,13 +134,7 @@ private OneOf<EGSGame, ErrorMessage> DeserializeGame(AbsolutePath itemFile)
                 return new ErrorMessage($"Manifest {itemFile.GetFullPath()} does not have a value \"InstallLocation\"");
             }
 
-            var game = new EGSGame(
-                EGSGameId.From(manifest.CatalogItemId),
-                manifest.DisplayName,
-                _fileSystem.FromUnsanitizedFullPath(manifest.InstallLocation)
-            );
-
-            return game;
+            return manifest;
         }
         catch (Exception e)
         {

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

@@ -38,13 +38,15 @@ private static IEnumerable<EGSGame> SetupGames(InMemoryFileSystem fs, AbsolutePa
                     var mockData = $@"{{
     ""CatalogItemId"": ""{catalogItemId}"",
     ""DisplayName"": ""{displayName}"",
-    ""InstallLocation"": ""{installLocation.GetFullPath().ToEscapedString()}""
+    ""InstallLocation"": ""{installLocation.GetFullPath().ToEscapedString()}"",
+    ""MainGameCatalogItemId"": ""{catalogItemId}"",
+    ""ManifestHash"": ""{catalogItemId}_manifest""
 }}";
 
                     fs.AddDirectory(installLocation);
                     fs.AddFile(manifestItem, mockData);
 
-                    return new EGSGame(EGSGameId.From(catalogItemId), displayName, installLocation);
+                    return new EGSGame(EGSGameId.From(catalogItemId), displayName, installLocation, new [] { catalogItemId + "_manifest" });
                 })
                 .OmitAutoProperties());
 

tests/TestUtils/AssertionHelpers.cs

@@ -48,7 +48,7 @@ public static void ShouldFindAllGames<TGame, TId>(
         var results = handler.FindAllGames().ToArray();
         var games = results.ShouldOnlyBeGames();
 
-        games.Should().Equal(expectedGames);
+        games.Should().BeEquivalentTo(expectedGames);
     }
 
     public static void ShouldFindAllGamesById<TGame, TId>(
@@ -62,7 +62,7 @@ public static void ShouldFindAllGamesById<TGame, TId>(
         errors.Should().BeEmpty();
 
         results.Should().ContainKeys(expectedGames.Select(keySelector));
-        results.Should().ContainValues(expectedGames);
+        results.Values.Should().BeEquivalentTo(expectedGames);
     }
 
     public static void ShouldFindAllInterfacesGames<TGame, TId>(
@@ -74,6 +74,6 @@ public static void ShouldFindAllInterfacesGames<TGame, TId>(
         var results = handler.FindAllInterfaceGames().ToArray();
         var games = results.ShouldOnlyBeGames();
 
-        games.Should().AllBeOfType<TGame>().Which.Should().Equal(expectedGames);
+        games.Should().AllBeOfType<TGame>().Which.Should().BeEquivalentTo(expectedGames);
     }
 }