From e455f3b573fdd60123461022dab5197fa8ec23d0 Mon Sep 17 00:00:00 2001 From: Luke Brewer <79376204+lukbrew25@users.noreply.github.com> Date: Fri, 3 Oct 2025 20:45:02 -0500 Subject: [PATCH 1/4] Add example text in new device config fields --- openadbshell.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openadbshell.py b/openadbshell.py index d0b7777..9d89046 100644 --- a/openadbshell.py +++ b/openadbshell.py @@ -198,7 +198,7 @@ def clear_all_devices(): def add_device(): """Add a new empty row to the device table.""" - device_tree.insert('', 'end', values=('', '', 'N')) + device_tree.insert('', 'end', values=('EXAMPLE_NAME', 'IP:PORT', 'N')) def delete_selected_device(): """Delete the selected device from the table.""" From 596ca7261bf1ce94a5bc616d41fec7dbf863def4 Mon Sep 17 00:00:00 2001 From: Luke Brewer <79376204+lukbrew25@users.noreply.github.com> Date: Fri, 3 Oct 2025 20:49:14 -0500 Subject: [PATCH 2/4] Use os.path.join() more commonly instead of direct path strings --- openadbshell.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openadbshell.py b/openadbshell.py index 9d89046..6b72c68 100644 --- a/openadbshell.py +++ b/openadbshell.py @@ -16,7 +16,7 @@ from threading import Thread, Event -adb_path = "adb\\adb.exe" +adb_path = "os.path.join("adb", "adb.exe")" def save_config(): @@ -161,7 +161,7 @@ def save_and_close(): if not os.path.exists(adb_path): messagebox.showerror("Error", "Selected ADB executable not " "found. Resetting to default.") - adb_path_var.set("adb\\adb.exe") + adb_path_var.set("os.path.join("adb", "adb.exe")") save_config() # Save devices from the table @@ -248,7 +248,7 @@ def browse_adb(): def reset_adb(): """Reset the ADB path to the default relative path.""" - adb_path_var.set("adb\\adb.exe") + adb_path_var.set(os.path.join("adb", "adb.exe")) def set_to_path(): """Set the ADB path to just 'adb' to use the system PATH.""" @@ -377,7 +377,7 @@ def reset_all(): do_cust_command = True rich_presence = True do_mods = False - adb_path = "adb\\adb.exe" + adb_path = "os.path.join("adb", "adb.exe")" cust_command_var.set(do_cust_command) rich_presence_var.set(rich_presence) do_mods_var.set(do_mods) From 4fc1f380b2685c787c2a9a9e7e32550cd5c8a48b Mon Sep 17 00:00:00 2001 From: Luke Brewer <79376204+lukbrew25@users.noreply.github.com> Date: Fri, 3 Oct 2025 20:52:35 -0500 Subject: [PATCH 3/4] Fix re-occuring syntax error --- openadbshell.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openadbshell.py b/openadbshell.py index 6b72c68..317df85 100644 --- a/openadbshell.py +++ b/openadbshell.py @@ -16,7 +16,7 @@ from threading import Thread, Event -adb_path = "os.path.join("adb", "adb.exe")" +adb_path = os.path.join("adb", "adb.exe") def save_config(): @@ -377,7 +377,7 @@ def reset_all(): do_cust_command = True rich_presence = True do_mods = False - adb_path = "os.path.join("adb", "adb.exe")" + adb_path = os.path.join("adb", "adb.exe") cust_command_var.set(do_cust_command) rich_presence_var.set(rich_presence) do_mods_var.set(do_mods) From 1e0f9164e7c798aa8fcd6bb172c7c3a7198fe20e Mon Sep 17 00:00:00 2001 From: Luke Brewer <79376204+lukbrew25@users.noreply.github.com> Date: Fri, 3 Oct 2025 20:53:44 -0500 Subject: [PATCH 4/4] Additional re-occuring syntax error fix --- openadbshell.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openadbshell.py b/openadbshell.py index 317df85..f1eba6d 100644 --- a/openadbshell.py +++ b/openadbshell.py @@ -161,7 +161,7 @@ def save_and_close(): if not os.path.exists(adb_path): messagebox.showerror("Error", "Selected ADB executable not " "found. Resetting to default.") - adb_path_var.set("os.path.join("adb", "adb.exe")") + adb_path_var.set(os.path.join("adb", "adb.exe")) save_config() # Save devices from the table