commandertui 1.0.0__tar.gz → 1.2.0__tar.gz

{commandertui-1.0.0 → commandertui-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.0.0
+Version: 1.2.0
 Summary: Dual-pane retro terminal file manager: compare, sync, copy and move folders
 Author: Humberto Barchini
 License-Expression: MIT
@@ -22,7 +22,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.0.0** — 40/40 tests passing. MIT licensed.
+Status: **v1.2.0** — 108/108 tests passing. MIT licensed.
 
 ---
 
@@ -32,7 +32,7 @@ A safe, simple alternative to heavier dual-pane file managers. It was
 written after an earlier attempt of the same idea had to be scrapped for
 running an unauthenticated local HTTP server. This project deliberately:
 
-- **Never opens a network port.** Pure terminal UI (Textual), no HTTP server,
+- **Never opens a network port.** Pure terminal UI (Textual), no HTTP server (the only outgoing request is the daily update check, which you can turn off),
   no webview.
 - **Never does a raw `rm -rf`.** Deletes always go through the desktop trash
   (`send2trash` → `gio trash` → manual move into `~/.local/share/Trash`, in
@@ -58,12 +58,34 @@ makepkg -si
 
 Remove it with `sudo pacman -R commandertui`.
 
-**Other distros.** It is a regular Python package (Python 3.11+):
+**PyPI (Linux / macOS / WSL).** It is a standard package on [PyPI](https://pypi.org/project/commandertui/) (Python 3.11+). Recommended via `pipx`:
 
 ```bash
-pipx install git+https://github.com/juniorbarchini-oss/commandertui.git
+pipx install commandertui
 ```
 
+Or inside an activated virtual environment:
+
+```bash
+pip install commandertui
+```
+
+**macOS.** Same Python package (`pipx install commandertui`), plus
+[kitty](https://sw.kovidgoyal.net/kitty/) for the standalone window. Places
+lists the volumes under `/Volumes` (system volumes such as Recovery and
+Preboot are hidden) and FUSE mounts inside your home folder. To get a
+double-clickable app with the CommanderTUI icon:
+
+```bash
+packaging/macos/build_app.sh            # builds packaging/macos/CommanderTUI.app
+packaging/macos/build_app.sh --install  # also copies it to /Applications
+```
+
+The app opens kitty at 1174x637 px and runs `commandertui`. It looks for the
+command in `~/.local/bin` (pipx), Homebrew, `/usr/local/bin`, your `PATH`,
+and a source checkout's `.venv`. Tested by the author on macOS with a Time
+Machine volume, Google Drive and OneDrive mounts.
+
 **From a source checkout** (development):
 
 ```bash
@@ -104,13 +126,17 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `↑`/`↓`, `Enter` | Navigate, open directory |
 | `Backspace` | Go to parent directory |
 | `Space` | Mark/unmark item under cursor |
+| `F2` | Rename the item under the cursor (never overwrites an existing name) |
 | `F5` | Copy marked (or item under cursor) to the other pane |
 | `F6` | Move marked to the other pane |
 | `F7` | Create a folder in the active pane |
 | `F8` / `Delete` | Delete marked (to trash) |
+| `/` | 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` | Update: shows the pending new version (see *Updates*) |
 | `i` | Size: file/folder count and total bytes of marked items (background, `Esc` stops it) |
 | `h` | Show/hide hidden (dot) files in both panes |
-| `p` | Places: jump to a mounted drive (USB/SMB/rclone) or saved bookmark |
+| `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 |
 | `c` | Compare: full recursive diff between the two panes' current folders |
 | `r` | Refresh both panes |
 | `q` | Quit |
@@ -125,6 +151,41 @@ 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
+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
+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.
+
+Every key also has a clickable box on the bottom bar: one row on wide windows
+(168+ columns), two rows when narrower (110 columns is the practical minimum).
+The active pane has the thick border and the inverted path bar; each path bar
+shows the free space of that disk, and the marked count and total size.
+
+## Updates
+
+Once a day, in the background and only after the start-up animation, the app
+asks PyPI for the latest version (a plain GET, nothing about you is sent). If
+a newer one exists you get a dialog -- **Update now / Later / Skip this
+version** -- and the header keeps saying `update X available (press u)`.
+It never installs on its own. **Update now** hands the terminal over and runs
+the command that matches how it was installed:
+
+| Installed as | Update runs |
+|---|---|
+| Arch package (`makepkg`) | rebuilds from the release's PKGBUILD with `makepkg -si` (your sudo password is typed in the terminal, never read by the app) |
+| pipx | `pipx upgrade commandertui` |
+| pip | `pip install --upgrade commandertui` |
+| git checkout | no button: the dialog tells you to `git pull` |
+
+Turn the check off with `commandertui --no-update-check` or by setting
+`COMMANDERTUI_NO_UPDATE_CHECK=1`. `COMMANDERTUI_FAKE_LATEST=9.9.9` shows the
+dialog without a real release, to see how it looks. The logic lives in one
+self-contained file, `commandertui/updater.py`, written to be copied into
+other apps.
+
 Inside **Compare**:
 
 | Key | Action |
@@ -151,6 +212,7 @@ commandertui/
 ├── trash.py               # 3-layer safe delete (send2trash / gio trash / manual)
 ├── executor.py             # runs an OperationQueue against the filesystem
 ├── bookmarks.py             # detected mounts (USB/SMB/rclone) + saved places
+├── netlocations.py           # SMB/SFTP/FTP locations via gio (list shares, mount, save)
 ├── theme.py                  # green/amber phosphor palettes
 ├── boot.py                    # startup "modem" reveal animation
 ├── widgets.py                  # FilePanel: one pane's directory listing

{commandertui-1.0.0 → commandertui-1.2.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.0.0** — 40/40 tests passing. MIT licensed.
+Status: **v1.2.0** — 108/108 tests passing. MIT licensed.
 
 ---
 
@@ -14,7 +14,7 @@ A safe, simple alternative to heavier dual-pane file managers. It was
 written after an earlier attempt of the same idea had to be scrapped for
 running an unauthenticated local HTTP server. This project deliberately:
 
-- **Never opens a network port.** Pure terminal UI (Textual), no HTTP server,
+- **Never opens a network port.** Pure terminal UI (Textual), no HTTP server (the only outgoing request is the daily update check, which you can turn off),
   no webview.
 - **Never does a raw `rm -rf`.** Deletes always go through the desktop trash
   (`send2trash` → `gio trash` → manual move into `~/.local/share/Trash`, in
@@ -40,12 +40,34 @@ makepkg -si
 
 Remove it with `sudo pacman -R commandertui`.
 
-**Other distros.** It is a regular Python package (Python 3.11+):
+**PyPI (Linux / macOS / WSL).** It is a standard package on [PyPI](https://pypi.org/project/commandertui/) (Python 3.11+). Recommended via `pipx`:
 
 ```bash
-pipx install git+https://github.com/juniorbarchini-oss/commandertui.git
+pipx install commandertui
 ```
 
+Or inside an activated virtual environment:
+
+```bash
+pip install commandertui
+```
+
+**macOS.** Same Python package (`pipx install commandertui`), plus
+[kitty](https://sw.kovidgoyal.net/kitty/) for the standalone window. Places
+lists the volumes under `/Volumes` (system volumes such as Recovery and
+Preboot are hidden) and FUSE mounts inside your home folder. To get a
+double-clickable app with the CommanderTUI icon:
+
+```bash
+packaging/macos/build_app.sh            # builds packaging/macos/CommanderTUI.app
+packaging/macos/build_app.sh --install  # also copies it to /Applications
+```
+
+The app opens kitty at 1174x637 px and runs `commandertui`. It looks for the
+command in `~/.local/bin` (pipx), Homebrew, `/usr/local/bin`, your `PATH`,
+and a source checkout's `.venv`. Tested by the author on macOS with a Time
+Machine volume, Google Drive and OneDrive mounts.
+
 **From a source checkout** (development):
 
 ```bash
@@ -86,13 +108,17 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `↑`/`↓`, `Enter` | Navigate, open directory |
 | `Backspace` | Go to parent directory |
 | `Space` | Mark/unmark item under cursor |
+| `F2` | Rename the item under the cursor (never overwrites an existing name) |
 | `F5` | Copy marked (or item under cursor) to the other pane |
 | `F6` | Move marked to the other pane |
 | `F7` | Create a folder in the active pane |
 | `F8` / `Delete` | Delete marked (to trash) |
+| `/` | 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` | Update: shows the pending new version (see *Updates*) |
 | `i` | Size: file/folder count and total bytes of marked items (background, `Esc` stops it) |
 | `h` | Show/hide hidden (dot) files in both panes |
-| `p` | Places: jump to a mounted drive (USB/SMB/rclone) or saved bookmark |
+| `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 |
 | `c` | Compare: full recursive diff between the two panes' current folders |
 | `r` | Refresh both panes |
 | `q` | Quit |
@@ -107,6 +133,41 @@ 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
+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
+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.
+
+Every key also has a clickable box on the bottom bar: one row on wide windows
+(168+ columns), two rows when narrower (110 columns is the practical minimum).
+The active pane has the thick border and the inverted path bar; each path bar
+shows the free space of that disk, and the marked count and total size.
+
+## Updates
+
+Once a day, in the background and only after the start-up animation, the app
+asks PyPI for the latest version (a plain GET, nothing about you is sent). If
+a newer one exists you get a dialog -- **Update now / Later / Skip this
+version** -- and the header keeps saying `update X available (press u)`.
+It never installs on its own. **Update now** hands the terminal over and runs
+the command that matches how it was installed:
+
+| Installed as | Update runs |
+|---|---|
+| Arch package (`makepkg`) | rebuilds from the release's PKGBUILD with `makepkg -si` (your sudo password is typed in the terminal, never read by the app) |
+| pipx | `pipx upgrade commandertui` |
+| pip | `pip install --upgrade commandertui` |
+| git checkout | no button: the dialog tells you to `git pull` |
+
+Turn the check off with `commandertui --no-update-check` or by setting
+`COMMANDERTUI_NO_UPDATE_CHECK=1`. `COMMANDERTUI_FAKE_LATEST=9.9.9` shows the
+dialog without a real release, to see how it looks. The logic lives in one
+self-contained file, `commandertui/updater.py`, written to be copied into
+other apps.
+
 Inside **Compare**:
 
 | Key | Action |
@@ -133,6 +194,7 @@ commandertui/
 ├── trash.py               # 3-layer safe delete (send2trash / gio trash / manual)
 ├── executor.py             # runs an OperationQueue against the filesystem
 ├── bookmarks.py             # detected mounts (USB/SMB/rclone) + saved places
+├── netlocations.py           # SMB/SFTP/FTP locations via gio (list shares, mount, save)
 ├── theme.py                  # green/amber phosphor palettes
 ├── boot.py                    # startup "modem" reveal animation
 ├── widgets.py                  # FilePanel: one pane's directory listing

commandertui-1.2.0/commandertui/__init__.py

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

commandertui-1.2.0/commandertui/app.py

@@ -0,0 +1,70 @@
+from __future__ import annotations
+
+import os
+
+from textual.app import App
+
+from . import updater
+from .boot import BootScreen
+from .main_screen import MainScreen
+from .theme import css_for
+
+
+class CommanderApp(App):
+    """Owns only the screen stack. All pane behavior lives in MainScreen --
+    see its docstring for why that split matters for key bindings.
+    """
+
+    CSS = css_for("green")
+
+    def __init__(
+        self, left_path: str | None = None, right_path: str | None = None, check_updates: bool = True
+    ) -> None:
+        super().__init__()
+        self.check_updates = check_updates and not updater.updates_disabled()
+        self.update_info: updater.UpdateInfo | None = None
+        self.update_prompted = False
+        self.left_path = os.path.abspath(left_path or os.path.expanduser("~"))
+        self.right_path = os.path.abspath(right_path or os.path.expanduser("~"))
+
+    def on_mount(self) -> None:
+        self.push_screen(MainScreen(self.left_path, self.right_path))
+        self.push_screen(BootScreen(), self._after_boot)
+
+    def _after_boot(self, _result=None) -> None:
+        # Looked up only once the boot animation is over, so a quick answer
+        # can never pop a dialog over it.
+        if self.check_updates:
+            self.run_worker(self._look_for_update, thread=True)
+
+    def _look_for_update(self) -> None:
+        info = updater.check()
+        if info:
+            self.call_from_thread(self.update_found, info)
+
+    def update_found(self, info: updater.UpdateInfo) -> None:
+        """Remember the newer version and say so in the header; the dialog
+        itself waits until the main screen is actually showing (not the boot
+        animation)."""
+        self.update_info = info
+        self.sub_title = f"update {info.latest} available (press u)"
+        if isinstance(self.screen, MainScreen):
+            self.screen.prompt_update()
+
+    def clear_update(self) -> None:
+        self.update_info = None
+        self.sub_title = ""
+
+    # Convenience passthroughs so existing tests/tools that poke at the app
+    # directly (e.g. app._panel("left")) keep working without knowing about
+    # the MainScreen split.
+    def _panel(self, side: str):
+        return self.main_screen._panel(side)
+
+    @property
+    def main_screen(self) -> MainScreen:
+        return next(s for s in self.screen_stack if isinstance(s, MainScreen))
+
+    @property
+    def active_side(self) -> str:
+        return self.main_screen.active_side

{commandertui-1.0.0 → commandertui-1.2.0}/commandertui/bookmarks.py

@@ -2,13 +2,30 @@ from __future__ import annotations
 
 import json
 import os
+import subprocess
+import sys
 from dataclasses import dataclass
 
 CONFIG_DIR = os.path.expanduser("~/.config/commandertui")
 BOOKMARKS_FILE = os.path.join(CONFIG_DIR, "bookmarks.json")
 
-# Where Linux desktops mount removable/network drives.
-MOUNT_ROOTS = ("/run/media", "/media", "/mnt")
+# Where OS mounts removable/network drives.
+# Linux uses /run/media, /media, /mnt; macOS uses /Volumes.
+if sys.platform == "darwin":
+    MOUNT_ROOTS = ("/Volumes",)
+else:
+    MOUNT_ROOTS = ("/run/media", "/media", "/mnt")
+
+# macOS system volumes to exclude from Places (macOS only: on Linux a drive
+# labelled "VM" or "Update" is a perfectly normal drive and must show up).
+MACOS_EXCLUDED_VOLUMES = {"Recovery", "VM", "Preboot", "Update"}
+
+
+def _hidden_volume(name: str) -> bool:
+    if sys.platform != "darwin":
+        return False
+    return name.startswith((".", "com.apple.")) or name in MACOS_EXCLUDED_VOLUMES
+
 
 # Nautilus (and GNOME apps generally) mount network shares -- SMB, FTP,
 # SFTP -- through GVFS rather than udisks2, so they never show up under
@@ -30,11 +47,15 @@ def detect_mounted() -> list[Place]:
             continue
         try:
             for user_dir in os.scandir(root):
+                if _hidden_volume(user_dir.name):
+                    continue
                 if not user_dir.is_dir():
                     continue
-                # /run/media/<user>/<Label> vs /mnt/<Label> (no user subdir)
+                # /run/media/<user>/<Label> vs /mnt/<Label> or /Volumes/<Label> (no user subdir)
                 candidates = list(os.scandir(user_dir.path)) if root == "/run/media" else [user_dir]
                 for c in candidates:
+                    if _hidden_volume(c.name):
+                        continue
                     # An on-demand mount point (e.g. /mnt/i7server) exists as
                     # an empty directory even when nothing is mounted there --
                     # os.path.ismount() is what actually tells them apart.
@@ -81,9 +102,7 @@ def _unescape_mount_path(path: str) -> str:
     return path.replace("\\040", " ").replace("\\011", "\t").replace("\\012", "\n").replace("\\134", "\\")
 
 
-def detect_home_mounts() -> list[Place]:
-    """FUSE mounts inside $HOME, e.g. rclone's ~/365 and ~/GoogleDrive.
-    Read from /proc/mounts so only what is live right now shows up."""
+def _detect_home_mounts_proc() -> list[Place]:
     home = os.path.expanduser("~")
     try:
         with open(PROC_MOUNTS) as f:
@@ -101,6 +120,43 @@ def detect_home_mounts() -> list[Place]:
     return places
 
 
+def _detect_home_mounts_darwin() -> list[Place]:
+    home = os.path.expanduser("~")
+    places: list[Place] = []
+    try:
+        res = subprocess.run(["mount"], capture_output=True, text=True, timeout=5)
+        if res.returncode != 0:
+            return []
+        for line in res.stdout.splitlines():
+            # e.g.: remote: on /Users/user/365 (macfuse, nodev, ...)
+            parts = line.split(" on ")
+            if len(parts) < 2:
+                continue
+            rest = parts[1]
+            path, _, fstype_part = rest.rpartition(" (")
+            if not fstype_part:
+                continue
+            fstype = fstype_part.rstrip(")").split(",")[0].strip()
+            path = path.strip()
+            if path.startswith(home + os.sep) and any(
+                f in fstype.lower() for f in ("fuse", "osxfuse", "macfuse", "rclone")
+            ):
+                places.append(Place(label=os.path.basename(path), path=path, kind=fstype))
+    except Exception:
+        pass
+    return places
+
+
+def detect_home_mounts() -> list[Place]:
+    """FUSE mounts inside $HOME, e.g. rclone's ~/365 and ~/GoogleDrive.
+    Read from /proc/mounts on Linux (or if PROC_MOUNTS exists) or mount on macOS."""
+    if os.path.isfile(PROC_MOUNTS):
+        return _detect_home_mounts_proc()
+    if sys.platform == "darwin":
+        return _detect_home_mounts_darwin()
+    return []
+
+
 def load_saved() -> list[Place]:
     if not os.path.isfile(BOOKMARKS_FILE):
         return []
@@ -130,4 +186,7 @@ def remove_bookmark(path: str) -> None:
 
 def all_places() -> list[Place]:
     home = Place(label="Home", path=os.path.expanduser("~"), kind="home")
-    return [home] + detect_mounted() + detect_network_mounts() + detect_home_mounts() + load_saved()
+    from .netlocations import load_locations  # lazy: netlocations imports CONFIG_DIR from here
+
+    saved_net = [Place(label=loc.label, path=loc.uri, kind="net-saved") for loc in load_locations()]
+    return [home] + detect_mounted() + detect_network_mounts() + detect_home_mounts() + load_saved() + saved_net

{commandertui-1.0.0 → commandertui-1.2.0}/commandertui/cli.py

@@ -11,10 +11,15 @@ def main() -> None:
     parser = argparse.ArgumentParser(prog="commandertui", description="Dual-pane TUI file manager")
     parser.add_argument("left", nargs="?", default=os.path.expanduser("~"))
     parser.add_argument("right", nargs="?", default=os.path.expanduser("~"))
+    parser.add_argument(
+        "--no-update-check",
+        action="store_true",
+        help="never contact PyPI to look for a newer version",
+    )
     parser.add_argument("--version", action="version", version=f"commandertui {__version__}")
     args = parser.parse_args()
 
-    app = CommanderApp(left_path=args.left, right_path=args.right)
+    app = CommanderApp(left_path=args.left, right_path=args.right, check_updates=not args.no_update_check)
     app.run()
 
 

{commandertui-1.0.0 → commandertui-1.2.0}/commandertui/compare_screen.py

@@ -4,13 +4,14 @@ from textual.app import ComposeResult
 from textual.binding import Binding
 from textual.containers import Vertical
 from textual.screen import Screen
-from textual.widgets import DataTable, Footer, Static
+from textual.widgets import DataTable, Static
 
 from .diff import compare
 from .modals import MessageScreen
 from .models import DiffStatus, OpKind, OpSide, OperationQueue, QueuedOp
 from .plan import plan_mirror, plan_two_way, plan_update
 from .run_queue import run_queue_with_progress
+from .widgets import CompareBar
 
 STATUS_LABEL = {
     DiffStatus.LEFT_ONLY: "< only left",
@@ -45,7 +46,7 @@ class CompareScreen(Screen):
     def compose(self) -> ComposeResult:
         yield Static("", id="compare-summary")
         yield DataTable(id="compare-table", cursor_type="row")
-        yield Footer()
+        yield CompareBar()
 
     def on_mount(self) -> None:
         self.reload()
@@ -65,8 +66,7 @@ class CompareScreen(Screen):
         summary = self.query_one("#compare-summary", Static)
         summary.update(
             f"{self.left_root}  <->  {self.right_root}\n"
-            f"{non_identical} differences   "
-            "[m]irror  [u]pdate  [b]idirectional  [space] mark  [c]opy marked  [esc] back"
+            f"{non_identical} differences"
         )
 
     def action_back(self) -> None: