Merge pull request #157 from nerdunit/beta/RSL-2.20

Release/RSL-2.20
nerdunit · May 25, 2023 · 75a41fb · 75a41fb
2 parents 8c26242 + 7cf1bae
commit 75a41fb
Show file tree

Hide file tree

Showing 18 changed files with 719 additions and 562 deletions.
diff --git a/ADB.cs b/ADB.cs
@@ -24,7 +24,6 @@ public static ProcessOutput RunAdbCommandToString(string command)
             }
             if (!command.Contains("dumpsys") && !command.Contains("shell pm list packages") && !command.Contains("KEYCODE_WAKEUP"))
             {
-
                 string logcmd = command;
 
                 if (logcmd.Contains(Environment.CurrentDirectory))
@@ -37,15 +36,11 @@ public static ProcessOutput RunAdbCommandToString(string command)
             adb.StartInfo.FileName = adbFilePath;
             adb.StartInfo.Arguments = command;
             adb.StartInfo.RedirectStandardError = true;
-            adb.StartInfo.RedirectStandardInput = true;
             adb.StartInfo.RedirectStandardOutput = true;
             adb.StartInfo.CreateNoWindow = true;
             adb.StartInfo.UseShellExecute = false;
             adb.StartInfo.WorkingDirectory = adbFolderPath;
             _ = adb.Start();
-            adb.StandardInput.WriteLine(command);
-            adb.StandardInput.Flush();
-            adb.StandardInput.Close();
 
             string output = "";
             string error = "";
@@ -56,9 +51,10 @@ public static ProcessOutput RunAdbCommandToString(string command)
                 error = adb.StandardError.ReadToEnd();
             }
             catch { }
+
             if (command.Contains("connect"))
             {
-                bool graceful = adb.WaitForExit(3000);  //Wait 3 secs.
+                bool graceful = adb.WaitForExit(3000);  // Wait 3 secs.
                 if (!graceful)
                 {
                     adb.Kill();
@@ -91,9 +87,10 @@ public static ProcessOutput RunAdbCommandToString(string command)
                 _ = Logger.Log(output);
             }
 
-            _ = Logger.Log(error);
+            _ = Logger.Log(error, "ERROR");
             return new ProcessOutput(output, error);
         }
+
         public static ProcessOutput RunAdbCommandToStringWOADB(string result, string path)
         {
             string command = result;
@@ -166,7 +163,7 @@ public static ProcessOutput RunAdbCommandToStringWOADB(string result, string pat
                 }
             }
             _ = Logger.Log(output);
-            _ = Logger.Log(error);
+            _ = Logger.Log(error, "ERROR");
             return new ProcessOutput(output, error);
         }
         public static ProcessOutput RunCommandToString(string result, string path = "")
@@ -229,7 +226,7 @@ public static ProcessOutput RunCommandToString(string result, string path = "")
                 }
             }
             _ = Logger.Log(output);
-            _ = Logger.Log(error);
+            _ = Logger.Log(error, "ERROR");
             return new ProcessOutput(output, error);
         }
 
@@ -254,7 +251,7 @@ public static string GetAvailableSpace()
 
             foreach (string currLine in output)
             {
-                if (currLine.StartsWith("/data/media"))
+                if (currLine.StartsWith("/dev/fuse") || currLine.StartsWith("/data/media"))
                 {
                     string[] foo = currLine.Split(' ');
                     int i = 0;
@@ -325,12 +322,20 @@ public static ProcessOutput Sideload(string path, string packagename = "")
                     ADB.WakeDevice();
                     if (!Properties.Settings.Default.AutoReinstall)
                     {
-                        DialogResult dialogResult1 = FlexibleMessageBox.Show(Program.form, "In place upgrade has failed. Rookie can attempt to backup your save data and\nreinstall the game automatically, however " +
-                            "some games do not store their saves\nin an accessible location(less than 5%). Continue with reinstall?", "In place upgrade failed.", MessageBoxButtons.OKCancel);
-                        if (dialogResult1 == DialogResult.Cancel)
+                        bool cancelClicked = false;
+
+                        if (!Properties.Settings.Default.AutoReinstall)
                         {
-                            return ret;
+                            Program.form.Invoke((MethodInvoker)(() =>
+                            {
+                                DialogResult dialogResult1 = FlexibleMessageBox.Show(Program.form, "In place upgrade has failed. Rookie can attempt to backup your save data and reinstall the game automatically, however some games do not store their saves in an accessible location (less than 5%). Continue with reinstall?", "In place upgrade failed.", MessageBoxButtons.OKCancel);
+                                if (dialogResult1 == DialogResult.Cancel)
+                                    cancelClicked = true;
+                            }));
                         }
+
+                        if (cancelClicked)
+                            return ret;
                     }
 
                     Program.form.ChangeTitle("Performing reinstall, please wait...");

diff --git a/App.config b/App.config
@@ -203,6 +203,9 @@
             <setting name="backupDir" serializeAs="String">
                 <value />
             </setting>
+            <setting name="singleThreadMode" serializeAs="String">
+                <value>False</value>
+            </setting>
         </AndroidSideloader.Properties.Settings>
         <AndroidADB.Sideloader.Properties.Settings>
             <setting name="checkForUpdates" serializeAs="String">

diff --git a/ChangelogHistory.txt b/ChangelogHistory.txt
@@ -1,4 +1,24 @@
-RSL 2.18
+RSL 2.19
+
+- Feature: Added streaming Game Trailers (enable in Settings)
+- Feature: Added custom Download Directories
+- Feature: Added custom Backup Directories
+- Feature: Added Game Filtering (click on the Colored-Labels in the Top-Right)
+- Feature: When uninstalling games, Rookie will now ask if you want to back up save data
+- Feature: "No Device Mode" now automatically disables "Delete after Download and Install"
+- Feature:  Offline Mode now has the ability to donate new games/updates
+- Fix:  OBBs will no longer be attempted to push in "No Device Mode"
+- Fix:  Comparing OBB sizes will no longer error during "No Device Mode"
+- Fix:  Comparing OBB Sizes will no longer state "Input string was not in a correct format", it will now properly tell the user what is wrong
+- Fix:  The GitHub Error when starting up will now show the actual URL it tries to access
+- Fix:  Added a check to make Rookie not attempt to get available space when no devices are connected
+- Removed Bandwidth Limit settings
+
+- Thank you to Chax for the new features!
+- Thank you to JP for the Trailers framework!
+~ fenopy
+
+RSL 2.18
 
 - Moving Rookie onto a different Directory than C: will not break Pull App To Desktop anymore
 - Rookie should now tell the user why it couldnt get the Rclone/ADB etc. Files

diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs