BeugLog server support, MAJOR OBB BREAK FIX.

Fixed debuglog code issues until server until debuglog server is live
Merge pull request #67 from SamHoque/master
2021-07-18 19:42:10 -04:00 · 2021-07-18 01:25:27 -04:00 · 2021-07-17 20:13:25 -04:00 · 2021-07-17 15:45:13 -04:00 · 2021-07-17 14:25:05 +06:00
9 changed files with 333 additions and 87 deletions
--- a/ADB.cs
+++ b/ADB.cs
@@ -421,11 +421,7 @@ namespace AndroidSideloader
            WakeDevice();
            if (Path.GetDirectoryName(path).Contains(".") && !Path.GetDirectoryName(path).Contains("_data") || path.Contains("."))
            {
-                var ext = System.IO.Path.GetExtension(path);
-                if (ext == String.Empty)
-                    return RunAdbCommandToString($"push \"{path}\" \"/sdcard/Android/obb\"");
-                else
-                    return RunAdbCommandToString($"push \"{Path.GetDirectoryName(path)}\" /sdcard/Android/obb");
+             return RunAdbCommandToString($"push \"{path}\" \"/sdcard/Android/obb\"");
            }
            return new ProcessOutput();
        }
--- a/App.config
+++ b/App.config
@@ -41,7 +41,8 @@
            <setting name="SubButtonColor" serializeAs="String">
                <value>64, 64, 64</value>
            </setting>
