Fix #118

src/GameFinder.StoreHandlers.Steam/Models/AppManifest.cs

@@ -28,8 +28,7 @@ public sealed record AppManifest
     /// that was parsed to produce this <see cref="AppManifest"/>.
     /// </summary>
     /// <example><c>E:/SteamLibrary/steamapps/appmanifest_262060.acf</c></example>
-    /// <seealso cref="InstallationDirectoryName"/>
-    /// <seealso cref="GetInstallationDirectoryPath"/>
+    /// <seealso cref="InstallationDirectory"/>
     public required AbsolutePath ManifestPath { get; init; }
 
     #region Parsed Values
@@ -55,15 +54,9 @@ public sealed record AppManifest
     public required StateFlags StateFlags { get; init; }
 
     /// <summary>
-    /// Gets the name of the installation directory of the app.
+    /// Gets the <see cref="AbsolutePath"/> to the installation directory of the app.
     /// </summary>
-    /// <remarks>
-    /// This is the relative path to the installation directory.
-    /// Use <see cref="GetInstallationDirectoryPath"/> get the absolute path.
-    /// </remarks>
-    /// <example><c>DarkestDungeon</c></example>
-    /// <seealso cref="GetInstallationDirectoryPath"/>
-    public required RelativePath InstallationDirectoryName { get; init; }
+    public required AbsolutePath InstallationDirectory { get; init; }
 
     /// <summary>
     /// Gets the time when the app was last updated.
@@ -78,7 +71,7 @@ public sealed record AppManifest
     /// </summary>
     /// <remarks>
     /// This value is only set when installing or updating the app. If the
-    /// user adds or removes files from the <see cref="InstallationDirectoryName"/>, Steam
+    /// user adds or removes files from the <see cref="InstallationDirectory"/>, Steam
     /// won't update this value automatically. This value will be <see cref="Size.Zero"/>
     /// while the app is being staged.
     /// </remarks>
@@ -244,16 +237,6 @@ public Result<AppManifest> Reload()
         return AppManifestParser.ParseManifestFile(ManifestPath);
     }
 
-    /// <summary>
-    /// Gets the <see cref="AbsolutePath"/> to the installation directory of the app.
-    /// </summary>
-    /// <remarks>This uses <see cref="ManifestPath"/> to get to the installation directory.</remarks>
-    /// <example><c>E:/SteamLibrary/steamapps/common/DarkestDungeon</c></example>
-    /// <seealso cref="InstallationDirectoryName"/>
-    public AbsolutePath GetInstallationDirectoryPath() => ManifestPath.Parent
-        .Combine(CommonDirectoryName)
-        .Combine(InstallationDirectoryName);
-
     /// <summary>
     /// Gets the path to the <c>appworkshop_*.acf</c> file.
     /// </summary>
@@ -326,7 +309,7 @@ public bool Equals(AppManifest? other)
         if (Universe != other.Universe) return false;
         if (!string.Equals(Name, other.Name, StringComparison.Ordinal)) return false;
         if (StateFlags != other.StateFlags) return false;
-        if (InstallationDirectoryName != other.InstallationDirectoryName) return false;
+        if (InstallationDirectory != other.InstallationDirectory) return false;
         if (LastUpdated != other.LastUpdated) return false;
         if (SizeOnDisk != other.SizeOnDisk) return false;
         if (StagingSize != other.StagingSize) return false;
@@ -359,7 +342,7 @@ public override int GetHashCode()
         hashCode.Add((int)Universe);
         hashCode.Add(Name);
         hashCode.Add((int)StateFlags);
-        hashCode.Add(InstallationDirectoryName);
+        hashCode.Add(InstallationDirectory);
         hashCode.Add(LastUpdated);
         hashCode.Add(SizeOnDisk);
         hashCode.Add(StagingSize);
@@ -389,9 +372,9 @@ public override string ToString()
         var sb = new StringBuilder();
 
         sb.Append("{ ");
-        sb.Append($"AppId = {AppId}, ");
-        sb.Append($"Name = {Name}, ");
-        sb.Append($"InstallationDirectoryName = {InstallationDirectoryName}");
+        sb.Append($"{nameof(AppId)} = {AppId}, ");
+        sb.Append($"{nameof(Name)} = {Name}, ");
+        sb.Append($"{nameof(InstallationDirectory)} = {InstallationDirectory}");
         sb.Append(" }");
 
         return sb.ToString();

src/GameFinder.StoreHandlers.Steam/Services/Parsers/AppManifestParser.cs

@@ -8,6 +8,7 @@
 using GameFinder.StoreHandlers.Steam.Models.ValueTypes;
 using JetBrains.Annotations;
 using NexusMods.Paths;
+using NexusMods.Paths.Utilities;
 using ValveKeyValue;
 using static GameFinder.StoreHandlers.Steam.Services.ParserHelpers;
 
@@ -71,7 +72,7 @@ public static Result<AppManifest> ParseManifestFile(AbsolutePath manifestPath)
             var universeResult = ParseOptionalChildObject(appState, "Universe", ParseUInt32, default).Map(x => (SteamUniverse)x);
             var nameResult = ParseRequiredChildObject(appState, "name", ParseString);
             var stateFlagsResult = ParseRequiredChildObject(appState, "StateFlags", ParseUInt32).Map(x => (StateFlags)x);
