The file browser will now retrieve your home directory when you use it on a server for the first time.

seediffusion · seediffusion · commit 7ae0b8456d51 · 2025-11-06T15:46:30.000Z
diff --git a/dialogs.py b/dialogs.py
@@ -10,7 +10,6 @@
 from sftp_helpers import upload_item, download_item, delete_item
 
 def human_readable_size(size_bytes):
-    """Converts a size in bytes to a human-readable format."""
     if size_bytes < 1024:
         return f"{size_bytes} B"
     size_name = ("B", "KB", "MB", "GB", "TB")
@@ -23,7 +22,6 @@ def human_readable_size(size_bytes):
     except (ValueError, IndexError):
         return str(size_bytes)
 
-
 class AddServerDialog(wx.Dialog):
     def __init__(self, parent, title="Add SSH Server", server_to_edit=None):
         super(AddServerDialog, self).__init__(parent, title=title, size=(400, 420))
@@ -154,12 +152,16 @@ def get_data(self):
         return data
 
 class FileBrowserDialog(wx.Dialog):
-    def __init__(self, parent, sftp_client, edit_callback):
+    def __init__(self, parent, sftp_client, edit_callback, initial_path=None):
         super(FileBrowserDialog, self).__init__(parent, title="SFTP File Browser", size=(600, 480))
         
-        self.sftp, self.current_path, self.edit_callback = sftp_client, sftp_client.getcwd() or "/", edit_callback
-        self.progress_dialog, self.copy_temp_dir = None, None
-        
+        self.sftp = sftp_client
+        # --- FIX: The initial path is now guaranteed to be valid if provided. ---
+        self.current_path = initial_path or "/"
+        self.edit_callback = edit_callback
+        self.progress_dialog = None
+        self.copy_temp_dir = None
+
         panel = wx.Panel(self)
         self.vbox = wx.BoxSizer(wx.VERTICAL)
         self.path_text = wx.StaticText(panel, label=self.current_path)
@@ -169,7 +171,6 @@ def __init__(self, parent, sftp_client, edit_callback):
         self.file_list.InsertColumn(1, "Size", width=100)
         self.file_list.InsertColumn(2, "Type", width=100)
         self.vbox.Add(self.file_list, 1, wx.ALL|wx.EXPAND, 5)
-        
         hbox_buttons = wx.BoxSizer(wx.HORIZONTAL)
         self.upload_button = wx.Button(panel, label="&Upload")
         self.new_button = wx.Button(panel, label="&New...")
@@ -178,7 +179,6 @@ def __init__(self, parent, sftp_client, edit_callback):
         self.edit_button = wx.Button(panel, label="&Edit")
         self.delete_button = wx.Button(panel, label="&Delete")
         close_button = wx.Button(panel, label="&Close", id=wx.ID_CANCEL)
-        
         hbox_buttons.Add(self.upload_button)
         hbox_buttons.Add(self.new_button, flag=wx.LEFT, border=5)
         hbox_buttons.Add(self.download_button, flag=wx.LEFT, border=5)
@@ -188,11 +188,9 @@ def __init__(self, parent, sftp_client, edit_callback):
         hbox_buttons.AddStretchSpacer()
         hbox_buttons.Add(close_button)
         self.vbox.Add(hbox_buttons, 0, wx.ALL|wx.EXPAND, 5)
-        
         self.status_text = wx.StaticText(panel, label=" ")
         self.vbox.Add(self.status_text, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.EXPAND, 5)
         panel.SetSizer(self.vbox)
-
         self.Bind(wx.EVT_ACTIVATE, self.on_activate)
         self.file_list.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.on_item_activated)
         self.file_list.Bind(wx.EVT_LIST_ITEM_SELECTED, self.on_selection_changed)
@@ -205,15 +203,16 @@ def __init__(self, parent, sftp_client, edit_callback):
         self.copy_button.Bind(wx.EVT_BUTTON, self.on_copy)
         self.delete_button.Bind(wx.EVT_BUTTON, self.on_delete)
         self.Bind(wx.EVT_CLOSE, self.on_close)
-
         theme.apply_dark_theme(self)
         self.populate_files()
 
+    def get_current_path(self):
+        return self.current_path
+        
     def on_activate(self, event):
-        if event.GetActive():
-            self.populate_files()
+        if event.GetActive(): self.populate_files()
         event.Skip()
-
+        
     def populate_files(self):
         self.path_text.SetLabel(f"Path: {self.current_path}")
         self.file_list.DeleteAllItems()
@@ -231,6 +230,8 @@ def populate_files(self):
                     self.file_list.SetItem(index, 2, "File")
         except Exception as e:
             wx.MessageBox(f"Could not list directory: {e}", "SFTP Error", wx.ICON_ERROR)
