commandertui 1.3.1__tar.gz → 1.4.0__tar.gz

{commandertui-1.3.1 → commandertui-1.4.0}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.3.1
+Version: 1.4.0
 Summary: Dual-pane retro terminal file manager: compare, sync, copy and move folders
 Author: Humberto Barchini
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/juniorbarchini-oss/commandertui
 Classifier: Environment :: Console
+Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: System :: Filesystems
@@ -22,7 +23,7 @@ Dual-pane terminal file manager: compare two folders, sync them, or move
 files/folders between them (and to USB/SMB/any mounted path) — with a
 phosphor-green 80s-terminal look and a short modem-style boot animation.
 
-Status: **v1.3.1** — 127/127 tests passing. MIT licensed.
+Status: **v1.4.0** — 153/153 tests passing. MIT licensed.
 
 ---
 
@@ -123,7 +124,7 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | Key | Action |
 |---|---|
 | `Tab` | Switch active pane |
-| `↑`/`↓`, `Enter` | Navigate, open directory |
+| `↑`/`↓`, `Enter` | Navigate, open directory (or sort column when header is focused with `↑` beyond row 0) |
 | `Backspace` | Go to parent directory |
 | `Space` | Mark/unmark item under cursor |
 | `F2` | Rename the item under the cursor (never overwrites an existing name) |
@@ -135,10 +136,11 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `/` | Filter the active pane by name (contains, ignores case) as you type; `Enter` keeps it, `Esc` clears it |
 | `+` / `-` / `*` | Mark / unmark by pattern (`*.iso`, or plain text = contains) / invert marks, over the rows shown |
 | `u` | Check for updates now (also the **Updates** button): asks PyPI right away and offers the new version if there is one |
+| `v` | Quick Look file preview (macOS only): opens `qlmanage -p` for the file under cursor; press `v` again or close the window to dismiss |
 | `i` | Size: file/folder count and total bytes of marked items (background, `Esc` stops it) |
 | `h` | Show/hide hidden (dot) files in both panes |
 | `t` | Color theme: Phosphor green (default), Phosphor amber, Nord, Gruvbox, Dracula, Tokyo Night, Catppuccin Mocha, Solarized Dark, Monokai, Textual Dark. Previews as you move, Enter keeps it (saved in `~/.config/commandertui/settings.json`), Esc goes back |
-| `p` | Places: jump to a mounted drive (USB/SMB/rclone), saved bookmark or saved network location. Inside: `a` add a network location, `s` save the active pane's folder as a bookmark, `d` delete a saved one |
+| `p` | Places: jump to a mounted drive (USB/SMB/rclone), saved bookmark or saved network location. Inside: `a` add a network location, `s` save the active pane's folder as a bookmark, `d` delete a saved one, `e` unmount a mounted SMB share |
 | `c` | Compare: full recursive diff between the two panes' current folders, with size and date of both sides (and which is newer when a file changed) |
 | `r` | Refresh both panes |
 | `q` | Quit |
@@ -153,13 +155,13 @@ half-written), and a move never removes a source it didn't fully copy.
 on-demand mount point doesn't show), GVFS/Nautilus network shares, FUSE
 mounts inside `$HOME` (e.g. `rclone mount`), and saved bookmarks.
 
-**Network locations (Linux, needs `gio`/GVFS):** in Places press `a`, pick
+**Network locations (Linux, needs `gio`/GVFS; macOS supports SMB via `smbutil`/`osascript` and `/Volumes`):** in Places press `a`, pick
 SMB, SFTP or FTP and type the server's IP or name. For SMB the app lists the
-shares on the server and you pick one; SFTP/FTP connect straight in. The
-location is saved in `~/.config/commandertui/network.json` (protocol, host
-and share only -- never a password) and reappears in Places, mounting itself
+shares on the server and you pick one; SFTP/FTP connect straight in (Linux only). The
+location is saved in `~/.config/commandertui/network.json` (protocol, host,
+share and user only -- never a password) and reappears in Places, mounting itself
 when picked. If the server asks for a login, `gio` asks for it in the
-terminal and can remember it in the system keyring, exactly like Nautilus.
+terminal and can remember it in the system keyring, exactly like Nautilus (on macOS, the system login dialog asks and saves it in Keychain).
 
 Every key also has a clickable box on the bottom bar: one row on wide windows
 (168+ columns), two rows when narrower (120 columns is the practical minimum).

{commandertui-1.3.1 → commandertui-1.4.0}/README.md

@@ -4,7 +4,7 @@ Dual-pane terminal file manager: compare two folders, sync them, or move
 files/folders between them (and to USB/SMB/any mounted path) — with a
 phosphor-green 80s-terminal look and a short modem-style boot animation.
 
