QoL improvements

Author: ComputerElite

Assets/html/index.html

@@ -22,7 +22,7 @@
                         Backup
                         <div class="contentHeaderDescription">Backup your game and restore backups</div>
                     </div>
-                    <div>Backups of <div class="inline packageName">some game</div></div>
+                    <div>Backups of <div class="inline packageName">some game</div> (<div id="size" class="inline"></div>)</div>
                     <div class="smallListContainer">
                         <div id="backupList" class="list">
                         </div>
@@ -36,6 +36,10 @@
                             <div class="button" id="restoreBackup">Restore Backup</div>
                             <div class="buttonLabel">Restores the selected Backup</div>
                         </div>
+                        <div class="buttonContainer">
+                            <div class="button" id="deleteBackup">Delete Backup</div>
+                            <div class="buttonLabel">Deletes the selected Backup</div>
+                        </div>
                         <div id="restoreTextBox" class="textBox"></div>
                     </div>
 
@@ -65,6 +69,11 @@
                         <div class="button" id="changeApp">Change app</div>
                         <div class="buttonLabel">Change the app you want to manage</div>
                     </div>
+                    <div class="space">
+                        All Backups together take up <b class="inline totalSize"></b> of space on your Device.
+                        <br>
+                        You can delete Backups in the Backup section
+                    </div>
                     <div class="about">
                         Quest App Version Switcher Version <div id="version" class="inline"></div>
                         Accessible via browser at:
@@ -75,6 +84,23 @@
                 </div>
             </div>
 
+            <div class="listContainer darken hidden" id="deleteContainer">
+                <div class="restoreStep" id="step6">
+                    <div class="contentHeader headerMargin">
+                        Confirm
+                    </div>
+                    Do you really want to delete <div class="selectedBackupName inline"></div> of <div class="inline packageName">some game</div>?
+                    <div class="buttonSelectionContainer">
+                        <div class="buttonContainer">
+                            <div class="button" id="abortDelete">No! Abort!</div>
+                        </div>
+                        <div class="buttonContainer buttonMargin">
+                            <div class="button" id="delete">Yes. Delete the Backup</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <div class="listContainer darken hidden" id="restoreContainer">
                 <div id="step1" class="restoreStep">
                     <div class="contentHeader headerMargin">
@@ -177,9 +203,10 @@
                     })
                     fetch("backups?package=" + config.currentApp).then(res => res.json().then(res => {
                         document.getElementById("backupList").innerHTML = ""
+                        document.getElementById("size").innerHTML = res.backupsSizeString
                         if(res.backups) {
                             res.backups.forEach(backup => {
-                                document.getElementById("backupList").innerHTML += `<div class="listItem${backup.backupName == selectedBackup ? " listItemSelected" : ""}" value="${backup.backupName}">${backup.backupName}</div>`
+                                document.getElementById("backupList").innerHTML += `<div class="listItem${backup.backupName == selectedBackup ? " listItemSelected" : ""}" value="${backup.backupName}">${backup.backupName} (${backup.backupSizeString})</div>`
                             })
                         }
                         if(document.getElementById("backupList").innerHTML == "") document.getElementById("backupList").innerHTML = `<div class="listItem" value="">No Backups</div>`
@@ -192,6 +219,13 @@
                         loadingBackups = false
                     }))
                 }))
+                fetch("allbackups").then(res => {
+                    res.text().then(text =>{
+                        Array.prototype.forEach.call(document.getElementsByClassName("totalSize"), i => {
+                            i.innerHTML = text
+                        })
+                    })
+                })
                 fetch("questappversionswitcher/about").then(res => res.json().then(res => {
                     document.getElementById("version").innerHTML = res.version
                     document.getElementById("ips").innerHTML = ""
@@ -405,6 +439,42 @@
                     e.className = `restoreStep${ e.id == "step" + step ? "" : " hidden"}`
                 })
             }
+
+            function CloseDeletePopup() {
+                document.getElementById("deleteContainer").className = "listContainer darken hidden"
+                GotoStep(6)
+            }
+
+            function OpenDeletePopup() {
+                CloseDeletePopup()
+                document.getElementById("deleteContainer").className = "listContainer darken"
+            }
+
+            document.getElementById("deleteBackup").onclick = () => {
+                OpenDeletePopup()
+            }
+
+            document.getElementById("delete").onclick = () => {
+                CloseDeletePopup()
+                TextBoxText("restoreTextBox", "Deleting Backup. Please wait.")
+                fetch("/backup?package=" + config.currentApp + "&backupname=" + selectedBackup, {
+                    method: "DELETE"
+                }).then(res => {
+                    res.text().then(text => {
+                        if(res.status == 200) {
+                            TextBoxGood("restoreTextBox", text)
+                            UpdateUI()
+                        } else {
+                            TextBoxError("restoreTextBox", text)
+                            UpdateUI()
+                        }
+                    })
+                })
+            }
+
+            document.getElementById("abortDelete").onclick = () => {
+                CloseDeletePopup()
+            }
 
 
 