-            var installationDirectoryNameResult = ParseRequiredChildObject(appState, "installdir", x => ParseRelativePath(x, manifestPath.FileSystem));
+            var installationDirectoryNameResult = ParseInstallationDirectory(appState, manifestPath.FileSystem, manifestPath);
             var lastUpdatedResult = ParseOptionalChildObject(appState, "LastUpdated", ParseDateTimeOffset, DateTimeOffset.UnixEpoch);
             var sizeOnDiskResult = ParseOptionalChildObject(appState, "SizeOnDisk", ParseSize, Size.Zero);
             var stagingSizeResult = ParseOptionalChildObject(appState, "StagingSize", ParseSize, Size.Zero);
@@ -153,7 +154,7 @@ public static Result<AppManifest> ParseManifestFile(AbsolutePath manifestPath)
                     Universe = universeResult.Value,
                     Name = nameResult.Value,
                     StateFlags = stateFlagsResult.Value,
-                    InstallationDirectoryName = installationDirectoryNameResult.Value,
+                    InstallationDirectory = installationDirectoryNameResult.Value,
 
                     LastUpdated = lastUpdatedResult.Value,
                     SizeOnDisk = sizeOnDiskResult.Value,
@@ -188,6 +189,28 @@ public static Result<AppManifest> ParseManifestFile(AbsolutePath manifestPath)
         }
     }
 
+    private static Result<AbsolutePath> ParseInstallationDirectory(KVObject appState, IFileSystem fileSystem, AbsolutePath manifestPath)
+    {
+        var installDirectoryResult = FindRequiredChildObject(appState, "installdir");
+        if (installDirectoryResult.IsFailed) return installDirectoryResult.ToResult();
+
+        var parseResult = ParseChildObjectValue(installDirectoryResult.Value, appState, ParseString);
+        if (parseResult.IsFailed) return parseResult.ToResult();
+
+        var rawPath = parseResult.Value;
+        var sanitizedPath = PathHelpers.Sanitize(rawPath, fileSystem.OS);
+        var isRelative = PathHelpers.GetRootLength(sanitizedPath, fileSystem.OS) == -1;
+
+        if (isRelative)
+        {
+            var relativePath = new RelativePath(sanitizedPath);
+            return Result.Ok(manifestPath.Parent.Combine("common").Combine(relativePath));
+        }
+
+        var absolutePath = fileSystem.FromUnsanitizedFullPath(rawPath);
+        return absolutePath;
+    }
+
     private static Result<IReadOnlyDictionary<DepotId, InstalledDepot>> ParseInstalledDepots(KVObject appState)
     {
         var installedDepotsObject = FindOptionalChildObject(appState, "InstalledDepots");

src/GameFinder.StoreHandlers.Steam/Services/Writers/AppManifestWriter.cs

@@ -27,7 +27,7 @@ public static Result Write(AppManifest manifest, AbsolutePath outputPath)
         values.AddValue("Universe", (byte)manifest.Universe, -1);
         values.AddValue("name", manifest.Name, string.Empty);
         values.AddValue("StateFlags", (byte)manifest.StateFlags, -1);
-        values.AddValue("installdir", manifest.InstallationDirectoryName.ToString(), string.Empty);
+        values.AddValue("installdir", manifest.InstallationDirectory.Name.ToString(), string.Empty);
         values.AddValue("LastUpdated", manifest.LastUpdated.ToUnixTimeSeconds(), default);
         values.AddValue("SizeOnDisk", manifest.SizeOnDisk.Value, default);
         values.AddValue("StagingSize", manifest.StagingSize.Value, default);

src/GameFinder.StoreHandlers.Steam/SteamGame.cs

@@ -40,7 +40,7 @@ public sealed record SteamGame : IGame
     /// <summary>
     /// Gets the absolute path to the game's installation directory.
     /// </summary>
-    public AbsolutePath Path => AppManifest.GetInstallationDirectoryPath();
+    public AbsolutePath Path => AppManifest.InstallationDirectory;
 
     /// <summary>
     /// Gets the absolute path to the cloud saves directory.

tests/GameFinder.StoreHandlers.Steam.Tests/ArrangeHelper.cs

@@ -67,7 +67,7 @@ public static AppManifest CreateAppManifest(AbsolutePath manifestPath)
             Universe = SteamUniverse.Public,
             Name = fixture.Create<string>(),
             StateFlags = StateFlags.FullyInstalled,
-            InstallationDirectoryName = fixture.Create<string>().ToRelativePath(),
+            InstallationDirectory = manifestPath.Parent.Combine("common").Combine(fixture.Create<string>()),
             LastUpdated = fixture.Create<DateTimeOffset>(),
             SizeOnDisk = fixture.Create<Size>(),
             StagingSize = fixture.Create<Size>(),

tests/GameFinder.StoreHandlers.Steam.Tests/Services/AppManifestParserTests.cs

@@ -18,7 +18,7 @@ public void Test_Success_OnlyRequired(AbsolutePath manifestFilePath)
             AppId = AppId.From(262060),
             Name = "Darkest Dungeon",
             StateFlags = StateFlags.FullyInstalled,
-            InstallationDirectoryName = "DarkestDungeon",
+            InstallationDirectory = manifestFilePath.Parent.Combine("common").Combine("DarkestDungeon"),
         };
 
         var writeResult = AppManifestWriter.Write(expected, manifestFilePath);