-            <setting name="TextBoxColor" serializeAs="String">
+            <setting name="
+					 Color" serializeAs="String">
                <value>45, 45, 45</value>
            </setting>
            <setting name="ComboBoxColor" serializeAs="String">
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -40,13 +40,22 @@ namespace AndroidSideloader

        {
            InitializeComponent();
+
            if (!File.Exists(Properties.Settings.Default.CurrentLogTitle))
            {
-                Random r = new Random();
-                int x = r.Next(6806);
-                int y = r.Next(6806);
-                if (File.Exists($"{Properties.Settings.Default.MainDir}\\notes\\nouns.txt"))
+
+                string[] RookieDirFiles = System.IO.Directory.GetFiles($"{Properties.Settings.Default.MainDir}");
+
+                // Copy the files and overwrite destination files if they already exist.
+                foreach (string s in RookieDirFiles)
                {
+                    if (s.EndsWith(".txt") || s.Contains("debuglog.txt"))
+                        File.Delete(s);
+
+                    Random r = new Random();
+                    int x = r.Next(6806);
+                    int y = r.Next(6806);
+
                    string[] lines = File.ReadAllLines($"{Properties.Settings.Default.MainDir}\\notes\\nouns.txt");

                    if (!File.Exists($"{Properties.Settings.Default.MainDir}\\notes\\nouns.txt"))
@@ -54,9 +63,20 @@ namespace AndroidSideloader
                    string randomnoun = lines[new Random(x).Next(lines.Length)];
                    string randomnoun2 = lines[new Random(y).Next(lines.Length)];
                    Properties.Settings.Default.CurrentLogTitle = Properties.Settings.Default.MainDir + "\\" + randomnoun + "-" + randomnoun2 + ".txt";
+                    Properties.Settings.Default.CurrentLogName = Properties.Settings.Default.CurrentLogName.Replace(Properties.Settings.Default.MainDir, "");
                    Properties.Settings.Default.Save();
+
+
                }
+
            }
+            else
+            {
+                Properties.Settings.Default.CurrentLogName = Properties.Settings.Default.CurrentLogName.Replace(Properties.Settings.Default.MainDir, "");
+                Properties.Settings.Default.CurrentLogName = Properties.Settings.Default.CurrentLogName.Replace(".txt", "");
+                Properties.Settings.Default.Save();
+            }
+
            System.Windows.Forms.Timer t = new System.Windows.Forms.Timer();
            t.Interval = 840000; // 14 mins between wakeup commands
            t.Tick += new EventHandler(timer_Tick);
@@ -117,11 +137,44 @@ namespace AndroidSideloader
            Properties.Settings.Default.Save();
            if (File.Exists(Sideloader.CrashLogPath))
            {
-                DialogResult dialogResult = FlexibleMessageBox.Show(this, $"Sideloader crashed during your last use.\nPlease report issue @ https://github.com/nerdunit/androidsideloader/issues + send the crashlog to a mod or dev.\n\n(Crashlog.txt is located here: {Path.GetFullPath(Sideloader.CrashLogPath)})\n\nIf you've already sent it press YES to delete it and prevent this message. Press NO if you'd still like to send it.", "Crash Detected", MessageBoxButtons.YesNo);
-                if (dialogResult == DialogResult.Yes)
-                    File.Delete(Sideloader.CrashLogPath);
-                else
-                    Process.Start("explorer.exe", Properties.Settings.Default.MainDir);
+                DialogResult dialogResult = FlexibleMessageBox.Show(this, $"Sideloader crashed during your last use.\nPress OK to send your crashlog.", "Crash Detected", MessageBoxButtons.OKCancel);
+                if (dialogResult == DialogResult.OK)
+                    if (File.Exists($"{Environment.CurrentDirectory}\\crashlog.txt"))
+                    {
+                        Random r = new Random();
+                        int x = r.Next(6806);
+                        int y = r.Next(6806);
+
+                        string[] lines = File.ReadAllLines($"{Properties.Settings.Default.MainDir}\\notes\\nouns.txt");
+
+                        if (!File.Exists($"{Properties.Settings.Default.MainDir}\\notes\\nouns.txt"))
+                            File.WriteAllText("NOUNS.TXT MISSING", $"{ Properties.Settings.Default.MainDir}\\notes\\nouns.txt");
+                        string randomnoun = lines[new Random(x).Next(lines.Length)];
+                        string randomnoun2 = lines[new Random(y).Next(lines.Length)];
+                        string combined = randomnoun + "-" + randomnoun2 + ".txt";
+
+                        System.IO.File.Move("crashlog.txt", combined);
+
+                        Properties.Settings.Default.CurrentCrashName = Properties.Settings.Default.MainDir + "\\" + randomnoun + "-" + randomnoun2 + ".txt";
+                        Properties.Settings.Default.Save();
+                        Clipboard.SetText(combined);
+                        MessageBox.Show("Your Crash Log ID is:\n\n" + combined + "\n\nThe file will now be uploaded and your CrashLog ID has been automatically copied to your clipboard. Please post it to a mod for assistance.\n\nNote: You can always find your most recent Crash Log ID in the Settings menu.");
+                        RCLONE.runRcloneCommand($"copy \"{Environment.CurrentDirectory}\\{combined}.txt\" RSL-debuglogs:CrashLogs");
+                        Properties.Settings.Default.CurrentCrashName = combined.Replace(".txt", "");
+                        Properties.Settings.Default.Save();
+                        File.Delete(combined);
+
+
+
+                    }
+                    else
+                    {
+                        Properties.Settings.Default.CurrentLogName = Properties.Settings.Default.CurrentLogName.Replace(Properties.Settings.Default.MainDir, "");
+                        Properties.Settings.Default.CurrentLogName = Properties.Settings.Default.CurrentLogName.Replace(".txt", "");
+                        Properties.Settings.Default.Save();
+                    }
+                File.Delete(Sideloader.CrashLogPath);
+
            }
            CheckForInternet();

@@ -1101,7 +1154,7 @@ without him none of this would be possible
 - Thanks to Serge Weinstock for developing SergeUtils, which is used to search the combo box
 - Thanks to Mike Gold https://www.c-sharpcorner.com/members/mike-gold2 for the scrollable message box

- - HFP Thanks to: Roma/Rookie, Pmow, Flow, Kaladin, and the mod staff!";
+ - HFP Thanks to: Roma/Rookie, Pmow, Flow, Sam Hoque, Kaladin, and the mod staff!";

            FlexibleMessageBox.Show(about);
        }
@@ -1350,7 +1403,10 @@ without him none of this would be possible
                                allSize /= 1000000;
                                downloaded /= 1000000;
                                Debug.WriteLine("Allsize: " + allSize + "\nDownloaded: " + downloaded + "\nValue: " + (((double)downloaded / (double)allSize) * 100));
-                                try { progressBar.Value = Convert.ToInt32((((double)downloaded / (double)allSize) * 100)); } catch { }
+                                try {
+                                    progressBar.Style = ProgressBarStyle.Continuous;
+                                    progressBar.Value = Convert.ToInt32((((double)downloaded / (double)allSize) * 100));
+                                } catch { }

                                i++;
                                downloadSpeed /= 1000000;
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -118,13 +118,13 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="orangekey" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\orangekey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="greenkey" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\greenkey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="SearchGlass" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\SearchGlass.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="greenkey" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\greenkey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="orangekey" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\orangekey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/SettingsForm.Designer.cs
+++ b/SettingsForm.Designer.cs
@@ -39,9 +39,12 @@
            this.label1 = new System.Windows.Forms.Label();
            this.BandwithComboBox = new System.Windows.Forms.ComboBox();
            this.DebugLogCopy = new System.Windows.Forms.Button();