+            # If the path is invalid, fall back to root
+            self.current_path = "/"
         self.on_selection_changed(None)
 
     def on_close(self, event):
@@ -419,7 +420,6 @@ def on_edit_button(self, event):
         remote_paths = self.get_selected_remote_paths()
         if remote_paths:
             self.edit_callback(remote_paths[0])
-            # self.Close() # This is correctly removed now.
 
     def on_paste_upload(self, event):
         data = wx.FileDataObject()
diff --git a/teatype.py b/teatype.py
@@ -1,5 +1,3 @@
-# --- START OF FILE teatype.py ---
-
 import wx
 import json
 import os
@@ -16,69 +14,69 @@
 
 class MainFrame(wx.Frame, SettingsMenuMixin):
     def __init__(self):
-        # --- FIX: Renamed application ---
         super().__init__(None, title="Teatype - Server Manager", size=(600, 400))
-        
         SettingsMenuMixin.__init__(self)
-        
         self.servers = []
-        
         panel = wx.Panel(self)
         vbox = wx.BoxSizer(wx.VERTICAL)
-
         self.list_ctrl = wx.ListCtrl(panel, style=wx.LC_REPORT | wx.LC_SINGLE_SEL)
         self.list_ctrl.InsertColumn(0, "Name", width=150)
         self.list_ctrl.InsertColumn(1, "Hostname", width=150)
         self.list_ctrl.InsertColumn(2, "Port", width=60)
         self.list_ctrl.InsertColumn(3, "Username", width=120)
         vbox.Add(self.list_ctrl, 1, wx.EXPAND | wx.ALL, 5)
-
         hbox = wx.BoxSizer(wx.HORIZONTAL)
         self.connect_btn = wx.Button(panel, label="&Connect")
         self.add_btn = wx.Button(panel, label="&Add")
         self.edit_btn = wx.Button(panel, label="&Edit")
         self.remove_btn = wx.Button(panel, label="&Remove")
-        
         hbox.Add(self.connect_btn)
         hbox.Add(self.add_btn, flag=wx.LEFT, border=5)
         hbox.Add(self.edit_btn, flag=wx.LEFT, border=5)
         hbox.Add(self.remove_btn, flag=wx.LEFT, border=5)
         vbox.Add(hbox, 0, wx.ALIGN_CENTER | wx.BOTTOM | wx.TOP, 5)
-        
         panel.SetSizer(vbox)
-
         self.Bind(wx.EVT_BUTTON, self.on_connect, self.connect_btn)
         self.Bind(wx.EVT_BUTTON, self.on_add, self.add_btn)
         self.Bind(wx.EVT_BUTTON, self.on_edit, self.edit_btn)
         self.Bind(wx.EVT_BUTTON, self.on_remove, self.remove_btn)
         self.list_ctrl.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.on_connect)
         self.list_ctrl.Bind(wx.EVT_LIST_ITEM_SELECTED, self.on_selection_changed)
         self.list_ctrl.Bind(wx.EVT_LIST_ITEM_DESELECTED, self.on_selection_changed)
-        
         theme.apply_dark_theme(self)
-        
         self.load_servers()
         self.populate_list()
         self.Centre()
         self.Show()
-    
-    # ... (The rest of the file is unchanged) ...
+
+    def update_server_last_path(self, server_name, last_path):
+        """Finds a server by name and updates its last_path."""
+        for server in self.servers:
+            if server.get("name") == server_name:
+                server["last_path"] = last_path
+                self.save_servers()
+                break
+
     def update_button_states(self):
         has_selection = self.list_ctrl.GetFirstSelected() != -1
         self.connect_btn.Enable(has_selection)
         self.remove_btn.Enable(has_selection)
         self.edit_btn.Enable(has_selection)
+        
     def on_selection_changed(self, event):
         self.update_button_states()
         event.Skip()
+        
     def load_servers(self):
         if os.path.exists(SERVERS_FILE):
             try:
                 with open(SERVERS_FILE, "r") as f: self.servers = json.load(f)
             except json.JSONDecodeError: self.servers = []
         else: self.servers = []
+        
     def save_servers(self):
         with open(SERVERS_FILE, "w") as f: json.dump(self.servers, f, indent=4)
+        
     def populate_list(self):
         self.list_ctrl.DeleteAllItems()
         for i, server in enumerate(self.servers):
@@ -87,6 +85,7 @@ def populate_list(self):
             self.list_ctrl.SetItem(i, 2, str(server["port"]))
             self.list_ctrl.SetItem(i, 3, server["user"])
         self.update_button_states()