-Status: **v1.3.1** — 127/127 tests passing. MIT licensed.
+Status: **v1.4.0** — 153/153 tests passing. MIT licensed.
 
 ---
 
@@ -105,7 +105,7 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | Key | Action |
 |---|---|
 | `Tab` | Switch active pane |
-| `↑`/`↓`, `Enter` | Navigate, open directory |
+| `↑`/`↓`, `Enter` | Navigate, open directory (or sort column when header is focused with `↑` beyond row 0) |
 | `Backspace` | Go to parent directory |
 | `Space` | Mark/unmark item under cursor |
 | `F2` | Rename the item under the cursor (never overwrites an existing name) |
@@ -117,10 +117,11 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `/` | Filter the active pane by name (contains, ignores case) as you type; `Enter` keeps it, `Esc` clears it |
 | `+` / `-` / `*` | Mark / unmark by pattern (`*.iso`, or plain text = contains) / invert marks, over the rows shown |
 | `u` | Check for updates now (also the **Updates** button): asks PyPI right away and offers the new version if there is one |
+| `v` | Quick Look file preview (macOS only): opens `qlmanage -p` for the file under cursor; press `v` again or close the window to dismiss |
 | `i` | Size: file/folder count and total bytes of marked items (background, `Esc` stops it) |
 | `h` | Show/hide hidden (dot) files in both panes |
 | `t` | Color theme: Phosphor green (default), Phosphor amber, Nord, Gruvbox, Dracula, Tokyo Night, Catppuccin Mocha, Solarized Dark, Monokai, Textual Dark. Previews as you move, Enter keeps it (saved in `~/.config/commandertui/settings.json`), Esc goes back |
-| `p` | Places: jump to a mounted drive (USB/SMB/rclone), saved bookmark or saved network location. Inside: `a` add a network location, `s` save the active pane's folder as a bookmark, `d` delete a saved one |
+| `p` | Places: jump to a mounted drive (USB/SMB/rclone), saved bookmark or saved network location. Inside: `a` add a network location, `s` save the active pane's folder as a bookmark, `d` delete a saved one, `e` unmount a mounted SMB share |
 | `c` | Compare: full recursive diff between the two panes' current folders, with size and date of both sides (and which is newer when a file changed) |
 | `r` | Refresh both panes |
 | `q` | Quit |
@@ -135,13 +136,13 @@ half-written), and a move never removes a source it didn't fully copy.
 on-demand mount point doesn't show), GVFS/Nautilus network shares, FUSE
 mounts inside `$HOME` (e.g. `rclone mount`), and saved bookmarks.
 
-**Network locations (Linux, needs `gio`/GVFS):** in Places press `a`, pick
+**Network locations (Linux, needs `gio`/GVFS; macOS supports SMB via `smbutil`/`osascript` and `/Volumes`):** in Places press `a`, pick
 SMB, SFTP or FTP and type the server's IP or name. For SMB the app lists the
-shares on the server and you pick one; SFTP/FTP connect straight in. The
-location is saved in `~/.config/commandertui/network.json` (protocol, host
-and share only -- never a password) and reappears in Places, mounting itself
+shares on the server and you pick one; SFTP/FTP connect straight in (Linux only). The
+location is saved in `~/.config/commandertui/network.json` (protocol, host,
+share and user only -- never a password) and reappears in Places, mounting itself
 when picked. If the server asks for a login, `gio` asks for it in the
-terminal and can remember it in the system keyring, exactly like Nautilus.
+terminal and can remember it in the system keyring, exactly like Nautilus (on macOS, the system login dialog asks and saves it in Keychain).
 
 Every key also has a clickable box on the bottom bar: one row on wide windows
 (168+ columns), two rows when narrower (120 columns is the practical minimum).

commandertui-1.4.0/commandertui/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.4.0"

{commandertui-1.3.1 → commandertui-1.4.0}/commandertui/app.py

@@ -4,7 +4,7 @@ import os
 
 from textual.app import App
 
-from . import settings, theme, updater
+from . import preview, settings, theme, updater
 from .boot import BootScreen
 from .main_screen import MainScreen
 
@@ -34,6 +34,7 @@ class CommanderApp(App):
         self.right_path = os.path.abspath(right_path or os.path.expanduser("~"))
 
     def on_unmount(self) -> None:
+        preview.close_preview()
         # Whatever theme is showing when the app closes is the one to reopen
         # with -- covers the picker (t) and Textual's own palette (ctrl+p).
         settings.save_theme(self.theme)

