Merge pull request #8 from VRPirates/beta/RSL-2.22

merge 2.22 changes to master
2023-08-04 07:16:14 -05:00
parent 45497396d1 4349603f51
commit 8059834e91
7 changed files with 57 additions and 50 deletions
--- a/ADB.cs
+++ b/ADB.cs
@@ -9,7 +9,7 @@ namespace AndroidSideloader
    internal class ADB
    {
        private static readonly Process adb = new Process();
-        public static string adbFolderPath = $"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools";
+        public static string adbFolderPath = $"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools";
        public static string adbFilePath = adbFolderPath + "\\adb.exe";
        public static string DeviceID = "";
        public static string package = "";
--- a/ChangelogHistory.txt
+++ b/ChangelogHistory.txt
@@ -1,4 +1,30 @@
-RSL 2.20
+RSL 2.21
+
+- Feature: Search now shows all results found
+- Feature: Add --no-rclone-updating launch flag
+- Feature: Add lime-green color to various after download jobs
+- Feature: Update Sideloader Launcher to check for Rookie
+- Feature: Add the ability to download into virtual filesystems (Settings)
+- Feature: Add stacktrace & innerexception to crashlog
+- Feature: Add CallerInfo to debuglog
+- Feature: Rookie will now tell the user when there's a running RCLONE Job
+- Fix: Rookie will no longer repeat "All tasks finished." in No Device Mode
+- Fix: Rookie should no longer delete the entire OBB/Data folder when uninstalling a game
+- Fix: Rookie should no longer freeze on the OBB Comparison
+- Fix: The free disclaimer on launch is no longer broken
+- Fix: Use new process for every ADB command
+- Fix: Do not delete game files on an OBB Mismatch anymore
+- Fix: Change all hardcoded C:/ paths to dynamically grab the system drive for further compatability
+- Fix: Rookie should now function on 32 Bit again
+- Fix: Fix crash on failed extraction
+- Chore: Update quota message to be up to date
+- Chore: Code rewrites for logging system, obb comparison, updater
+- Chore: Several redundant code removals
+- Chore: Change Install w/ Enter Key to Download w/ Enter Key
+- Chore: Several code cleanups & optimizations
+~ Chax
+
+RSL 2.20

 - Feature: Added manual IP on Wireless ADB
 - Feature: Rookie will now delete old OBB Folders before pushing new obb folders
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -201,7 +201,7 @@ namespace AndroidSideloader
                }
            }

-            if (File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\adb.exe"))
+            if (File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\adb.exe"))
            {
                _ = ADB.RunAdbCommandToString("kill-server");
                _ = ADB.RunAdbCommandToString("start-server");
@@ -361,8 +361,8 @@ namespace AndroidSideloader
            {
                if (!string.IsNullOrEmpty(Properties.Settings.Default.IPAddress))
                {
-                    string path = $"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\adb.exe";
-                    ProcessOutput wakeywakey = ADB.RunCommandToString($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\adb.exe shell input keyevent KEYCODE_WAKEUP", path);
+                    string path = $"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\adb.exe";
+                    ProcessOutput wakeywakey = ADB.RunCommandToString($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\adb.exe shell input keyevent KEYCODE_WAKEUP", path);
                    if (wakeywakey.Output.Contains("more than one"))
                    {
                        Properties.Settings.Default.Wired = true;
@@ -386,7 +386,7 @@ namespace AndroidSideloader
                        _ = FlexibleMessageBox.Show(Program.form, "Attempt to connect to saved IP has failed. This is usually due to rebooting the device or not having a STATIC IP set in your router.\nYou must enable Wireless ADB again!");
                        Properties.Settings.Default.IPAddress = "";
                        Properties.Settings.Default.Save();
-                        File.Delete($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\StoredIP.txt");
+                        File.Delete($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\StoredIP.txt");
                    }
                    else
                    {
@@ -1254,7 +1254,7 @@ namespace AndroidSideloader
                                string pathname = Path.GetDirectoryName(file2);
                                string filename = file2.Replace($"{pathname}\\", String.Empty);

-                                string cmd = $"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\aapt.exe\" dump badging \"{file2}\" | findstr -i \"package: name\"";
+                                string cmd = $"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\aapt.exe\" dump badging \"{file2}\" | findstr -i \"package: name\"";
                                _ = Logger.Log($"Running adb command-{cmd}");
                                string cmdout = ADB.RunCommandToString(cmd, file2).Output;
                                cmdout = Utilities.StringUtilities.RemoveEverythingBeforeFirst(cmdout, "=");
@@ -1401,7 +1401,7 @@ namespace AndroidSideloader
                        {
                            string pathname = Path.GetDirectoryName(data);
                            string dataname = data.Replace($"{pathname}\\", "");
-                            string cmd = $"\"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\aapt.exe\" dump badging \"{data}\" | findstr -i \"package: name\"";
+                            string cmd = $"\"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\aapt.exe\" dump badging \"{data}\" | findstr -i \"package: name\"";
                            _ = Logger.Log($"Running adb command-{cmd}");
                            string cmdout = ADB.RunCommandToString(cmd, data).Output;
                            cmdout = Utilities.StringUtilities.RemoveEverythingBeforeFirst(cmdout, "=");
@@ -1833,19 +1833,19 @@ namespace AndroidSideloader
                                string apppath = ADB.RunAdbCommandToString($"shell pm path {newGamesToUpload}").Output;
                                apppath = Utilities.StringUtilities.RemoveEverythingBeforeFirst(apppath, "/");
                                apppath = Utilities.StringUtilities.RemoveEverythingAfterFirst(apppath, "\r\n");
-                                if (File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\base.apk"))
+                                if (File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\base.apk"))
                                {
-                                    File.Delete($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\base.apk");
+                                    File.Delete($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\base.apk");
                                }

                                _ = ADB.RunAdbCommandToString($"pull \"{apppath}\"");
-                                string cmd = $"\"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\aapt.exe\" dump badging \"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\base.apk\" | findstr -i \"application-label\"";
-                                string workingpath = $"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\aapt.exe";
+                                string cmd = $"\"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\aapt.exe\" dump badging \"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\base.apk\" | findstr -i \"application-label\"";
+                                string workingpath = $"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\aapt.exe";
                                string ReleaseName = ADB.RunCommandToString(cmd, workingpath).Output;
                                ReleaseName = Utilities.StringUtilities.RemoveEverythingBeforeFirst(ReleaseName, "'");
                                ReleaseName = Utilities.StringUtilities.RemoveEverythingAfterFirst(ReleaseName, "\r\n");
                                ReleaseName = ReleaseName.Replace("'", "");
-                                File.Delete($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\base.apk");
+                                File.Delete($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\base.apk");
                                if (ReleaseName.Contains("Microsoft Windows"))
                                {
                                    ReleaseName = RlsName;
@@ -2180,7 +2180,7 @@ namespace AndroidSideloader
                    Program.form.showAvailableSpace();
                    Properties.Settings.Default.IPAddress = IPcmnd;
                    Properties.Settings.Default.Save();
-                    File.WriteAllText($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\StoredIP.txt", IPcmnd);
+                    File.WriteAllText($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\StoredIP.txt", IPcmnd);
                    ADB.wirelessadbON = true;
                    _ = ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_available 1");
                    _ = ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_enabled 1");
@@ -3053,9 +3053,9 @@ Things you can try:
                _ = Program.form.GetDeviceID();
                Program.form.changeTitlebarToDevice();
                _ = FlexibleMessageBox.Show(Program.form, "Relaunch Rookie to complete the process and switch back to USB adb.");
-                if (File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\StoredIP.txt"))
+                if (File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\StoredIP.txt"))
                {
-                    File.Delete($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\StoredIP.txt");
+                    File.Delete($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\StoredIP.txt");
                }
            }
        }
@@ -3821,7 +3821,7 @@ Things you can try:
                        Program.form.showAvailableSpace();
                        Properties.Settings.Default.IPAddress = IPcmnd;
                        Properties.Settings.Default.Save();
-                        File.WriteAllText($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\StoredIP.txt", IPcmnd);
+                        File.WriteAllText($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\StoredIP.txt", IPcmnd);
                        ADB.wirelessadbON = true;
                        _ = ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_available 1");
                        _ = ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_enabled 1");
--- a/Sideloader.cs
+++ b/Sideloader.cs
@@ -274,11 +274,11 @@ namespace AndroidSideloader
                    client.DownloadFile("https://github.com/VRPirates/rookie/raw/master/Rookie%20Offline.cmd", "Rookie Offline.cmd");
                }

-                if (!File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\aug2021.txt") || !File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools\\adb.exe")) //if adb is not updated, download and auto extract
+                if (!File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\aug2021.txt") || !File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\adb.exe")) //if adb is not updated, download and auto extract
                {
-                    if (Directory.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\2.8.2"))
+                    if (Directory.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\2.8.2"))
                    {
-                        Directory.Delete($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\2.8.2", true);
+                        Directory.Delete($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\2.8.2", true);
                    }

                    if (Directory.Exists($"{Properties.Settings.Default.MainDir}\\adb"))
@@ -286,14 +286,14 @@ namespace AndroidSideloader
                        Directory.Delete($"{Properties.Settings.Default.MainDir}\\adb", true);
                    }

-                    if (!Directory.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools"))
+                    if (!Directory.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools"))
                    {
-                        _ = Directory.CreateDirectory($"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools");
+                        _ = Directory.CreateDirectory($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools");
                    }

                    currentAccessedWebsite = "github";
                    client.DownloadFile("https://github.com/VRPirates/rookie/raw/master/adb2.zip", "Ad.7z");
-                    Utilities.Zip.ExtractFile(Environment.CurrentDirectory + "\\Ad.7z", $"{Path.GetPathRoot(Environment.SystemDirectory)}\\RSL\\platform-tools");
+                    Utilities.Zip.ExtractFile(Environment.CurrentDirectory + "\\Ad.7z", $"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools");
                    File.Delete("Ad.7z");
                }

--- a/Updater.cs
+++ b/Updater.cs
@@ -13,7 +13,7 @@ namespace AndroidSideloader
        private static readonly string RawGitHubUrl = "https://raw.githubusercontent.com/VRPirates/rookie";
        private static readonly string GitHubUrl = "https://github.com/VRPirates/rookie";

-        public static readonly string LocalVersion = "2.21";
+        public static readonly string LocalVersion = "2.22";
        public static string currentVersion = string.Empty;
        public static string changelog = string.Empty;

--- a/changelog.txt
+++ b/changelog.txt
@@ -1,26 +1,7 @@
-RSL 2.21
+RSL 2.22

- Feature: Search now shows all results found
- Feature: Add --no-rclone-updating launch flag
- Feature: Add lime-green color to various after download jobs
- Feature: Update Sideloader Launcher to check for Rookie
- Feature: Add the ability to download into virtual filesystems (Settings)
- Feature: Add stacktrace & innerexception to crashlog
- Feature: Add CallerInfo to debuglog
- Feature: Rookie will now tell the user when there's a running RCLONE Job
- Fix: Rookie will no longer repeat "All tasks finished." in No Device Mode
- Fix: Rookie should no longer delete the entire OBB/Data folder when uninstalling a game
- Fix: Rookie should no longer freeze on the OBB Comparison
- Fix: The free disclaimer on launch is no longer broken
- Fix: Use new process for every ADB command
- Fix: Do not delete game files on an OBB Mismatch anymore
- Fix: Change all hardcoded C:/ paths to dynamically grab the system drive for further compatability
- Fix: Rookie should now function on 32 Bit again
- Fix: Fix crash on failed extraction
- Chore: Update quota message to be up to date
- Chore: Code rewrites for logging system, obb comparison, updater
- Chore: Several redundant code removals
- Chore: Change Install w/ Enter Key to Download w/ Enter Key
- Chore: Several code cleanups & optimizations
-
-~ Chax
+- Fix: Crash on failed extractions.
+- Fix: Trailers controls not functioning properly.
+- Fix: No Device Mode having the wrong output message.
+- Chore: Remove ADB.WakeDevice() due to being non-functional.
+- Chore: Make changeTitlebarToDevice less prone to crashes and more robust.
--- a/2
+++ b/2
@@ -1 +1 @@
-2.21
+2.22
@@ -1 +1 @@
 .21
 .22