-            this.CrashLogCopy = new System.Windows.Forms.Button();
-            this.debuglogID = new System.Windows.Forms.Label();
            this.crashlogID = new System.Windows.Forms.Label();
+            this.button1 = new System.Windows.Forms.Button();
+            this.debuglogID = new System.Windows.Forms.Label();
+            this.DebugID = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.textBox1 = new System.Windows.Forms.TextBox();
            this.SuspendLayout();
            // 
            // checkForUpdatesCheckBox
@@ -49,9 +52,10 @@
            this.checkForUpdatesCheckBox.AutoSize = true;
            this.checkForUpdatesCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.checkForUpdatesCheckBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.checkForUpdatesCheckBox.Location = new System.Drawing.Point(13, 13);
+            this.checkForUpdatesCheckBox.Location = new System.Drawing.Point(17, 16);
+            this.checkForUpdatesCheckBox.Margin = new System.Windows.Forms.Padding(4);
            this.checkForUpdatesCheckBox.Name = "checkForUpdatesCheckBox";
-            this.checkForUpdatesCheckBox.Size = new System.Drawing.Size(175, 24);
+            this.checkForUpdatesCheckBox.Size = new System.Drawing.Size(193, 29);
            this.checkForUpdatesCheckBox.TabIndex = 0;
            this.checkForUpdatesCheckBox.Text = "Check for updates";
            this.checkForUpdatesCheckBox.UseVisualStyleBackColor = true;
@@ -66,9 +70,10 @@
            this.applyButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.applyButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.applyButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.applyButton.Location = new System.Drawing.Point(12, 178);
+            this.applyButton.Location = new System.Drawing.Point(16, 219);
+            this.applyButton.Margin = new System.Windows.Forms.Padding(4);
            this.applyButton.Name = "applyButton";
-            this.applyButton.Size = new System.Drawing.Size(101, 31);
+            this.applyButton.Size = new System.Drawing.Size(135, 38);
            this.applyButton.TabIndex = 5;
            this.applyButton.Text = "Apply";
            this.applyButton.UseVisualStyleBackColor = false;
@@ -79,9 +84,10 @@
            this.enableMessageBoxesCheckBox.AutoSize = true;
            this.enableMessageBoxesCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.enableMessageBoxesCheckBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.enableMessageBoxesCheckBox.Location = new System.Drawing.Point(13, 36);
+            this.enableMessageBoxesCheckBox.Location = new System.Drawing.Point(17, 44);
+            this.enableMessageBoxesCheckBox.Margin = new System.Windows.Forms.Padding(4);
            this.enableMessageBoxesCheckBox.Name = "enableMessageBoxesCheckBox";
-            this.enableMessageBoxesCheckBox.Size = new System.Drawing.Size(367, 24);
+            this.enableMessageBoxesCheckBox.Size = new System.Drawing.Size(404, 29);
            this.enableMessageBoxesCheckBox.TabIndex = 1;
            this.enableMessageBoxesCheckBox.Text = "Enable Message Boxes on task completed";
            this.enableMessageBoxesCheckBox.UseVisualStyleBackColor = true;
@@ -96,9 +102,10 @@
            this.resetSettingsButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.resetSettingsButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.resetSettingsButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.resetSettingsButton.Location = new System.Drawing.Point(119, 178);
+            this.resetSettingsButton.Location = new System.Drawing.Point(159, 219);
+            this.resetSettingsButton.Margin = new System.Windows.Forms.Padding(4);
            this.resetSettingsButton.Name = "resetSettingsButton";
-            this.resetSettingsButton.Size = new System.Drawing.Size(101, 31);
+            this.resetSettingsButton.Size = new System.Drawing.Size(135, 38);
            this.resetSettingsButton.TabIndex = 4;
            this.resetSettingsButton.Text = "Reset Settings";
            this.resetSettingsButton.UseVisualStyleBackColor = false;
@@ -109,9 +116,10 @@
            this.deleteAfterInstallCheckBox.AutoSize = true;
            this.deleteAfterInstallCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.deleteAfterInstallCheckBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.deleteAfterInstallCheckBox.Location = new System.Drawing.Point(13, 59);
+            this.deleteAfterInstallCheckBox.Location = new System.Drawing.Point(17, 73);
+            this.deleteAfterInstallCheckBox.Margin = new System.Windows.Forms.Padding(4);
            this.deleteAfterInstallCheckBox.Name = "deleteAfterInstallCheckBox";
-            this.deleteAfterInstallCheckBox.Size = new System.Drawing.Size(350, 24);
+            this.deleteAfterInstallCheckBox.Size = new System.Drawing.Size(378, 29);
            this.deleteAfterInstallCheckBox.TabIndex = 3;
            this.deleteAfterInstallCheckBox.Text = "Delete games after download and install";
            this.deleteAfterInstallCheckBox.UseVisualStyleBackColor = true;
@@ -122,9 +130,10 @@
            this.updateConfigCheckBox.AutoSize = true;
            this.updateConfigCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.updateConfigCheckBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.updateConfigCheckBox.Location = new System.Drawing.Point(13, 83);
+            this.updateConfigCheckBox.Location = new System.Drawing.Point(17, 102);
+            this.updateConfigCheckBox.Margin = new System.Windows.Forms.Padding(4);
            this.updateConfigCheckBox.Name = "updateConfigCheckBox";
-            this.updateConfigCheckBox.Size = new System.Drawing.Size(251, 24);
+            this.updateConfigCheckBox.Size = new System.Drawing.Size(272, 29);
            this.updateConfigCheckBox.TabIndex = 6;
            this.updateConfigCheckBox.Text = "Update config automatically";
            this.updateConfigCheckBox.UseVisualStyleBackColor = true;
@@ -135,9 +144,10 @@
            this.userJsonOnGameInstall.AutoSize = true;
            this.userJsonOnGameInstall.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.userJsonOnGameInstall.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.userJsonOnGameInstall.Location = new System.Drawing.Point(13, 106);
+            this.userJsonOnGameInstall.Location = new System.Drawing.Point(17, 130);
+            this.userJsonOnGameInstall.Margin = new System.Windows.Forms.Padding(4);
            this.userJsonOnGameInstall.Name = "userJsonOnGameInstall";
-            this.userJsonOnGameInstall.Size = new System.Drawing.Size(288, 24);
+            this.userJsonOnGameInstall.Size = new System.Drawing.Size(315, 29);
            this.userJsonOnGameInstall.TabIndex = 9;
            this.userJsonOnGameInstall.Text = "Push random user.json on install";
            this.userJsonOnGameInstall.UseVisualStyleBackColor = true;
@@ -151,9 +161,10 @@
            this.BandwithTextbox.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "TextBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.BandwithTextbox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.BandwithTextbox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.BandwithTextbox.Location = new System.Drawing.Point(12, 148);
+            this.BandwithTextbox.Location = new System.Drawing.Point(16, 181);
+            this.BandwithTextbox.Margin = new System.Windows.Forms.Padding(4);
            this.BandwithTextbox.Name = "BandwithTextbox";
-            this.BandwithTextbox.Size = new System.Drawing.Size(177, 26);
+            this.BandwithTextbox.Size = new System.Drawing.Size(235, 30);
            this.BandwithTextbox.TabIndex = 11;
            // 
            // label1
@@ -161,9 +172,10 @@
            this.label1.AutoSize = true;
            this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.label1.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.label1.Location = new System.Drawing.Point(10, 127);
+            this.label1.Location = new System.Drawing.Point(13, 156);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(298, 20);
+            this.label1.Size = new System.Drawing.Size(322, 25);
            this.label1.TabIndex = 12;
            this.label1.Text = "Download speed limiter, 0 to disable";
            // 
@@ -182,9 +194,10 @@
            "K",
            "M",
            "G"});
-            this.BandwithComboBox.Location = new System.Drawing.Point(195, 146);
+            this.BandwithComboBox.Location = new System.Drawing.Point(260, 180);
+            this.BandwithComboBox.Margin = new System.Windows.Forms.Padding(4);
            this.BandwithComboBox.Name = "BandwithComboBox";
-            this.BandwithComboBox.Size = new System.Drawing.Size(55, 28);
+            this.BandwithComboBox.Size = new System.Drawing.Size(72, 33);
            this.BandwithComboBox.TabIndex = 13;
            // 
            // DebugLogCopy
@@ -196,57 +209,105 @@
            this.DebugLogCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.DebugLogCopy.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.DebugLogCopy.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.DebugLogCopy.Location = new System.Drawing.Point(12, 223);
+            this.DebugLogCopy.Location = new System.Drawing.Point(16, 274);
+            this.DebugLogCopy.Margin = new System.Windows.Forms.Padding(4);
            this.DebugLogCopy.Name = "DebugLogCopy";
-            this.DebugLogCopy.Size = new System.Drawing.Size(285, 31);
+            this.DebugLogCopy.Size = new System.Drawing.Size(380, 38);
            this.DebugLogCopy.TabIndex = 5;
            this.DebugLogCopy.Text = "Send DebugLog to server.";
            this.DebugLogCopy.UseVisualStyleBackColor = false;
            this.DebugLogCopy.Click += new System.EventHandler(this.DebugLogCopy_click);
            // 
-            // CrashLogCopy
-            // 
-            this.CrashLogCopy.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor;
-            this.CrashLogCopy.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.CrashLogCopy.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.CrashLogCopy.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.CrashLogCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.CrashLogCopy.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.CrashLogCopy.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.CrashLogCopy.Location = new System.Drawing.Point(12, 296);
-            this.CrashLogCopy.Name = "CrashLogCopy";
-            this.CrashLogCopy.Size = new System.Drawing.Size(285, 31);
-            this.CrashLogCopy.TabIndex = 5;
-            this.CrashLogCopy.Text = "Copy CrashLog to Desktop";
-            this.CrashLogCopy.UseVisualStyleBackColor = false;
-            this.CrashLogCopy.Click += new System.EventHandler(this.CrashLogCopy_click);
-            // 
-            // debuglogID
-            // 
-            this.debuglogID.AutoSize = true;
-            this.debuglogID.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
-            this.debuglogID.Location = new System.Drawing.Point(15, 260);
-            this.debuglogID.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.debuglogID.Name = "debuglogID";
-            this.debuglogID.Size = new System.Drawing.Size(0, 18);
-            this.debuglogID.TabIndex = 14;
-            // 
            // crashlogID
            // 
            this.crashlogID.AutoSize = true;
-            this.crashlogID.Location = new System.Drawing.Point(13, 333);
-            this.crashlogID.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.crashlogID.Location = new System.Drawing.Point(17, 410);
            this.crashlogID.Name = "crashlogID";
-            this.crashlogID.Size = new System.Drawing.Size(0, 13);
+            this.crashlogID.Size = new System.Drawing.Size(0, 17);
            this.crashlogID.TabIndex = 15;
            // 
+            // button1
+            // 
+            this.button1.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor;
+            this.button1.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.button1.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.button1.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button1.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
+            this.button1.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
+            this.button1.Location = new System.Drawing.Point(16, 317);
+            this.button1.Margin = new System.Windows.Forms.Padding(4);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(380, 38);
+            this.button1.TabIndex = 5;
+            this.button1.Text = "Reset Debug Log";
+            this.button1.UseVisualStyleBackColor = false;
+            this.button1.Click += new System.EventHandler(this.button1_click);
+            // 
+            // debuglogID
+            // 
+            this.debuglogID.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
+            this.debuglogID.Location = new System.Drawing.Point(16, 411);
+            this.debuglogID.Name = "debuglogID";
+            this.debuglogID.Size = new System.Drawing.Size(380, 59);
+            this.debuglogID.TabIndex = 14;
+            this.debuglogID.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // DebugID
+            // 
+            this.DebugID.AccessibleRole = System.Windows.Forms.AccessibleRole.Row;
+            this.DebugID.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
+            this.DebugID.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.DebugID.Cursor = System.Windows.Forms.Cursors.Default;
+            this.DebugID.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold);
+            this.DebugID.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            this.DebugID.Location = new System.Drawing.Point(16, 375);
+            this.DebugID.Name = "DebugID";
+            this.DebugID.ReadOnly = true;
+            this.DebugID.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
+            this.DebugID.Size = new System.Drawing.Size(380, 27);
+            this.DebugID.TabIndex = 16;
+            this.DebugID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.DebugID.Click += new System.EventHandler(this.DebugID_Click);
+            // 
+            // label2
+            // 
+            this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
+            this.label2.Location = new System.Drawing.Point(16, 498);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(379, 106);
+            this.label2.TabIndex = 14;
+            this.label2.Text = "This is your most recent CrashLogID. Click on the CrashLogID to copy it to your" +
+    " clipboard.";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // textBox1
+            // 
+            this.textBox1.AccessibleRole = System.Windows.Forms.AccessibleRole.Row;
+            this.textBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
+            this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.textBox1.Cursor = System.Windows.Forms.Cursors.Default;
+            this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold);
+            this.textBox1.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            this.textBox1.Location = new System.Drawing.Point(16, 477);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.ReadOnly = true;
+            this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
+            this.textBox1.Size = new System.Drawing.Size(380, 27);
+            this.textBox1.TabIndex = 16;
+            this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBox1.Click += new System.EventHandler(this.textBox1_Click);
+            // 
            // SettingsForm
            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor;
-            this.ClientSize = new System.Drawing.Size(313, 372);
+            this.ClientSize = new System.Drawing.Size(417, 606);
+            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.DebugID);
            this.Controls.Add(this.crashlogID);
+            this.Controls.Add(this.label2);
            this.Controls.Add(this.debuglogID);
            this.Controls.Add(this.BandwithComboBox);
            this.Controls.Add(this.label1);
@@ -255,7 +316,7 @@
            this.Controls.Add(this.updateConfigCheckBox);
            this.Controls.Add(this.deleteAfterInstallCheckBox);
            this.Controls.Add(this.enableMessageBoxesCheckBox);
-            this.Controls.Add(this.CrashLogCopy);
+            this.Controls.Add(this.button1);
            this.Controls.Add(this.DebugLogCopy);
            this.Controls.Add(this.applyButton);
            this.Controls.Add(this.checkForUpdatesCheckBox);
@@ -263,6 +324,7 @@
            this.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "BackColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.ForeColor = System.Drawing.Color.White;
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "SettingsForm";
            this.ShowIcon = false;
            this.Text = "Settings";
@@ -287,8 +349,11 @@
        private System.Windows.Forms.Label label1;
        private System.Windows.Forms.ComboBox BandwithComboBox;
        private System.Windows.Forms.Button DebugLogCopy;
-        private System.Windows.Forms.Button CrashLogCopy;
        private System.Windows.Forms.Label crashlogID;
+        private System.Windows.Forms.Button button1;
        public System.Windows.Forms.Label debuglogID;
+        private System.Windows.Forms.TextBox DebugID;
+        public System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox textBox1;
    }
 }
--- a/SettingsForm.cs
+++ b/SettingsForm.cs
@@ -14,6 +14,8 @@ namespace AndroidSideloader

        private void SettingsForm_Load(object sender, EventArgs e)
        {
+            if (File.Exists($"{Environment.CurrentDirectory}\\{Properties.Settings.Default.CurrentCrashName}.txt"))
+                textBox1.Text = Properties.Settings.Default.CurrentCrashName;
            this.CenterToParent();
            if (!Properties.Settings.Default.CurrentLogName.Equals(null))
            {
@@ -27,8 +29,9 @@ namespace AndroidSideloader
            }


-            debuglogID.Text = "DEBUGLOG ID: " + Properties.Settings.Default.CurrentLogName;
-
+            debuglogID.Text = "This is your DebugLogID. Click on your DebugLogID to copy it to your clipboard.";
+            DebugID.Text = Properties.Settings.Default.CurrentLogName;
+            textBox1.Text = Properties.Settings.Default.CurrentCrashName;
            intSettings();
            intToolTips();
        }
@@ -67,10 +70,10 @@ namespace AndroidSideloader
        {
            if (File.Exists($"{Properties.Settings.Default.CurrentLogTitle}"))
            {
-                RCLONE.runRcloneCommand($"copy \"{Environment.CurrentDirectory}\\{Properties.Settings.Default.CurrentLogTitle}\" RSL-debuglog: --progress --drive-acknowledge-abuse --rc", Properties.Settings.Default.BandwithLimit);
-
-                MessageBox.Show($"Your debug log has been copied to the server. Please mention your DebugLog ID to the Mods\n\nDebugLog ID - {Properties.Settings.Default.CurrentLogName}");
+                RCLONE.runRcloneCommand($"copy \"{Environment.CurrentDirectory}\\{Properties.Settings.Default.CurrentLogName}.txt\" RSL-debuglogs:DebugLogs");

+                MessageBox.Show($"Your debug log has been copied to the server. Please mention your DebugLog ID ({Properties.Settings.Default.CurrentLogName}) to the Mods (it has been automatically copied to your clipboard).");
+                Clipboard.SetText(DebugID.Text);
            }
        }

@@ -88,8 +91,42 @@ namespace AndroidSideloader
            else
                MessageBox.Show("No crashlog found!");
        }
