Update GameFinder to 2.0.0

Wabbajack.Downloaders.GameFile/GameLocator.cs

@@ -1,3 +1,5 @@
+using System.Runtime.InteropServices;
+using GameFinder.RegistryUtils;
 using GameFinder.StoreHandlers.EGS;
 using GameFinder.StoreHandlers.GOG;
 using GameFinder.StoreHandlers.Origin;
@@ -5,37 +7,102 @@ using GameFinder.StoreHandlers.Steam;
 using Microsoft.Extensions.Logging;
 using Wabbajack.DTOs;
 using Wabbajack.Paths;
+using Wabbajack.Paths.IO;
 
 namespace Wabbajack.Downloaders.GameFile;
 
 public class GameLocator : IGameLocator
 {
-    private readonly EGSHandler? _egs;
+    private readonly SteamHandler _steam;
     private readonly GOGHandler? _gog;
+    private readonly EGSHandler? _egs;
+    private readonly OriginHandler? _origin;
+
+    private readonly Dictionary<int, AbsolutePath> _steamGames = new();
+    private readonly Dictionary<long, AbsolutePath> _gogGames = new();
+    private readonly Dictionary<string, AbsolutePath> _egsGames = new();
+    private readonly Dictionary<string, AbsolutePath> _originGames = new();
+
     private readonly Dictionary<Game, AbsolutePath> _locationCache;
     private readonly ILogger<GameLocator> _logger;
-    private readonly OriginHandler? _origin;
-    private readonly SteamHandler _steam;
 
     public GameLocator(ILogger<GameLocator> logger)
     {
         _logger = logger;
-        _steam = new SteamHandler(logger);
 
-        if (OperatingSystem.IsWindows())
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            _origin = new OriginHandler(true, false, logger);
+            var windowsRegistry = new WindowsRegistry();
-            _gog = new GOGHandler(logger);
             
-            _egs = new EGSHandler(logger);
+            _steam = new SteamHandler(windowsRegistry);
+            _gog = new GOGHandler(windowsRegistry);
+            _egs = new EGSHandler(windowsRegistry);
+            _origin = new OriginHandler();
+        }
+        else
+        {
+            _steam = new SteamHandler(null);
         }
         
         _locationCache = new Dictionary<Game, AbsolutePath>();
         
-        _steam.FindAllGames();
+        FindAllGames();
-        _origin?.FindAllGames();
+    }
-        _gog?.FindAllGames();
+
-        _egs?.FindAllGames();
+    private void FindAllGames()
+    {
+        FindStoreGames(_steam.FindAllGames(), _steamGames,
+            steamGame => steamGame.Path,
+            steamGame => steamGame.AppId);
+
+        if (_gog is not null)
+        {
+            FindStoreGames(_gog.FindAllGames(), _gogGames,
+                gogGame => gogGame.Path,
+                gogGame => gogGame.Id);
+        }
+
+        if (_egs is not null)
+        {
+            FindStoreGames(_egs.FindAllGames(), _egsGames,
+                egsGame => egsGame.InstallLocation,
+                egsGame => egsGame.CatalogItemId);
+        }
+
+        if (_origin is not null)
+        {
+            FindStoreGames(_origin.FindAllGames(), _originGames,
+                originGame => originGame.InstallPath,
+                originGame => originGame.Id);
+        }
+    }
+
+    private void FindStoreGames<TGame, TId>(
+        IEnumerable<(TGame? game, string? error)> games,
+        IDictionary<TId, AbsolutePath> paths,
+        Func<TGame, string> getPath,
+        Func<TGame, TId> getId)
+        where TGame : class
+    {
+        foreach (var (game, error) in games)
+        {
+            if (game is not null)
+            {
+                var path = getPath(game).ToAbsolutePath();
+                if (path.DirectoryExists())
+                {
+                    paths[getId(game)] = path;
+                }
+                else
+                {
+                    _logger.LogError("Game {} does not exist at {}", game, path);
+                }
+            }
+            else
+            {
+                _logger.LogError("{}", error);
+            }
+        }
     }
 
     public AbsolutePath GameLocation(Game game)
@@ -70,40 +137,34 @@ public class GameLocator : IGameLocator
     private bool TryFindLocationInner(Game game, out AbsolutePath path)
     {
         var metaData = game.MetaData();
-        foreach (var steamGame in _steam.Games.Where(steamGame => metaData.SteamIDs.Contains(steamGame.ID)))
+
+        int? steamId = metaData.SteamIDs.FirstOrDefault(id => _steamGames.ContainsKey(id));
+        if (steamId.HasValue)
         {
-            path = steamGame!.Path.ToAbsolutePath();
+            path = _steamGames[steamId.Value];
             return true;
         }
 
-        if (_gog != null)
+        int? gogId = metaData.GOGIDs.FirstOrDefault(id => _gogGames.ContainsKey(id));
+        if (gogId.HasValue)
         {
-            foreach (var gogGame in _gog.Games.Where(gogGame => metaData.GOGIDs.Contains(gogGame.GameID)))
+            path = _gogGames[gogId.Value];
-            {
-                path = gogGame!.Path.ToAbsolutePath();
             return true;
         }
-        }
         
-        if (_egs != null)
+        var egsId = metaData.EpicGameStoreIDs.FirstOrDefault(id => _egsGames.ContainsKey(id));
+        if (egsId is not null)
         {
-            foreach (var egsGame in _egs.Games.Where(egsGame =>
+            path = _egsGames[egsId];
-                metaData.EpicGameStoreIDs.Contains(egsGame.CatalogItemId)))
-            {
-                path = egsGame!.Path.ToAbsolutePath();
             return true;
         }
-        }
         
-        if (_origin != null)
+        var originId = metaData.OriginIDs.FirstOrDefault(id => _originGames.ContainsKey(id));
+        if (originId is not null)
         {
-            foreach (var originGame in _origin.Games.Where(originGame =>
+            path = _originGames[originId];
-                metaData.EpicGameStoreIDs.Contains(originGame.Id)))
-            {
-                path = originGame.Path.ToAbsolutePath();
             return true;
         }
-        }
 
         path = default;
         return false;

Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj

@@ -18,10 +18,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="GameFinder.StoreHandlers.EGS" Version="1.8.0" />
+        <PackageReference Include="GameFinder.StoreHandlers.EGS" Version="2.0.0" />
-        <PackageReference Include="GameFinder.StoreHandlers.GOG" Version="1.8.0" />
+        <PackageReference Include="GameFinder.StoreHandlers.GOG" Version="2.0.0" />
-        <PackageReference Include="GameFinder.StoreHandlers.Origin" Version="1.8.0" />
+        <PackageReference Include="GameFinder.StoreHandlers.Origin" Version="2.0.0" />
-        <PackageReference Include="GameFinder.StoreHandlers.Steam" Version="1.8.0" />
+        <PackageReference Include="GameFinder.StoreHandlers.Steam" Version="2.0.0" />
     </ItemGroup>
 
 </Project>

Wabbajack.Installer/Wabbajack.Installer.csproj

@@ -23,11 +23,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="GameFinder.StoreHandlers.BethNet" Version="1.8.0" />
-        <PackageReference Include="GameFinder.StoreHandlers.EGS" Version="1.8.0" />
-        <PackageReference Include="GameFinder.StoreHandlers.GOG" Version="1.8.0" />
-        <PackageReference Include="GameFinder.StoreHandlers.Origin" Version="1.8.0" />
-        <PackageReference Include="GameFinder.StoreHandlers.Steam" Version="1.8.0" />
         <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
         <PackageReference Include="Octodiff" Version="1.3.23" />
     </ItemGroup>