commandertui 1.2.0__tar.gz → 1.3.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.2.0
+Version: 1.3.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.2.0** — 108/108 tests passing. MIT licensed.
+Status: **v1.3.0** — 119/119 tests passing. MIT licensed.
 
 ---
 
@@ -127,6 +127,7 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `Backspace` | Go to parent directory |
 | `Space` | Mark/unmark item under cursor |
 | `F2` | Rename the item under the cursor (never overwrites an existing name) |
+| `F4` | Edit the file under the cursor with `$VISUAL` / `$EDITOR` (falls back to nano, vim or vi); CommanderTUI pauses and comes back when you close the editor |
 | `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 |
@@ -136,8 +137,9 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `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 |
+| `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 |
-| `c` | Compare: full recursive diff between the two panes' current folders |
+| `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 |
 
@@ -160,7 +162,7 @@ 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).
+(168+ columns), two rows when narrower (120 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.
 
@@ -213,7 +215,8 @@ commandertui/
 ├── 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
+├── theme.py                  # phosphor green/amber themes + the stylesheet (Textual theme variables)
+├── settings.py               # saved settings (color theme)
 ├── boot.py                    # startup "modem" reveal animation
 ├── widgets.py                  # FilePanel: one pane's directory listing
 ├── modals.py                    # Confirm / Places / Input / Size / Message screens

{commandertui-1.2.0 → commandertui-1.3.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.2.0** — 108/108 tests passing. MIT licensed.
+Status: **v1.3.0** — 119/119 tests passing. MIT licensed.
 
 ---
 
@@ -109,6 +109,7 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `Backspace` | Go to parent directory |
 | `Space` | Mark/unmark item under cursor |
 | `F2` | Rename the item under the cursor (never overwrites an existing name) |
+| `F4` | Edit the file under the cursor with `$VISUAL` / `$EDITOR` (falls back to nano, vim or vi); CommanderTUI pauses and comes back when you close the editor |
 | `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 |
@@ -118,8 +119,9 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `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 |
+| `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 |
-| `c` | Compare: full recursive diff between the two panes' current folders |
+| `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 |
 
@@ -142,7 +144,7 @@ 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).
+(168+ columns), two rows when narrower (120 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.
 
@@ -195,7 +197,8 @@ commandertui/
 ├── 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
+├── theme.py                  # phosphor green/amber themes + the stylesheet (Textual theme variables)
+├── settings.py               # saved settings (color theme)
 ├── boot.py                    # startup "modem" reveal animation
 ├── widgets.py                  # FilePanel: one pane's directory listing
 ├── modals.py                    # Confirm / Places / Input / Size / Message screens

commandertui-1.3.0/commandertui/__init__.py

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

{commandertui-1.2.0 → commandertui-1.3.0}/commandertui/app.py

@@ -4,10 +4,9 @@ import os
 
 from textual.app import App
 
-from . import updater
+from . import settings, theme, updater
 from .boot import BootScreen
 from .main_screen import MainScreen
-from .theme import css_for
 
 
 class CommanderApp(App):
@@ -15,18 +14,30 @@ class CommanderApp(App):
     see its docstring for why that split matters for key bindings.
     """
 
-    CSS = css_for("green")
+    CSS = theme.CSS
 
     def __init__(
         self, left_path: str | None = None, right_path: str | None = None, check_updates: bool = True
     ) -> None:
         super().__init__()
+        for phosphor in theme.PHOSPHOR_THEMES:
+            self.register_theme(phosphor)
+        saved = settings.load_theme()
+        self.theme = saved if saved in self.available_themes else theme.DEFAULT_THEME
         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_unmount(self) -> None:
+        # 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)
+
+    def preview_theme(self, name: str) -> None:
+        self.theme = name
+
     def on_mount(self) -> None:
         self.push_screen(MainScreen(self.left_path, self.right_path))
         self.push_screen(BootScreen(), self._after_boot)

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

@@ -1,5 +1,8 @@
 from __future__ import annotations
 
+import threading
+import time
+
 from textual.app import ComposeResult
 from textual.binding import Binding
 from textual.containers import Vertical
@@ -8,10 +11,10 @@ from textual.widgets import DataTable, Static
 
 from .diff import compare
 from .modals import MessageScreen
-from .models import DiffStatus, OpKind, OpSide, OperationQueue, QueuedOp
+from .models import DiffEntry, DiffStatus, EntryKind, FileEntry, 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
+from .widgets import SPINNER_FRAMES, CompareBar, _format_bytes
 
 STATUS_LABEL = {
     DiffStatus.LEFT_ONLY: "< only left",
@@ -21,6 +24,23 @@ STATUS_LABEL = {
 }
 
 
+def side_info(entry: FileEntry | None) -> str:
+    """"1.2 MB  2026-10-20 14:03" for one side of a difference ("-" if absent)."""
+    if entry is None:
+        return "-"
+    when = time.strftime("%Y-%m-%d %H:%M", time.localtime(entry.mtime))
+    size = "<dir>" if entry.kind == EntryKind.DIR else _format_bytes(entry.size)
+    return f"{size}  {when}"
+
+
+def status_text(d: DiffEntry) -> str:
+    """Status label; for a changed file also says which side has the newer copy."""
+    label = STATUS_LABEL[d.status]
+    if d.status == DiffStatus.MODIFIED and d.left and d.right and d.left.mtime != d.right.mtime:
+        label += " (left newer)" if d.left.mtime > d.right.mtime else " (right newer)"
+    return label
+
+
 class CompareScreen(Screen):
     """Full recursive diff between the two panes' current directories, with
     bulk actions (mirror/update/two-way) or per-item manual handling.
@@ -42,6 +62,10 @@ class CompareScreen(Screen):
         self.left_root = left_root
         self.right_root = right_root
         self.manual_marks: set[str] = set()
+        self.diffs: list[DiffEntry] = []
+        self.scanning = False
+        self._cancel = threading.Event()
+        self._spinner = None
 
     def compose(self) -> ComposeResult:
         yield Static("", id="compare-summary")
@@ -51,16 +75,63 @@ class CompareScreen(Screen):
     def on_mount(self) -> None:
         self.reload()
 
+    def _stop_spinner(self) -> None:
+        if self._spinner is not None:
+            self._spinner.stop()
+            self._spinner = None
+
     def reload(self) -> None:
-        self.diffs = compare(self.left_root, self.right_root)
+        """Compare in a worker thread (a big tree can take minutes), with a
+        spinner so the screen never looks frozen; Esc cancels."""
+        if self.scanning:
+            return
+        self.scanning = True
+        cancel = self._cancel = threading.Event()
+        summary = self.query_one("#compare-summary", Static)
+        started = time.monotonic()
+        frame = 0
+
+        def spin() -> None:
+            nonlocal frame
+            frame += 1
+            summary.update(
+                f"{self.left_root}  <->  {self.right_root}\n"
+                f"Comparing {SPINNER_FRAMES[frame % 4]}  {int(time.monotonic() - started)}s"
+                "   (Esc to cancel)"
+            )
+
+        spin()
+        self._spinner = self.set_interval(0.12, spin)
+
+        def work() -> None:
+            try:
+                diffs, error = compare(self.left_root, self.right_root, cancel_check=cancel.is_set), ""
+            except OSError as e:
+                diffs, error = [], str(e)
+            if not cancel.is_set():
+                self.app.call_from_thread(self._scan_done, diffs, error)
+
+        self.run_worker(work, thread=True)
+
+    def _scan_done(self, diffs: list[DiffEntry], error: str) -> None:
+        self._stop_spinner()
+        self.scanning = False
+        if error:
+            self.app.push_screen(MessageScreen(f"Could not compare:\n{error}"))
+        self.diffs = diffs
+        self._fill_table()
+
+    def _fill_table(self) -> None:
         table = self.query_one("#compare-table", DataTable)
         table.clear(columns=True)
-        table.add_columns(" ", "Path", "Status")
+        table.add_columns(" ", "Path", "Status", "Left (size, date)", "Right (size, date)")
         for d in self.diffs:
             if d.status == DiffStatus.IDENTICAL:
                 continue
             mark = "*" if d.rel_path in self.manual_marks else ""
-            table.add_row(mark, d.rel_path, STATUS_LABEL[d.status], key=d.rel_path)
+            table.add_row(
+                mark, d.rel_path, status_text(d), side_info(d.left), side_info(d.right), key=d.rel_path
+            )
 
         non_identical = sum(1 for d in self.diffs if d.status != DiffStatus.IDENTICAL)
         summary = self.query_one("#compare-summary", Static)
@@ -70,22 +141,35 @@ class CompareScreen(Screen):
         )
 
     def action_back(self) -> None:
+        self._cancel.set()  # stops a running comparison; its late result is dropped
+        self._stop_spinner()
         self.dismiss()
 
+    def _busy(self) -> bool:
+        if self.scanning:
+            self.notify("Still comparing. Wait for it to finish, or press Esc to cancel.", severity="warning")
+        return self.scanning
+
     def _run_queue(self, title: str, queue: OperationQueue) -> None:
         run_queue_with_progress(
             self, title, queue, self.left_root, self.right_root, after=lambda report: self.reload()
         )
 
     def action_mirror(self) -> None:
+        if self._busy():
+            return
         active = [d for d in self.diffs if d.status != DiffStatus.IDENTICAL]
         self._run_queue("Mirror: make RIGHT identical to LEFT", plan_mirror(active))
 
     def action_update(self) -> None:
+        if self._busy():
+            return
         active = [d for d in self.diffs if d.status != DiffStatus.IDENTICAL]
         self._run_queue("Update: copy new/changed LEFT -> RIGHT (no deletes)", plan_update(active))
 
     def action_two_way(self) -> None:
+        if self._busy():
+            return
         active = [d for d in self.diffs if d.status != DiffStatus.IDENTICAL]
         queue, conflicts = plan_two_way(active)
         if conflicts:
@@ -99,6 +183,8 @@ class CompareScreen(Screen):
         self._run_queue("Two-way: propagate each side's exclusive changes", queue)
 
     def action_toggle_manual(self) -> None:
+        if self._busy():
+            return
         table = self.query_one("#compare-table", DataTable)
         if table.row_count == 0:
             return
@@ -110,9 +196,11 @@ class CompareScreen(Screen):
             self.manual_marks.discard(rel_path)
         else:
             self.manual_marks.add(rel_path)
-        self.reload()
+        self._fill_table()
 
     def action_copy_manual(self) -> None:
+        if self._busy():
+            return
         if not self.manual_marks:
             self.app.push_screen(MessageScreen("No items marked. Use [space] first."))
             return

commandertui-1.3.0/commandertui/editor.py

@@ -0,0 +1,26 @@
+"""Which text editor F4 opens: the user's own choice first."""
+
+from __future__ import annotations
+
+import os
+import shlex
+import shutil
+
+FALLBACKS = ("nano", "vim", "vi")
+
+
+def editor_command() -> list[str] | None:
+    """$VISUAL, then $EDITOR, then the first of nano/vim/vi that is installed."""
+    for var in ("VISUAL", "EDITOR"):
+        value = os.environ.get(var, "").strip()
+        if value:
+            try:
+                parts = shlex.split(value)
+            except ValueError:
+                continue
+            if parts and shutil.which(parts[0]):
+                return parts
+    for name in FALLBACKS:
+        if shutil.which(name):
+            return [name]
+    return None

{commandertui-1.2.0 → commandertui-1.3.0}/commandertui/main_screen.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+import subprocess
 
 from textual.app import ComposeResult
 from textual.binding import Binding
@@ -9,7 +10,7 @@ from textual.screen import Screen
 from textual.widgets import DataTable, Header
 
 from .compare_screen import CompareScreen
-from . import netlocations, updater
+from . import editor, netlocations, theme, updater
 from .modals import (
     ADD_NETWORK,
     ChoiceScreen,
@@ -45,12 +46,14 @@ class MainScreen(Screen):
         Binding("enter", "enter_dir", "Open", priority=True),
         Binding("backspace", "up_dir", "Up", priority=True),
         Binding("space", "toggle_mark", "Mark", priority=True),
+        Binding("t", "pick_theme", "Theme", priority=True),
         Binding("u", "update_app", "Update", priority=True),
         Binding("slash", "filter", "Filter", priority=True),
         Binding("plus", "mark_pattern", "Mark pattern", priority=True),
         Binding("minus", "unmark_pattern", "Unmark pattern", priority=True),
         Binding("asterisk", "invert_marks", "Invert marks", priority=True),
         Binding("f2", "rename", "Rename", priority=True),
+        Binding("f4", "edit", "Edit", priority=True),
         Binding("f5", "copy", "Copy", priority=True),
         Binding("f6", "move", "Move", priority=True),
         Binding("f7", "make_dir", "MkDir", priority=True),
@@ -248,6 +251,25 @@ class MainScreen(Screen):
 
         self.app.push_screen(UpdateScreen(info), on_choice)
 
+    def action_pick_theme(self) -> None:
+        labels = [label for label, _ in theme.THEME_CHOICES]
+        names = [name for _, name in theme.THEME_CHOICES]
+        original = self.app.theme
+        initial = names.index(original) if original in names else 0
+
+        def on_choice(choice: str | None) -> None:
+            if choice is None:
+                self.app.preview_theme(original)  # Esc: back to what it was
+            else:
+                self.app.theme = names[labels.index(choice)]  # saved by the app
+
+        self.app.push_screen(
+            ChoiceScreen(
+                "Color theme", labels, initial=initial, on_highlight=lambda i: self.app.preview_theme(names[i])
+            ),
+            on_choice,
+        )
+
     def action_filter(self) -> None:
         panel = self._active_panel()
         self.app.push_screen(
@@ -287,6 +309,34 @@ class MainScreen(Screen):
 
         self.app.push_screen(InputScreen("Rename to:", initial=name), on_named)
 
+    def action_edit(self) -> None:
+        panel = self._active_panel()
+        name = panel.selected_name()
+        if not name or name == PARENT_MARK:
+            self._nothing_selected()
+            return
+        path = os.path.join(panel.path, name)
+        if os.path.isdir(path):
+            self.app.push_screen(MessageScreen(f'"{name}" is a folder. Pick a file to edit.'))
+            return
+        command = editor.editor_command()
+        if command is None:
+            self.app.push_screen(
+                MessageScreen("No text editor found.\nSet $EDITOR or install nano.")
+            )
+            return
+        with self.app.suspend():
+            try:
+                subprocess.run([*command, path])
+            except OSError as e:
+                error = str(e)
+            else:
+                error = ""
+        if error:
+            self.app.push_screen(MessageScreen(f"Could not start the editor:\n{error}"))
+        panel.refresh_listing()
+        panel.move_cursor_to(name)
+
     def action_copy(self) -> None:
         self._run_marked_op(OpKind.COPY, "Copy")
 

{commandertui-1.2.0 → commandertui-1.3.0}/commandertui/modals.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Callable
+
 import os
 import time
 
@@ -466,10 +468,26 @@ class ChoiceScreen(ModalScreen[str | None]):
 
     BINDINGS = [Binding("escape", "cancel", "Cancel", priority=True)]
 
-    def __init__(self, prompt: str, options: list[str]) -> None:
+    def __init__(
+        self,
+        prompt: str,
+        options: list[str],
+        initial: int | None = None,
+        on_highlight: Callable[[int], None] | None = None,
+    ) -> None:
         super().__init__()
         self.prompt = prompt
         self.options = options
+        self.initial = initial
+        self.on_highlight = on_highlight  # lets a picker preview each item as you move
+
+    def on_mount(self) -> None:
+        if self.initial is not None:
+            self.query_one("#choice-list", OptionList).highlighted = self.initial
+
+    def on_option_list_option_highlighted(self, event: OptionList.OptionHighlighted) -> None:
+        if self.on_highlight is not None:
+            self.on_highlight(event.option_index)
 
     def compose(self) -> ComposeResult:
         with Vertical(id="choice-box"):

commandertui-1.3.0/commandertui/settings.py

@@ -0,0 +1,35 @@
+"""User settings that survive restarts (today: the color theme)."""
+
+from __future__ import annotations
+
+import json
+import os
+
+from .bookmarks import CONFIG_DIR
+
+SETTINGS_FILE = os.path.join(CONFIG_DIR, "settings.json")
+
+
+def _load() -> dict:
+    try:
+        with open(SETTINGS_FILE) as f:
+            data = json.load(f)
+        return data if isinstance(data, dict) else {}
+    except (OSError, ValueError):
+        return {}
+
+
+def load_theme() -> str | None:
+    value = _load().get("theme")
+    return value if isinstance(value, str) else None
+
+
+def save_theme(name: str) -> None:
+    data = _load()
+    data["theme"] = name
+    try:
+        os.makedirs(CONFIG_DIR, exist_ok=True)
+        with open(SETTINGS_FILE, "w") as f:
+            json.dump(data, f)
+    except OSError:
+        pass  # a read-only home must never break the app