JMR-dev/android-assistant
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Disabled start transfer button until user selects paths

Browse Source
This commit is contained in:
JMR-dev
2025-08-25 11:18:48 -05:00
committed by Jason Ross
parent 2930bdb081
commit 0c1c66e451
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/file_browser.py
+8 -1
View File
@@ -11,10 +11,11 @@ from tkinter import messagebox, ttk
class AndroidFileBrowser:
"""Android filesystem browser for Windows using ADB."""
def __init__(self, parent_window, adb_manager, remote_path_var):
def __init__(self, parent_window, adb_manager, remote_path_var, path_changed_callback=None):
self.parent = parent_window
self.adb_manager = adb_manager
self.remote_path_var = remote_path_var
self.path_changed_callback = path_changed_callback
def show_browser(self, direction="pull"):
"""Show a browsable Android folder tree.
@@ -469,11 +470,15 @@ class AndroidFileBrowser:
else:
# It's a file and we're in pull mode - select the file path directly
self.remote_path_var.set(item_path)
if self.path_changed_callback:
self.path_changed_callback()
browser_window.destroy()
return
elif len(item_values) >= 2 and item_values[1] == "folder":
# It's a folder - select the folder path directly
self.remote_path_var.set(item_path)
if self.path_changed_callback:
self.path_changed_callback()
browser_window.destroy()
return
@@ -481,6 +486,8 @@ class AndroidFileBrowser:
current_path = current_path_var.get()
if current_path and current_path.strip():
self.remote_path_var.set(current_path)
if self.path_changed_callback:
self.path_changed_callback()
browser_window.destroy()
else:
selection_type = "folder" if direction == "push" else "file or folder"
src/gui/main_window.py
+37 -3
View File
@@ -139,7 +139,7 @@ class AndroidFileHandlerGUI(tk.Tk):
# Start/Recheck button (will change based on device state)
self.start_btn = tk.Button(
self, text="Start Transfer", command=self.handle_button_click
self, text="Start Transfer", command=self.handle_button_click, state="disabled"
)
self.start_btn.pack(pady=10)
@@ -158,7 +158,7 @@ class AndroidFileHandlerGUI(tk.Tk):
# Browser component
self.browser = AndroidFileBrowser(
self, self.adb_manager, self.remote_path_var
self, self.adb_manager, self.remote_path_var, self._validate_paths_and_update_button
)
def _update_progress(self, percentage):
@@ -178,6 +178,30 @@ class AndroidFileHandlerGUI(tk.Tk):
self.after(0, update_ui)
def _validate_paths_and_update_button(self):
"""Check if both paths are selected and update button state accordingly."""
remote_path = self.remote_path_var.get().strip()
local_path = self.local_path_var.get().strip()
# Check if both paths are set and not the default placeholder text
remote_selected = remote_path and remote_path != "Please select file or folder ->"
local_selected = local_path and local_path != "Please select file or folder ->"
# Only manage state if button is in "Start Transfer" mode
if self.start_btn.cget("text") == "Start Transfer":
if remote_selected and local_selected:
self.start_btn.config(state="normal")
else:
self.start_btn.config(state="disabled")
def _clear_paths_and_disable_button(self):
"""Clear path selections and disable the transfer button."""
self.remote_path_var.set("Please select file or folder ->")
self.local_path_var.set("Please select file or folder ->")
# Only disable if button is in "Start Transfer" mode
if self.start_btn.cget("text") == "Start Transfer":
self.start_btn.config(state="disabled")
def _start_transfer_animation(self):
"""Start the 'Transferring...' animation."""
print("[DEBUG] Starting transfer animation")
@@ -283,6 +307,7 @@ class AndroidFileHandlerGUI(tk.Tk):
# If user cancels both dialogs, selected_path will be empty and nothing happens
if selected_path:
self.local_path_var.set(selected_path)
self._validate_paths_and_update_button()
else: # pull direction
# For pull, only allow folder selection (destination)
@@ -292,6 +317,7 @@ class AndroidFileHandlerGUI(tk.Tk):
)
if folder:
self.local_path_var.set(folder)
self._validate_paths_and_update_button()
def disable_controls(self):
"""Disable UI controls during operations."""
@@ -341,8 +367,10 @@ class AndroidFileHandlerGUI(tk.Tk):
def _switch_to_transfer_mode(self):
"""Switch button to transfer mode."""
self.start_btn.config(
text="Start Transfer", command=self.start_transfer, state="normal"
text="Start Transfer", command=self.start_transfer
)
# Only enable if both paths are selected, otherwise keep disabled
self._validate_paths_and_update_button()
def _switch_to_cancel_mode(self):
"""Switch button to cancel transfer mode."""
@@ -530,6 +558,8 @@ class AndroidFileHandlerGUI(tk.Tk):
transfer_desc = "File" if is_file else "Folder"
self._update_status(f"{transfer_desc} transfer completed successfully.")
self.show_disable_debugging_reminder()
# Clear paths and disable button for next transfer
self.after(0, self._clear_paths_and_disable_button)
except Exception as e:
if self.current_transfer_id == transfer_id:
self._stop_transfer_animation()
@@ -554,6 +584,8 @@ class AndroidFileHandlerGUI(tk.Tk):
self._stop_transfer_animation()
self._update_status("Transfer completed successfully.")
self.show_disable_debugging_reminder()
# Clear paths and disable button for next transfer
self.after(0, self._clear_paths_and_disable_button)
except Exception as e:
if self.current_transfer_id == transfer_id:
self._stop_transfer_animation()
@@ -577,6 +609,8 @@ class AndroidFileHandlerGUI(tk.Tk):
self._stop_transfer_animation()
self._update_status("Transfer completed successfully.")
self.show_disable_debugging_reminder()
# Clear paths and disable button for next transfer
self.after(0, self._clear_paths_and_disable_button)
except Exception as e:
if self.current_transfer_id == transfer_id:
self._stop_transfer_animation()