Merge pull request #160 from DanTheMan827/add-obb

Backup/restore obb

Author: Lauriethefish

QuestPatcher.Core/AndroidDebugBridge.cs

@@ -542,6 +542,13 @@ public async Task InstallApp(string apkPath)
             await RunShellCommand($"rm {pushPath}");
         }
 
+        public async Task<bool> Exists(string path)
+        {
+            var output = await RunShellCommand($"stat {path.WithForwardSlashes().EscapeBash()}");
+
+            return output.ExitCode == 0;
+        }
+
         public async Task CreateDirectory(string path)
         {
             await RunShellCommand($"mkdir -p {path.WithForwardSlashes().EscapeBash()}");

QuestPatcher.Core/InstallManager.cs

@@ -36,7 +36,9 @@ public class InstallManager : INotifyPropertyChanged
         };
 
         private const string DataDirectoryTemplate = "/sdcard/Android/data/{0}/files";
+        private const string ObbDirectoryTemplate = "/sdcard/Android/obb/{0}";
         private const string DataBackupTemplate = "/sdcard/QuestPatcher/{0}/backup";
+        private const string ObbBackupTemplate = "/sdcard/QuestPatcher/{0}/obb";
 
         /// <summary>
         /// The APK currently installed on the quest
@@ -51,6 +53,10 @@ public class InstallManager : INotifyPropertyChanged
         /// </summary>
         private string DataPath => string.Format(DataDirectoryTemplate, _config.AppId);
 
+        /// <summary>
+        /// The /sdcard/Android/obb/... directory for the installed app
+        /// </summary>
+        private string ObbPath => string.Format(ObbDirectoryTemplate, _config.AppId);
 
         private readonly string _currentlyInstalledPath;
         private readonly AndroidDebugBridge _debugBridge;
@@ -195,13 +201,16 @@ public async Task NewApkInstalled(string newApk)
         /// Creates a backup of the /sdcard/Android/data/... directory for the current app.
         /// </summary>
         /// <returns>The path to the backup on the quest</returns>
-        public async Task<string> CreateDataBackup()
+        public async Task<string?> CreateDataBackup()
         {
             string backupPath = string.Format(DataBackupTemplate, _config.AppId);
 
-            // Avoid failing if no files are present in the data directory
-            // TODO: Perhaps check if it exists first and then skip backup if missing? This is more complex.
-            await _debugBridge.CreateDirectory(DataPath);
+            // Check if the data directory exists and skip if it doesn't.
+            if (!await _debugBridge.Exists(DataPath))
+            {
+                return null;
+            }
+
             // Remove the backup path if it already exists and then recreate it
             await _debugBridge.RemoveDirectory(backupPath);
             await _debugBridge.CreateDirectory(backupPath);
@@ -211,6 +220,28 @@ public async Task<string> CreateDataBackup()
             return backupPath;
         }
 
+        /// <summary>
+        /// Creates a backup of the /sdcard/Android/obb/... directory for the current app.
+        /// </summary>
+        /// <returns>The path to the backup on the quest</returns>
+        public async Task<string?> CreateObbBackup()
+        {
+            string backupPath = string.Format(ObbBackupTemplate, _config.AppId);
+
+            // Check if the data directory exists and skip if it doesn't.
+            if (!await _debugBridge.Exists(ObbPath))
+            {
+                return null;
+            }
+
+            // Remove the backup path if it already exists
+            await _debugBridge.RemoveDirectory(backupPath);
+            // Copy all the files to the data backup
+            await _debugBridge.Move(ObbPath, backupPath);
+
+            return backupPath;
+        }
+
         /// <summary>
         /// Restores a data backup created with CreateDataBackup.
         /// Will delete any mod/lib files in the backup to avoid old mods causing crashes.
@@ -228,6 +259,18 @@ public async Task RestoreDataBackup(string backupPath)
             await _debugBridge.RemoveDirectory(Path.Combine(DataPath, "mods"));
         }
 
+        /// <summary>
+        /// Restores a obb backup created with CreateObbBackup.
+        /// </summary>
+        /// <param name="backupPath">The path to the backup on the quest</param>
+        public async Task RestoreObbBackup(string backupPath)
+        {
+            // Remove the backup obb path if it already exists
+            await _debugBridge.RemoveDirectory(ObbPath);
+            // Move the obb backup to the original path.
+            await _debugBridge.Move(backupPath, ObbPath);
+        }
+
         /// <summary>
         /// Uninstalls the current app
         /// </summary>

QuestPatcher.Core/Patching/PatchingManager.cs

@@ -664,17 +664,32 @@ public async Task PatchApp()
                 await apk.DisposeAsync();
             }
 
+            // Close any running instance of the app.
+            await _debugBridge.ForceStop(_config.AppId);
+
             Log.Information("Uninstalling the default APK . . .");
             Log.Information("Backing up data directory");
-            string? backupPath;
+            string? dataBackupPath;
             try
             {
-                backupPath = await _installManager.CreateDataBackup();
+                dataBackupPath = await _installManager.CreateDataBackup();
             }
             catch (Exception ex)
             {
                 Log.Error(ex, "Failed to create data backup");
-                backupPath = null; // Indicate that the backup failed
+                dataBackupPath = null; // Indicate that the backup failed
+            }
+
+            Log.Information("Backing up obb directory");
+            string? obbBackupPath;
+            try
+            {
+                obbBackupPath = await _installManager.CreateObbBackup();
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to create obb backup");
+                obbBackupPath = null; // Indicate that the backup failed
             }
 
             PatchingStage = PatchingStage.UninstallingOriginal;
@@ -692,19 +707,31 @@ public async Task PatchApp()
             PatchingStage = PatchingStage.InstallingModded;
             await _debugBridge.InstallApp(_patchedApkPath);
 
-            if (backupPath != null)
+            if (dataBackupPath != null)
             {
                 Log.Information("Restoring data backup");
                 try
                 {
-                    await _installManager.RestoreDataBackup(backupPath);
+                    await _installManager.RestoreDataBackup(dataBackupPath);
                 }
                 catch (Exception ex)
                 {
                     Log.Error(ex, "Failed to restore data backup");
                 }
             }
 
+            if (obbBackupPath != null)
+            {
+                Log.Information("Restoring obb backup");
+                try
+                {
+                    await _installManager.RestoreObbBackup(obbBackupPath);
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex, "Failed to restore obb backup");
+                }
+            }
 
             // Recreate the mod directories as they will not be present after the uninstall/backup restore
             await _modManager.CreateModDirectories();