Fix file extraction logic - now the whole file is extracted, not just…

… a placeholder file
tommaier123 · Oct 22, 2022 · 28d99b5 · 28d99b5
1 parent b6f19d1
commit 28d99b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/NoodleManagerX/Models/StorageAbstraction.cs b/NoodleManagerX/Models/StorageAbstraction.cs
@@ -96,6 +96,11 @@ public static bool FileExists(string path)
             }
         }
 
+        public static string GetFullComputerPath(string pathRelativeToSynthDir)
+        {
+            return Path.Combine(MainViewModel.s_instance.settings.synthDirectory, pathRelativeToSynthDir);
+        }
+
         public static void DeleteFile(string path)
         {
             if (MtpDevice.connected)

diff --git a/NoodleManagerX/Mods/ModItem.cs b/NoodleManagerX/Mods/ModItem.cs
@@ -202,7 +202,9 @@ private async Task<bool> ExtractModFilesToSynthDir(string synthmodPath)
                                 if (StorageAbstraction.FileExists(entry.FullName))
                                 {
                                     MainViewModel.Log($"WARNING: Overwriting {entry.FullName}");
-                                    await StorageAbstraction.WriteFile(await CopyStreamToMemoryStream(stream, false), entry.FullName);
+                                    // TODO use a more generic function once modding is supported on Oculus
+                                    var fullPath = StorageAbstraction.GetFullComputerPath(entry.FullName);
+                                    entry.ExtractToFile(fullPath, true);
                                 }
                                 else
                                 {
@@ -215,7 +217,9 @@ private async Task<bool> ExtractModFilesToSynthDir(string synthmodPath)
                                     else
                                     {
                                         MainViewModel.Log($"Extracting file {entry.FullName}");
-                                        await StorageAbstraction.WriteFile(await CopyStreamToMemoryStream(stream, false), entry.FullName);
+                                        // TODO use a more generic function once modding is supported on Oculus
+                                        var fullPath = StorageAbstraction.GetFullComputerPath(entry.FullName);
+                                        entry.ExtractToFile(fullPath);
                                     }
                                 }
                             }