Assets/html/style.css

@@ -201,6 +201,9 @@ code {
   width: 100%;
 }
 
+.space {
+    margin-top: 40px;
+}
 
 .lds-ellipsis {
   display: inline-block;

ClientModels.cs

@@ -13,18 +13,24 @@ public class AppBackup
         public string backupName { get; set; } = "";
         public string backupLocation { get; set; } = "";
         public bool containsGamedata { get; set; } = false;
+        public long backupSize { get; set; } = 0;
+        public string backupSizeString { get; set; } = "";
 
-        public AppBackup(string name, bool gamedata, string location)
+        public AppBackup(string name, bool gamedata, string location, long size, string sizestr)
         {
             this.backupName = name;
             this.containsGamedata = gamedata;
             this.backupLocation = location;
+            this.backupSize = size;
+            this.backupSizeString = sizestr;
         }
     }
 
     public class BackupList
     {
         public List<AppBackup> backups { get; set; } = new List<AppBackup>();
         public string lastRestored { get; set; } = "";
+        public long backupsSize { get; set; } = 0;
+        public string backupsSizeString { get; set; } = "";
     }
 }

ComputerUtils/ComputerUtils.FileManaging.cs

@@ -6,6 +6,27 @@ namespace ComputerUtils.FileManaging
 {
     public class FileManager
     {
+        public static long GetDirSize(string dir)
+        {
+            return GetDirSize(new DirectoryInfo(dir));
+        }
+
+        public static long GetDirSize(DirectoryInfo d)
+        {
+            long size = 0;
+            FileInfo[] fis = d.GetFiles();
+            foreach (FileInfo fi in fis)
+            {
+                size += fi.Length;
+            }
+            DirectoryInfo[] dis = d.GetDirectories();
+            foreach (DirectoryInfo di in dis)
+            {
+                size += GetDirSize(di);
+            }
+            return size;
+        }
+
         public static string GetParentDirIfExisting(string dir)
         {
             try

Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.ComputerElite.questappversionswitcher" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.1" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="2">
 	<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
 	<uses-permission android:name="oculus.permission.handtracking" />
 	<uses-permission android:name="com.oculus.permission.HAND_TRACKING" />

QuestAppVersionSwitcher.csproj

@@ -38,6 +38,10 @@
     <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
     <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <BundleAssemblies>false</BundleAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -51,6 +55,10 @@
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <BundleAssemblies>false</BundleAssemblies>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

WebServer.cs

@@ -177,7 +177,11 @@ public void Start()
                 string gameDataDir = CoreService.coreVars.AndroidAppLocation + package;
                 try
                 {
+                    text = "Copying APK. Please wait until it has finished. This can take up to 2 minutes";
+                    code = 202;
                     File.Copy(apkDir, backupDir + "app.apk");
+                    text = "Copying App Data. Please wait until it has finished. This can take up to 2 minutes";
+                    code = 202;
                     FileManager.DirectoryCopy(gameDataDir, backupDir + package, true);
                 } catch (Exception e)
                 {
@@ -194,6 +198,29 @@ public void Start()
                 serverRequest.SendString(text, "text/plain", code);
                 return true;
             }));
+            server.AddRoute("DELETE", "/backup", new Func<ServerRequest, bool>(serverRequest =>
+            {
+                if (serverRequest.queryString.Get("package") == null)
+                {
+                    serverRequest.SendString("package key needed", "text/plain", 400);
+                    return true;
+                }
+                if (serverRequest.queryString.Get("backupname") == null)
+                {
+                    serverRequest.SendString("backupname key needed", "text/plain", 400);
+                    return true;
+                }
+                string package = serverRequest.queryString.Get("package");
+                string backupname = serverRequest.queryString.Get("backupname");
+                string backupDir = CoreService.coreVars.QAVSBackupDir + package + "/" + backupname + "/";
+                if (!Directory.Exists(backupDir))
+                {
+                    serverRequest.SendString("The Backup you want to delete doesn't exist.", "text/plain", 400);
+                }
+                Directory.Delete(backupDir, true);
+                serverRequest.SendString("Deleted " + backupname + " of " + package);
+                return true;
+            }));
             server.AddRoute("POST", "/restoreapp", new Func<ServerRequest, bool>(serverRequest =>
             {
                 if (serverRequest.queryString.Get("package") == null)
@@ -224,6 +251,11 @@ public void Start()
                     serverRequest.SendString("This backup doesn't exist", "text/plain", 400);
                     return true;
                 }
+                if(!File.Exists(backupDir + "app.apk"))
+                {
+                    serverRequest.SendString("Critical: APK doesn't exist in Backup. This Backup is useless. Please restart the app and choose a different one.", "text/plain", 500);
+                    return true;
+                }
                 AndroidService.InitiateInstallApk(backupDir + "app.apk");
                 serverRequest.SendString("Started apk install", "text/plain", 200);
                 return true;
@@ -264,6 +296,11 @@ public void Start()
                     return true;
                 }
                 string gameDataDir = CoreService.coreVars.AndroidAppLocation + package;
+                if(!Directory.Exists(backupDir + package))
+                {
+                    serverRequest.SendString("This backup doesn't contain a game data backup. Please skip this step", "text/plain", 400);
+                    return true;
+                }
                 try
                 {
                     FileManager.DirectoryCopy(backupDir + package, gameDataDir, true);
@@ -276,6 +313,11 @@ public void Start()
                 serverRequest.SendString("Game data restored", "text/plain", 200);
                 return true;
             }));