+        
     def on_add(self, event):
         with AddServerDialog(self, title="Add SSH Server") as dlg:
             if dlg.ShowModal() == wx.ID_OK:
@@ -107,6 +106,7 @@ def on_add(self, event):
                 self.servers.append(new_server)
                 self.save_servers()
                 self.populate_list()
+                
     def on_edit(self, event):
         selected_index = self.list_ctrl.GetFirstSelected()
         if selected_index == -1: return
@@ -124,20 +124,26 @@ def on_edit(self, event):
                         store_password(server_name=new_data["name"], host=new_data["host"], user=new_data["user"], password=new_data["password"])
                     elif new_data["auth_method"] == "key" and new_data["passphrase"]:
                         store_passphrase(server_name=new_data["name"], host=new_data["host"], user=new_data["user"], passphrase=new_data["passphrase"])
-                updated_server = {
+                
+                updated_server = original_server.copy()
+                updated_server.update({
                     "name": new_data["name"], "host": new_data["host"], "port": new_data["port"],
                     "user": new_data["user"], "auth_method": new_data["auth_method"],
                     "password_stored": new_data["store_credential"]
-                }
+                })
+
                 if new_data["auth_method"] == "key":
                     updated_server["key_path"] = new_data["key_path"]
                     if new_data["passphrase"]:
                         updated_server["has_passphrase"] = True
                     else:
-                        updated_server["has_passphrase"] = original_server.get("has_passphrase", False)
+                        # If the passphrase field was cleared, we must update has_passphrase
+                        updated_server["has_passphrase"] = False
+                
                 self.servers[selected_index] = updated_server
                 self.save_servers()
                 self.populate_list()
+
     def on_remove(self, event):
         selected_index = self.list_ctrl.GetFirstSelected()
         if selected_index != -1:
@@ -153,6 +159,7 @@ def on_remove(self, event):
                 self.servers.pop(selected_index)
                 self.save_servers()
                 self.populate_list()
+                
     def on_connect(self, event):
         selected_index = -1
         if isinstance(event, wx.ListEvent):
@@ -181,7 +188,7 @@ def on_connect(self, event):
             if server_info.get("password_stored"):
                 passphrase = get_passphrase(server_name=server_info["name"], host=server_info["host"], user=server_info["user"])
             if passphrase is None and server_info.get("has_passphrase", False):
-                with wx.PasswordEntryDialog(self, f"Enter passphrase for key\n{server_info['key_path']}", "Passphrase Required") as dlg:
+                with wx.PasswordEntryDialog(self, f"Enter passphrase for key\n{server_info['key_path']}", "Passphrase Required", "Passphrase Required (leave blank if none)") as dlg:
                     if dlg.ShowModal() == wx.ID_OK: passphrase = dlg.GetValue()
                     else: return
             connect_kwargs['passphrase'] = passphrase
diff --git a/terminal_frame.py b/terminal_frame.py
@@ -1,3 +1,5 @@
+# --- START OF FILE terminal_frame.py ---
+
 import wx
 import paramiko
 import threading
@@ -17,15 +19,15 @@
 
 class TerminalFrame(wx.Frame, SettingsMenuMixin):
     def __init__(self, parent, server_info, connect_kwargs):
-        # ... (init setup is the same) ...
         self.server_info = server_info
         self.connect_kwargs = connect_kwargs
-        title = f"Teatype TTY - {server_info['name']} ({server_info['user']}@{server_info['host']})"
+        title = f"Teatype - {server_info['name']} ({server_info['user']}@{server_info['host']})"
         super(TerminalFrame, self).__init__(parent, title=title, size=(800, 600))
         SettingsMenuMixin.__init__(self)
         self.sftp_client = None
         self.temp_dir = tempfile.mkdtemp(prefix="teatype_")
         self.open_files = set()
+        self.sftp_last_path = self.server_info.get("last_path")
         panel = wx.Panel(self)
         sizer = wx.BoxSizer(wx.VERTICAL)
         output_label = wx.StaticText(panel, label="&Server Output:")
@@ -35,7 +37,6 @@ def __init__(self, parent, server_info, connect_kwargs):
         self.output_ctrl.SetFont(font)
         sizer.Add(self.output_ctrl, 1, wx.EXPAND | wx.LEFT | wx.RIGHT | wx.BOTTOM, 5)
         hbox = wx.BoxSizer(wx.HORIZONTAL)
-        # --- FIX: Added shortcut to button label ---
         self.browse_files_btn = wx.Button(panel, label="&Browse Files (SFTP)")
         self.browse_files_btn.Disable()
         hbox.Add(self.browse_files_btn)
@@ -63,11 +64,12 @@ def __init__(self, parent, server_info, connect_kwargs):
         self.start_ssh_thread()
         self.Show()
 