{commandertui-1.3.1 → commandertui-1.4.0}/commandertui/main_screen.py

@@ -10,7 +10,7 @@ from textual.screen import Screen
 from textual.widgets import DataTable, Header
 
 from .compare_screen import CompareScreen
-from . import __version__, editor, netlocations, theme, updater
+from . import __version__, editor, netlocations, preview, theme, updater
 from .modals import (
     ADD_NETWORK,
     ChoiceScreen,
@@ -44,6 +44,10 @@ class MainScreen(Screen):
     BINDINGS = [
         Binding("tab", "switch_pane", "Switch pane", priority=True),
         Binding("enter", "enter_dir", "Open", priority=True),
+        Binding("up", "nav_up", "Up", priority=True),
+        Binding("down", "nav_down", "Down", priority=True),
+        Binding("left", "nav_left", "Left", priority=True),
+        Binding("right", "nav_right", "Right", priority=True),
         Binding("backspace", "up_dir", "Up", priority=True),
         Binding("space", "toggle_mark", "Mark", priority=True),
         Binding("t", "pick_theme", "Theme", priority=True),
@@ -64,6 +68,7 @@ class MainScreen(Screen):
         Binding("r", "refresh_both", "Refresh", priority=True),
         Binding("h", "toggle_hidden", "Hidden", priority=True),
         Binding("i", "show_size", "Size", priority=True),
+        Binding("v", "preview_file", "Preview", priority=True),
         # "app.quit", not "quit": this binding lives on the Screen, and a bare
         # "quit" resolves against the Screen's own (nonexistent) action_quit
         # rather than bubbling to the App, so it silently did nothing.
@@ -131,13 +136,91 @@ class MainScreen(Screen):
 
     # -------------------------------------------------------------- nav
     def action_switch_pane(self) -> None:
+        panel = self._active_panel()
+        if panel.header_active:
+            panel.header_active = False
+            panel.update_header_labels()
         self._set_active("right" if self.active_side == "left" else "left")
 
     def action_enter_dir(self) -> None:
-        self._active_panel().enter_selected()
+        panel = self._active_panel()
+        if panel.header_active:
+            col_name = ["Name", "Size", "Modified"][panel.header_selected_index]
+            panel.toggle_sort(col_name)
+        else:
+            panel.enter_selected()
+
+    def action_nav_up(self) -> None:
+        panel = self._active_panel()
+        table = panel.query_one(f"#{panel.side}-table", DataTable)
+        if panel.header_active:
+            return
+        if table.cursor_row == 0:
+            panel.header_active = True
+            panel.update_header_labels()
+        else:
+            table.action_cursor_up()
+
+    def action_nav_down(self) -> None:
+        panel = self._active_panel()
+        table = panel.query_one(f"#{panel.side}-table", DataTable)
+        if panel.header_active:
+            panel.header_active = False
+            panel.update_header_labels()
+        else:
+            table.action_cursor_down()
+
+    def action_nav_left(self) -> None:
+        panel = self._active_panel()
+        if panel.header_active:
+            panel.header_selected_index = max(0, panel.header_selected_index - 1)
+            panel.update_header_labels()
+        else:
+            table = panel.query_one(f"#{panel.side}-table", DataTable)
+            table.action_cursor_left()
+
+    def action_nav_right(self) -> None:
+        panel = self._active_panel()
+        if panel.header_active:
+            panel.header_selected_index = min(2, panel.header_selected_index + 1)
+            panel.update_header_labels()
+        else:
+            table = panel.query_one(f"#{panel.side}-table", DataTable)
+            table.action_cursor_right()
+
+    def on_data_table_header_selected(self, event: DataTable.HeaderSelected) -> None:
+        # Col 0: " ", Col 1: Name, Col 2: Size, Col 3: Modified (Date)
+        if event.column_index < 1:
+            return
+        col_names = {1: "Name", 2: "Size", 3: "Modified"}
+        col_name = col_names.get(event.column_index)
+        if not col_name:
+            return
+        panel = None
+        if isinstance(event.data_table.parent, FilePanel):
+            panel = event.data_table.parent
+        elif event.data_table.id and "left" in event.data_table.id:
+            panel = self._panel("left")
+        elif event.data_table.id and "right" in event.data_table.id:
+            panel = self._panel("right")
+        else:
+            panel = self._active_panel()
+
+        if self.active_side != panel.side:
+            active = self._active_panel()
+            if active.header_active:
+                active.header_active = False
+                active.update_header_labels()
+            self._set_active(panel.side)
+
+        panel.header_selected_index = event.column_index - 1
+        panel.toggle_sort(col_name)
 
     def action_up_dir(self) -> None:
         panel = self._active_panel()
+        if panel.header_active:
+            panel.header_active = False
+            panel.update_header_labels()
         panel.path = os.path.dirname(panel.path)
         panel.marked.clear()
         panel.refresh_listing()
@@ -354,6 +437,20 @@ class MainScreen(Screen):
         panel.refresh_listing()
         panel.move_cursor_to(name)
 
+    def action_preview_file(self) -> None:
+        if not preview.is_macos():
+            return
+        panel = self._active_panel()
+        name = panel.selected_name()
+        if not name or name == PARENT_MARK:
+            self.app.push_screen(MessageScreen("Preview works on files only"))
+            return
+        path = os.path.join(panel.path, name)
+        if os.path.isdir(path):
+            self.app.push_screen(MessageScreen("Preview works on files only"))
+            return
+        preview.toggle_preview(path)
+
     def action_copy(self) -> None:
         self._run_marked_op(OpKind.COPY, "Copy")
 
@@ -440,29 +537,41 @@ class MainScreen(Screen):
             self.app.push_screen(MessageScreen("Network locations need `gio` (GVFS) installed."))
             return
 
+        def on_user(host: str, user: str | None) -> None:
+            if not user or not user.strip():
+                return
+            self._pick_share(host, user=user.strip())
+
         def on_host(scheme: str, host: str | None) -> None:
             if not host or not host.strip():
                 return
+            host_clean = host.strip()
             if scheme == "smb":
-                self._pick_share(host.strip())
+                if netlocations.is_macos():
+                    self.app.push_screen(InputScreen("SMB user:"), lambda u: on_user(host_clean, u))
+                else:
+                    self._pick_share(host_clean)
             else:
-                self._connect(netlocations.build_uri(scheme, host), save=True)
+                self._connect(netlocations.build_uri(scheme, host_clean), save=True)
 
         def on_scheme(choice: str | None) -> None:
             if not choice:
                 return
             scheme = choice.lower()
+            if netlocations.is_macos() and scheme != "smb":
+                self.app.push_screen(MessageScreen(netlocations.MACOS_UNSUPPORTED_MSG))
+                return
             self.app.push_screen(
                 InputScreen(f"{choice} server (IP or name):"), lambda host: on_host(scheme, host)
             )
 
         self.app.push_screen(ChoiceScreen("Protocol", ["SMB", "SFTP", "FTP"]), on_scheme)
 
-    def _pick_share(self, host: str, retried: bool = False) -> None:
+    def _pick_share(self, host: str, retried: bool = False, user: str | None = None) -> None:
         self.notify(f"Listing shares on {host}...")
 
         def work() -> None:
-            shares, err = netlocations.list_shares(host)
+            shares, err = netlocations.list_shares(host, user=user)
             self.app.call_from_thread(done, shares, err)
 
         def done(shares: list[str] | None, err: str) -> None:
@@ -470,23 +579,30 @@ class MainScreen(Screen):
                 if retried:
                     self.app.push_screen(MessageScreen(f"Could not list shares on {host}.\n{err}"))
                     return
-                # Most likely a login is needed: let gio ask for it on the real
-                # terminal (and offer to remember it in the keyring).
-                with self.app.suspend():
-                    netlocations.mount(netlocations.build_uri("smb", host), interactive=True)
-                self._pick_share(host, retried=True)
+                if netlocations.is_macos():
+                    netlocations.mount(netlocations.build_uri("smb", host, user=user), interactive=True)
+                else:
+                    # Most likely a login is needed: let gio ask for it on the real
+                    # terminal (and offer to remember it in the keyring).
+                    with self.app.suspend():
+                        netlocations.mount(netlocations.build_uri("smb", host), interactive=True)
+                self._pick_share(host, retried=True, user=user)
                 return
             if not shares:
                 self.app.push_screen(MessageScreen(f"No shares found on {host}."))
                 return
             self.app.push_screen(
                 ChoiceScreen(f"Shares on {host}", shares),
-                lambda share: share and self._connect(netlocations.build_uri("smb", host, share), save=True),
+                lambda share: share
+                and self._connect(netlocations.build_uri("smb", host, share, user=user), save=True),
             )
 
         self.run_worker(work, thread=True)
 
     def _connect(self, uri: str, save: bool = False, retried: bool = False) -> None:
+        if netlocations.is_macos() and not uri.lower().startswith("smb://"):
+            self.app.push_screen(MessageScreen(netlocations.MACOS_UNSUPPORTED_MSG))
+            return
         self.notify(f"Connecting to {uri} ...")
 
         def work() -> None:
@@ -500,7 +616,7 @@ class MainScreen(Screen):
                     netlocations.save_location(uri)
                 self._go_to(path)
                 return
-            if retried:
+            if retried or netlocations.is_macos():
                 self.app.push_screen(MessageScreen(f"Could not connect to {uri}.\n{err}"))
                 return
             with self.app.suspend():

{commandertui-1.3.1 → commandertui-1.4.0}/commandertui/modals.py

@@ -13,7 +13,7 @@ from textual.widgets import Button, DataTable, Input, OptionList, Static
 
 from .bookmarks import Place, all_places, remove_bookmark, save_bookmark
 from .models import OpKind, OperationQueue
-from .netlocations import remove_location
+from .netlocations import is_smb_mount_point, local_path, remove_location, unmount
 from .scanner import tree_stats
 
 
@@ -97,7 +97,7 @@ class ConfirmScreen(ModalScreen[bool]):
             yield Static(
                 id="confirm-summary",
                 content=f"{summary['count']} operations ({by_kind or 'nothing to do'}), "
-                f"{_human_bytes(summary['total_bytes'])} total"
+                f"{_human_bytes(summary['total_bytes'])} total",
             )
             yield Static("\n".join(f"  {name}" for name in listed), id="confirm-items", markup=False)
             with Horizontal(id="confirm-buttons"):
@@ -159,6 +159,7 @@ class PlacesScreen(ModalScreen[str | None]):
         Binding("a", "add_network", "Add network", priority=True),
         Binding("s", "save_here", "Save here", priority=True),
         Binding("d", "delete_saved", "Delete saved", priority=True),
+        Binding("e", "unmount_share", "Unmount share", priority=True),
         Binding("escape", "cancel", "Cancel", priority=True),
     ]
 
@@ -176,6 +177,7 @@ class PlacesScreen(ModalScreen[str | None]):
                 yield Button("Add network  (a)", id="add")
                 yield Button("Save here  (s)", id="save")
                 yield Button("Delete saved  (d)", id="delete")
+                yield Button("Unmount share  (e)", id="unmount")
                 yield Button("Close  (Esc)", id="close")
 
     def on_mount(self) -> None:
@@ -183,10 +185,13 @@ class PlacesScreen(ModalScreen[str | None]):
 
     def _fill(self) -> None:
         table = self.query_one("#places-table", DataTable)
+        current_row = table.cursor_row
         table.clear()
         self.places: list[Place] = all_places()
         for place in self.places:
             table.add_row(place.kind, place.label, place.path, key=place.path)
+        if self.places:
+            table.move_cursor(row=min(current_row, len(self.places) - 1))
 
     def action_add_network(self) -> None:
         self.dismiss(ADD_NETWORK)
@@ -220,14 +225,50 @@ class PlacesScreen(ModalScreen[str | None]):
             return
         self._fill()
 
+    def _evict_panels_from(self, mounted_path: str) -> None:
+        home = os.path.expanduser("~")
+        prefix = mounted_path.rstrip(os.sep) + os.sep
+        for side in ("left", "right"):
+            try:
+                panel = self.app._panel(side)
+            except Exception:
+                continue
+            if panel.path == mounted_path or panel.path.startswith(prefix):
+                panel.path = home
+                panel.marked.clear()
+                panel.refresh_listing()
+
+    def action_unmount_share(self) -> None:
+        table = self.query_one("#places-table", DataTable)
+        if not self.places or table.cursor_row >= len(self.places):
+            return
+        place = self.places[table.cursor_row]
+        mounted: str | None = None
+        if place.kind == "mounted" and is_smb_mount_point(place.path):
+            mounted = place.path
+        elif (place.kind == "net-saved" and place.path.lower().startswith("smb://")) or (
+            place.kind == "network" and "smb" in os.path.basename(place.path).lower()
+        ):
+            mounted = local_path(place.path)
+
+        if not mounted:
+            self.app.push_screen(MessageScreen("Not a mounted network location"))
+            return
+        self._evict_panels_from(mounted)
+        ok, err = unmount(place.path)
+        if not ok:
+            self.app.push_screen(MessageScreen(f"Could not unmount {place.label}.\n{err}"))
+            return
+        self.notify(f"Unmounted {place.label}.")
+        self._fill()
+
     def on_button_pressed(self, event: Button.Pressed) -> None:
         {
             "add": self.action_add_network,
             "save": self.action_save_here,
             "delete": self.action_delete_saved,
-        }.get(
-            event.button.id, self.action_cancel
-        )()
+            "unmount": self.action_unmount_share,
+        }.get(event.button.id, self.action_cancel)()
 
     def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:
         self.dismiss(str(event.row_key.value))