Linux aware "Project Drive"

jetelain · Aug 23, 2023 · 7d5b65a · 7d5b65a
1 parent 3bf6c49
commit 7d5b65a
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/GameRealisticMap.Arma3.CommandLine/GameRealisticMap.Arma3.CommandLine.csproj b/GameRealisticMap.Arma3.CommandLine/GameRealisticMap.Arma3.CommandLine.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <AssemblyName>grma3</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/GameRealisticMap.Arma3.Test/IO/ProjectDriveTest.cs b/GameRealisticMap.Arma3.Test/IO/ProjectDriveTest.cs
@@ -0,0 +1,30 @@
+using GameRealisticMap.Arma3.IO;
+
+namespace GameRealisticMap.Arma3.Test.IO
+{
+    public class ProjectDriveTest
+    {
+        [Fact]
+        public void GetFullPath()
+        {
+            if (OperatingSystem.IsWindows())
+            {
+                var drive = new ProjectDrive("c:\\temp\\pdrive");
+                drive.AddMountPoint("m", "c:\\temp\\mount");
+                Assert.Equal("c:\\temp\\pdrive\\a\\b\\c", drive.GetFullPath("a\\b\\c"));
+                Assert.Equal("c:\\temp\\pdrive\\a", drive.GetFullPath("a"));
+                Assert.Equal("c:\\temp\\mount\\b\\c", drive.GetFullPath("m\\b\\c"));
+                Assert.Equal("c:\\temp\\mount\\b", drive.GetFullPath("m\\b"));
+            }
+            else
+            {
+                var drive = new ProjectDrive("/tmp/pdrive");
+                drive.AddMountPoint("m", "/tmp/mount");
+                Assert.Equal("/tmp/pdrive/a/b/c", drive.GetFullPath("a\\b\\c"));
+                Assert.Equal("/tmp/pdrive/a", drive.GetFullPath("a"));
+                Assert.Equal("/tmp/mount/b/c", drive.GetFullPath("m\\b\\c"));
+                Assert.Equal("/tmp/mount/b", drive.GetFullPath("m\\b"));
+            }
+        }
+    }
+}
diff --git a/GameRealisticMap.Arma3/IO/ProjectDrive.cs b/GameRealisticMap.Arma3/IO/ProjectDrive.cs
@@ -30,15 +30,28 @@ public string GetFullPath(string path)
             {
                 if (path.StartsWith(item.Key, StringComparison.OrdinalIgnoreCase))
                 {
-                    return Path.Combine(item.Value, path.Substring(item.Key.Length));
+                    return Path.Combine(item.Value, ToRelativePhysicalPath(path.Substring(item.Key.Length)));
                 }
             }
             // Should call Arma3ToolsHelper.EnsureProjectDrive() if mountPath == "P:" on first call
-            return Path.Combine(mountPath, path);
+            return Path.Combine(mountPath, ToRelativePhysicalPath(path));
+        }
+
+        private string ToRelativePhysicalPath(string gamePath)
+        {
+            if (OperatingSystem.IsWindows())
+            {
+                return gamePath;
+            }
+            return gamePath.Replace("\\", "/");
         }
 
         public bool EnsureLocalFileCopy(string path)
         {
+            if (!OperatingSystem.IsWindows())
+            {
+                return true; // Unsupported on Linux
+            }
             var fullPath = GetFullPath(path);
             if (File.Exists(fullPath))
             {