Merge pull request #122 from halgari/osx-support

Adds support for OSX version of Steam
erri120 · Jan 28, 2024 · 5115d55 · 5115d55
2 parents b651100 + fe652c1
commit 5115d55
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
     env:
       OS: ${{ matrix.os }}
 
@@ -57,6 +57,10 @@ jobs:
       if: runner.os == 'Windows'
       run: dotnet publish other/GameFinder.Example/GameFinder.Example.csproj -o ${{ github.workspace }}/bin/${{ runner.os }} -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=false
 
+    - name: Publish (macOS)
+      if: runner.os == 'macOS'
+      run: dotnet publish other/GameFinder.Example/GameFinder.Example.csproj -o ${{ github.workspace }}/bin/${{ runner.os }} -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=false
+
     - name: Upload Artifact
       uses: actions/upload-artifact@v3
       with:

diff --git a/other/GameFinder.Example/Program.cs b/other/GameFinder.Example/Program.cs
@@ -133,6 +133,12 @@ private static void Run(Options options, ILogger logger)
                 if (options.Xbox) RunXboxHandler(wineFileSystem);
             }
         }
+
+        if (OperatingSystem.IsMacOS())
+        {
+            if (options.Steam)
+                RunSteamHandler(realFileSystem, null);
+        }
     }
 
     private static void RunGOGHandler(IRegistry registry, IFileSystem fileSystem)

diff --git a/src/GameFinder.StoreHandlers.Steam/Services/SteamLocationFinder.cs b/src/GameFinder.StoreHandlers.Steam/Services/SteamLocationFinder.cs
@@ -214,6 +214,15 @@ public static IEnumerable<AbsolutePath> GetDefaultSteamInstallationPaths(IFileSy
             yield break;
         }
 
+        if (fileSystem.OS.IsOSX)
+        {
+            // ~/Library/Application Support/Steam
+            yield return fileSystem.GetKnownPath(KnownPath.LocalApplicationDataDirectory)
+                .Combine("Steam");
+
+            yield break;
+        }
+
         throw new PlatformNotSupportedException("GameFinder doesn't support the current platform!");
     }
 }
diff --git a/tests/GameFinder.StoreHandlers.Steam.Tests/Services/SteamLocationFinderTests.cs b/tests/GameFinder.StoreHandlers.Steam.Tests/Services/SteamLocationFinderTests.cs
@@ -151,13 +151,20 @@ public void Test_GetDefaultSteamInstallationPaths_Windows()
     }
 
     [Fact]
-    public void Test_GetDefaultSteamInstallationPaths_Unsupported()
+    public void Test_GetDefaultSteamInstallationPaths_OSX()
     {
         var fs = new InMemoryFileSystem(new OSInformation(OSPlatform.OSX));
 
-        var act = () => SteamLocationFinder.GetDefaultSteamInstallationPaths(fs).ToArray();
-        act
-            .Should().ThrowExactly<PlatformNotSupportedException>()
-            .WithMessage("GameFinder doesn't support the current platform!");
+        var overlayFileSystem = fs.CreateOverlayFileSystem(
+            new Dictionary<AbsolutePath, AbsolutePath>(),
+            new Dictionary<KnownPath, AbsolutePath>
+            {
+                { KnownPath.ProgramFilesX86Directory, fs.GetKnownPath(KnownPath.TempDirectory) },
+            });
+
+        SteamLocationFinder
+            .GetDefaultSteamInstallationPaths(overlayFileSystem)
+            .ToArray()
+            .Should().HaveCount(1);
     }
 }