+            server.AddRoute("GET", "/allbackups", new Func<ServerRequest, bool>(serverRequest =>
+            {
+                serverRequest.SendString(ByteSizeToString(FileManager.GetDirSize(CoreService.coreVars.QAVSBackupDir)));
+                return true;
+            }));
             server.AddRouteFile("/facts.png", "facts.png");
             server.StartServer(50001);
             Thread.Sleep(1000);
@@ -288,12 +330,29 @@ public BackupList GetBackups(string package)
             BackupList backups = new BackupList();
             foreach (string d in Directory.GetDirectories(backupDir))
             {
-                backups.backups.Add(new AppBackup(Path.GetFileName(d), Directory.Exists(d + "/GameData"), d));
+                long size = FileManager.GetDirSize(d);
+                backups.backupsSize += size;
+                backups.backups.Add(new AppBackup(Path.GetFileName(d), Directory.Exists(d + "/GameData"), d, size, ByteSizeToString(size)));
             }
             if (File.Exists(backupDir + "lastRestored.txt")) backups.lastRestored = File.ReadAllText(backupDir + "lastRestored.txt");
+            backups.backupsSizeString = ByteSizeToString(backups.backupsSize);
             return backups;
         }
 
+        public string ByteSizeToString(long input, int decimals = 2)
+        {
+            // TB
+            if (input > 1099511627776) return String.Format("{0:0." + new string('#', decimals) + "}", input / 1099511627776.0) + " TB";
+            // GB
+            else if (input > 1073741824) return String.Format("{0:0." + new string('#', decimals) + "}", input / 1073741824.0) + " GB";
+            // MB
+            else if (input > 1048576) return String.Format("{0:0." + new string('#', decimals) + "}", input / 1048576.0) + " MB";
+            // KB
+            else if (input > 1024) return String.Format("{0:0." + new string('#', decimals) + "}", input / 1024.0) + " KB";
+            // Bytes
+            else return input + " Bytes";
+        }
+
         public bool IsNameFileNameSafe(string name)
         {
             foreach(char c in ReservedChars)
@@ -307,7 +366,6 @@ public List<string> GetIPs()
         {
             return server.ips;
         }
-
         public static byte[] GetAssetBytes(string assetName)
         {
             MemoryStream ms = new MemoryStream();
@@ -331,10 +389,10 @@ public static List<string> GetAllFiles(string folder)
             List<string> files = new List<string>();
             if (!folder.EndsWith("/")) folder += "/";
             if (folder == "/") folder = "";
-            foreach(string s in CoreService.assetManager.List(folder))
+            foreach (string s in CoreService.assetManager.List(folder))
             {
                 files.Add(folder + s);
-                foreach(string ss in GetAllFiles(folder + s)) files.Add(ss);
+                foreach (string ss in GetAllFiles(folder + s)) files.Add(ss);
             }
             return files;
         }
@@ -343,5 +401,6 @@ public static List<string> GetAssetFolderFileList(string assetFolder)
         {
             return new List<string>(CoreService.assetManager.List(assetFolder));
         }
+
     }
 }