Upgrade paths library to 0.18.0

Author: erri120

Directory.Packages.props

@@ -4,8 +4,8 @@
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="FluentResults" Version="3.15.2" />
     <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageVersion Include="NexusMods.Paths" Version="0.10.0" />
-    <PackageVersion Include="NexusMods.Paths.TestingHelpers" Version="0.10.0" />
+    <PackageVersion Include="NexusMods.Paths" Version="0.18.0" />
+    <PackageVersion Include="NexusMods.Paths.TestingHelpers" Version="0.18.0" />
     <PackageVersion Include="NLog" Version="5.2.8" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="OneOf" Version="3.0.271" />

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

@@ -220,10 +220,10 @@ public sealed record AppManifest
 
     #region Helpers
 
-    private static readonly RelativePath CommonDirectoryName = "common".ToRelativePath();
-    private static readonly RelativePath ShaderCacheDirectoryName = "shadercache".ToRelativePath();
-    private static readonly RelativePath WorkshopDirectoryName = "workshop".ToRelativePath();
-    private static readonly RelativePath CompatabilityDataDirectoryName = "compatdata".ToRelativePath();
+    private static readonly RelativePath CommonDirectoryName = "common";
+    private static readonly RelativePath ShaderCacheDirectoryName = "shadercache";
+    private static readonly RelativePath WorkshopDirectoryName = "workshop";
+    private static readonly RelativePath CompatabilityDataDirectoryName = "compatdata";
 
     /// <summary>
     /// Parses the file at <see cref="ManifestPath"/> again and returns a new

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

@@ -57,7 +57,7 @@ public sealed record LibraryFolder
     /// </summary>
     public Size GetFreeSpaceEstimate() => TotalDiskSize - GetTotalSizeOfInstalledApps();
 
-    public static readonly RelativePath SteamAppsDirectoryName = "steamapps".ToRelativePath();
+    public static readonly RelativePath SteamAppsDirectoryName = "steamapps";
 
     /// <summary>
     /// Returns an enumerable for every <c>appmanifest_*.acf</c> file path in the current library.

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

@@ -102,7 +102,7 @@ public static Result<AppManifest> ParseManifestFile(AbsolutePath manifestPath)
                 appState,
                 "InstallScripts",
                 key => DepotId.From(uint.Parse(key)),
-                x => ParseRelativePath(x, manifestPath.FileSystem));
+                x => ParseRelativePath(x));
 
             var sharedDepotsResult = ParseBasicDictionary(
                 appState,
@@ -206,16 +206,16 @@ private static Result<AbsolutePath> ParseInstallationDirectory(KVObject appState
         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;
+        var sanitizedPath = PathHelpers.Sanitize(rawPath);
+        var isRelative = !PathHelpers.IsRooted(sanitizedPath);
 
         if (isRelative)
         {
-            var relativePath = new RelativePath(sanitizedPath);
+            var relativePath = RelativePath.CreateUnsafe(sanitizedPath);
             return Result.Ok(manifestPath.Parent.Combine("common").Combine(relativePath));
         }
 
-        var absolutePath = fileSystem.FromUnsanitizedFullPath(rawPath);
+        var absolutePath = fileSystem.FromUnsanitizedFullPath(sanitizedPath);
         return absolutePath;
     }
 

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

@@ -179,7 +179,7 @@ internal static bool ParseBool(KVValue value)
     internal static Size ParseSize(KVValue value) => Size.From(ParseUInt64(value));
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static RelativePath ParseRelativePath(KVValue value, IFileSystem fileSystem) => new(PathHelpers.Sanitize(ParseString(value), fileSystem.OS));
+    internal static RelativePath ParseRelativePath(KVValue value) => ParseString(value);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     internal static AbsolutePath ParseAbsolutePath(KVValue value, IFileSystem fileSystem) => fileSystem.FromUnsanitizedFullPath(ParseString(value));

src/GameFinder.StoreHandlers.Steam/Services/SteamLocationFinder.cs

@@ -22,19 +22,19 @@ public static class SteamLocationFinder
     /// The name of the <c>config</c> directory.
     /// </summary>
     /// <seealso cref="GetLibraryFoldersFilePath"/>
-    public static readonly RelativePath ConfigDirectoryName = "config".ToRelativePath();
+    public static readonly RelativePath ConfigDirectoryName = "config";
 
     /// <summary>
     /// The name of the <c>libraryfolders.vdf</c> file.
     /// </summary>
     /// <seealso cref="GetLibraryFoldersFilePath"/>
-    public static readonly RelativePath LibraryFoldersFileName = "libraryfolders.vdf".ToRelativePath();
+    public static readonly RelativePath LibraryFoldersFileName = "libraryfolders.vdf";
 
     /// <summary>
     /// The name of the <c>userdata</c> directory.
     /// </summary>
     /// <seealso cref="GetUserDataDirectoryPath"/>
-    public static readonly RelativePath UserDataDirectoryName = "userdata".ToRelativePath();
+    public static readonly RelativePath UserDataDirectoryName = "userdata";
 
     /// <summary>
     /// The registry key used to find Steam.

src/GameFinder.StoreHandlers.Xbox/XboxHandler.cs

@@ -111,7 +111,9 @@ internal static (List<AbsolutePath> paths, List<ErrorMessage> errors) GetAppFold
         var paths = new List<AbsolutePath>();
         var errors = new List<ErrorMessage>();
 
-        foreach (var rootDirectory in fileSystem.EnumerateRootDirectories())
+        var rootDirectories = fileSystem.EnumerateRootDirectories().ToArray();
+
+        foreach (var rootDirectory in rootDirectories)
         {
             if (!fileSystem.DirectoryExists(rootDirectory)) continue;
 

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

@@ -94,7 +94,7 @@ public static AppManifest CreateAppManifest(AbsolutePath manifestPath)
                 .ToDictionary(depot => depot.DepotId, depot => depot),
             InstallScripts = fixture
                 .CreateMany<DepotId>()
-                .Select(depotId => (depotId, fixture.Create<string>().ToRelativePath()))
+                .Select(depotId => (depotId, RelativePath.FromUnsanitizedInput(fixture.Create<string>())))
                 .ToDictionary(kv => kv.Item1, kv => kv.Item2),
             SharedDepots = fixture
                 .CreateMany<DepotId>()