-    # ... (all other methods are unchanged and correct) ...
     def on_browse_files(self, event):
         if self.sftp_client:
-            with FileBrowserDialog(self, self.sftp_client, edit_callback=self.open_file_for_edit) as dlg:
+            with FileBrowserDialog(self, self.sftp_client, self.open_file_for_edit, initial_path=self.sftp_last_path) as dlg:
                 dlg.ShowModal()
+                self.sftp_last_path = dlg.get_current_path()
+    
     def open_file_for_edit(self, remote_path):
         if remote_path in self.open_files:
             wx.MessageBox(f"This file is already open for editing.", "Already Open", wx.ICON_INFORMATION)
@@ -81,21 +83,27 @@ def open_file_for_edit(self, remote_path):
             EditorFrame(self, title, local_path, remote_path, self.sftp_client)
         except Exception as e:
             wx.MessageBox(f"Failed to open file for editing: {e}", "SFTP Error", wx.ICON_ERROR)
+    
     def notify_editor_closed(self, remote_path):
         if remote_path in self.open_files:
             self.open_files.remove(remote_path)
+
     def on_close(self, event):
         try:
-            if os.path.exists(self.temp_dir):
-                shutil.rmtree(self.temp_dir)
+            if os.path.exists(self.temp_dir): shutil.rmtree(self.temp_dir)
         except Exception as e:
             print(f"Warning: Could not remove temp directory {self.temp_dir}: {e}")
+        
+        if self.Parent and self.sftp_last_path:
+            self.Parent.update_server_last_path(self.server_info['name'], self.sftp_last_path)
+
         self.stop_event.set()
         if self.ssh_thread and self.ssh_thread.is_alive():
             self.ssh_thread.join(timeout=2)
         if self.sftp_client: self.sftp_client.close()
         if self.ssh_client: self.ssh_client.close()
         self.Destroy()
+        
     def on_key_down(self, event):
         key_code = event.GetKeyCode()
         is_ctrl_down = event.ControlDown()
@@ -106,10 +114,12 @@ def on_key_down(self, event):
             if self.ssh_channel: self.command_queue.put('\x03')
             return
         event.Skip()
+        
     def start_ssh_thread(self):
         self.ssh_thread = threading.Thread(target=self.ssh_worker)
         self.ssh_thread.daemon = True
         self.ssh_thread.start()
+        
     def on_command_enter(self, event):
         if not wx.GetKeyState(wx.WXK_SHIFT):
             if self.ssh_channel:
@@ -120,23 +130,36 @@ def on_command_enter(self, event):
             current_pos = self.input_ctrl.GetInsertionPoint()
             self.input_ctrl.WriteText('\n')
             self.input_ctrl.SetInsertionPoint(current_pos + 1)
+            
     def append_output(self, text):
         self.output_ctrl.AppendText(text)
         clean_text_for_speech = text.strip()
         if clean_text_for_speech:
             speak(clean_text_for_speech, interrupt=False)
+            
     def filter_control_characters(self, text: str) -> str:
         return "".join(c for c in text if c.isprintable() or c in ('\n', '\t'))
+        
     def ssh_worker(self):
         try:
             self.ssh_client = paramiko.SSHClient()
             self.ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
             wx.CallAfter(self.append_output, f"Connecting to {self.connect_kwargs['hostname']}...\n")
             self.ssh_client.connect(**self.connect_kwargs, timeout=10)
+            
+            # --- FIX: Get the home directory reliably ---
+            # Use exec_command for a single, non-interactive command
+            stdin, stdout, stderr = self.ssh_client.exec_command('pwd')
+            home_dir = stdout.read().decode('utf-8').strip()
+            if home_dir and not self.sftp_last_path:
+                self.sftp_last_path = home_dir
+
             self.ssh_channel = self.ssh_client.invoke_shell(term='xterm')
             self.sftp_client = self.ssh_client.open_sftp()
+
             wx.CallAfter(self.append_output, "Connection established.\n")
             wx.CallAfter(self.browse_files_btn.Enable)
+            
             while not self.stop_event.is_set():
                 if self.ssh_channel.exit_status_ready(): break 
                 if self.ssh_channel.recv_ready():
diff --git a/vdata.yml b/vdata.yml
@@ -1,4 +1,4 @@
-Version: 1.1.0.0
+Version: 1.2.0.0
 CompanyName: Seediffusion
 FileDescription: Teatype
 InternalName: CDFN.Teatype

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Version: 1.1.0.0`
	`1`	`+Version: 1.2.0.0`
`2`	`2`	`CompanyName: Seediffusion`
`3`	`3`	`FileDescription: Teatype`
`4`	`4`	`InternalName: CDFN.Teatype`