+        public void button1_click(object sender, EventArgs e)
+        {

+            if (File.Exists($"{Properties.Settings.Default.CurrentLogTitle}"))
+                File.Delete($"{Properties.Settings.Default.CurrentLogTitle}");
+            if (File.Exists($"{Environment.CurrentDirectory}\\debuglog.txt"))
+                File.Delete($"{Environment.CurrentDirectory}\\debuglog.txt");
+            if (!File.Exists(Properties.Settings.Default.CurrentLogTitle))
+            {
+                Random r = new Random();
+                int x = r.Next(6806);
+                int y = r.Next(6806);
+                if (File.Exists($"{Properties.Settings.Default.MainDir}\\notes\\nouns.txt"))
+                {
+                    string[] lines = File.ReadAllLines($"{Properties.Settings.Default.MainDir}\\notes\\nouns.txt");

+                    if (!File.Exists($"{Properties.Settings.Default.MainDir}\\notes\\nouns.txt"))
+                        File.WriteAllText("NOUNS.TXT MISSING", $"{ Properties.Settings.Default.MainDir}\\notes\\nouns.txt");
+                    string randomnoun = lines[new Random(x).Next(lines.Length)];
+                    string randomnoun2 = lines[new Random(y).Next(lines.Length)];
+                    Properties.Settings.Default.CurrentLogTitle = Properties.Settings.Default.MainDir + "\\" + randomnoun + "-" + randomnoun2 + ".txt";
+                    Properties.Settings.Default.CurrentLogName = Properties.Settings.Default.CurrentLogName.Replace(Properties.Settings.Default.MainDir, "");
+                    Properties.Settings.Default.Save();
+                    Properties.Settings.Default.CurrentLogName = Properties.Settings.Default.CurrentLogName.Replace($".txt", "");
+                    DebugID.Text = Properties.Settings.Default.CurrentLogName;
+                    Properties.Settings.Default.Save();
+                    
+                }
+                this.Close();
+            }
+
+            DebugID.Text = Properties.Settings.Default.CurrentLogName;
+            SettingsForm Form = new SettingsForm();
+            Form.Show();
+
+        }



@@ -174,6 +211,18 @@ namespace AndroidSideloader
            }
            return base.ProcessDialogKey(keyData);
        }
+
+        private void DebugID_Click(object sender, EventArgs e)
+        {
+            Clipboard.SetText(DebugID.Text);
+            MessageBox.Show("DebugLogID copied to clipboard! Paste it to a moderator/helper for assistance!");
+        }
+
+        private void textBox1_Click(object sender, EventArgs e)
+        {
+            Clipboard.SetText(textBox1.Text);
+            MessageBox.Show("CrashLogID copied to clipboard! Paste it to a moderator/helper for assistance!");
+        }
    }
 }

--- a/Updater.cs
+++ b/Updater.cs
@@ -17,7 +17,7 @@ namespace AndroidSideloader
        private static string RawGitHubUrl;
        private static string GitHubUrl;

-        static readonly public string LocalVersion = "2.2.1";
+        static readonly public string LocalVersion = "2.3";
        public static string currentVersion = string.Empty;
        public static string changelog = string.Empty;

--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,79 @@
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+RSL 2.3
+
+ Added UniqueID naming system and LOG uupload options for DebugLog and CrashLogs to help fix user problems much faster and systematically.
+NOTE: You must Download+Install at least one game game to update the remote config before tyrying to submit any Logs!
+
+= Fixed MAJOR obb copy bug. 
+IMPORTANT: Please Mount your Quest and check your /sdcard/android/obb folder for any folders that aren't formatted a website like this: com.blah.blah, if you have some there, delete them they are not supposed to be there.
+
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmD0uooACgkQx/Rql1Vo
+czcQig/6AkstnLYRNJBToM+cKF9bA/1Fu/HLPVahRYIgix10JKka1Lq+jbe/wQm+
+taa29k7e4YQWwWQJqO0exrK9oaXX8kavVcB/mRG9OR0Bn4xWAdC6GwKA4SKX9rog
+xdEh+zEuaOa2AsPQwjwxrFma9aYOtkIYpCcKTukZNrmmkIL71hKJJLD/dnhj7HLR
+VvMjdrASrMOO19apDMcSaceEbJ0leDbLTj6nrLxb9dNbrBUcC+lGJ8ZXrrwd1pai
+um0uHMXboYbZ7KXMzgXX9lRjt5Csl0XkOPLmmhoGSolazfmdFvswgQ4bouq2SwYw
+Fme0hQlyZjr6wmnOFI16ZKDRgTl6tnMch+oAeU9kf6NxMqKFiFDKPp7EEeNBfMKk
+olyWS4D16UYEE7e+R9xA2rD+WwyrZsv5J5OghgIXjcfuHY8nXzSITlgvt+igOt3Q
+OWC8AHI5L/PgYwv/Z6vIDjEcPbMvsVpEpvE2KL8KIA1+2JAkSNxGpdv1h2pxixSr
+sqXeMASTfKBVIZu5mNsWSG/MHYFk7/rgEpWnTjF8Dmw0ZHxPd9OMOu8jZ3EH0gBz
+lYLAcZcpSC8itMN1hxdluwYT9MvXqJ5+NBEYdCUy1rhHOuoad1cnkizqgiHuOVqw
+ZF9xcPCZdA+5HhEqASlt60+kFQ3Z53j68kOsCLNDU2cwWF+rxO4=
+=L7zi
+-----END PGP SIGNATURE-----
+
+
+
 2.2.1
 Turned bold font off.
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+RSL 2.2
+
+ Added custom naming scheme to Debug Log. Debug Log now uses 2 random nouns as its name when generated.
+ Added shortcut commands. Press F1 to see list of shortcuts.
+
+  F1  = Shortcuts List
+  F2  = Search
+  F3  = Quest Options
+  F4  = Rookie Settings
+  F5  = Refresh Games List
+  F11 = Copy Debug log to Desktop.
+  F12 = Copy Crash Log to Desktop (if one exists).
+ 
+  CTRL + R  = Run custom ADB command.
+  CTRL + F  = Search
+  CTRL + P  = Copy package name of selected game to Clipboard.
+  CTRL + F4 = Restart program.
+
+ Added ability to upload debug logs to remote server (the server should be updated to reflect this sometime this week!)
+= If Install.txt exists apk install and Obb copy will only be run from install.txt - this is to prevent double copy of obb files or double install of APKS.
+= Fixed issue where if user started DL+install on one title then quickly selected a different title in the games list it would download the newly selected item instead of the originally intended item.
+= Fixed issue that caused download progress bar to not work if multiple items were queued.
+= Fixed other obb copying issues.
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmDzKesACgkQx/Rql1Vo
+czeiXQ/+OsH5CdnShheJR85/uIkVLGDf75Hkybj7k+5gV688imYwWbCRarudqa8k
+aVC5g69mdKD8rD8DzWjccpFwxvOSq5MRQMWB/Nl/M2142Rnr1M4WdP6xEmMq1qmQ
+X39T3tdpgxxKyDPIt4EX/iLT6qSHdB69qFtMeEoOsHmisqGDFDCHGs835VUUL9FU
+PaZ218Dd07r9/W9cJKX5EI/ihWZ5lv+0defBofQu2A8GCOXzuWIudLtcG5uYIJwO
+9frevYIKteuq+MmcXedgu3uWUb0CnQ+tEyShPYjTdrFdMJYgFrOzIIlogBWK5fm3
+cp8YSzeHJpBnD8qQar/W92WTTzvWd7I9vk7YB/Pdn6MIzzTJX540R2fu2rwsYBCG
+DciqA8+V5sDx5eRmrcUxrmxrsDMPlbpqos0R+yujCHyiLHzt1d/oEohZ/mNw24y4
+3MrjGyzlJqRZZFnaMLGNooLBrT9EeGcTXk/MgJjSO1XQjCVAWmrrsEHCXqcKwi8i
+IW5OMKld80wqWr79LRF6dPxjcuwRgVE8mNd6G6qedX5TXvqjHUEVymMLFFvhVQnQ
+QnOHX0HzWXF/64ghD6r3OR4pQ8C5xb7Z6tEwXX7soQVo610m7nJT1zaHm2m9HSJN
+AA1bdfK9SEKXl3KJT7SCEnQ/2ED6Qr/VBFXcJB/10Il/n8AdJ2o=
+=DFRR
+-----END PGP SIGNATURE-----

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
@@ -823,7 +897,12 @@ DFKYJpBgATHdRTwt7/zZwJCBq0ONheA/6+6VYj8x8Q5rqbiDDdc=
 + Disk space label and check
 + Checks game size before download
 = Download and install game button outputs adb log now
- - Launch package name button and textbox
+ - Launch package name button and 
+
+
+
+
+

 1.5
 + Added ETA, based on CURRENT DOWNLOAD SPEED NOT DELTA OF IT
--- a/2
+++ b/2
@@ -1 +1 @@
-2.2.1
+2.3
Author	SHA1	Message	Date
Harry Fn Potter	d154d67c57	BeugLog server support, MAJOR OBB BREAK FIX.	2021-07-18 19:42:10 -04:00
Harry Fn Potter	fb9d4ab0d3	Fixed debuglog code issues until server until debuglog server is live	2021-07-18 01:25:27 -04:00
harryeffinpotter	2f34ac8848	Merge pull request #67 from SamHoque/master bugs/download-progress-bar-not-working-as-intended	2021-07-17 20:13:25 -04:00
Harry Fn Potter	9e352c3144	changelog to add 2.1.1 hotfix	2021-07-17 15:45:13 -04:00
Sam Hoque	d66e6f55d3	bugs/download-progress-bar-not-working-as-intended - Fixed the progress bar being stuck in marquee mode.	2021-07-17 14:25:05 +06:00
@@ -1 +1 @@
 .2.1
 .3