commandertui 1.0.0__tar.gz → 1.1.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.0.0
+Version: 1.1.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.1.0** — tests passing. MIT licensed.
 
 ---
 
@@ -64,6 +64,22 @@ Remove it with `sudo pacman -R commandertui`.
 pipx install git+https://github.com/juniorbarchini-oss/commandertui.git
 ```
 
+**macOS.** Same Python package (`pipx install ...` as above), 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

{commandertui-1.0.0 → commandertui-1.1.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.1.0** — tests passing. MIT licensed.
 
 ---
 
@@ -46,6 +46,22 @@ Remove it with `sudo pacman -R commandertui`.
 pipx install git+https://github.com/juniorbarchini-oss/commandertui.git
 ```
 
+**macOS.** Same Python package (`pipx install ...` as above), 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

commandertui-1.1.0/commandertui/__init__.py

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

{commandertui-1.0.0 → commandertui-1.1.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 []

{commandertui-1.0.0 → commandertui-1.1.0}/commandertui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.0.0
+Version: 1.1.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.1.0** — tests passing. MIT licensed.
 
 ---
 
@@ -64,6 +64,22 @@ Remove it with `sudo pacman -R commandertui`.
 pipx install git+https://github.com/juniorbarchini-oss/commandertui.git
 ```
 
+**macOS.** Same Python package (`pipx install ...` as above), 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

{commandertui-1.0.0 → commandertui-1.1.0}/tests/test_bookmarks.py

@@ -71,3 +71,61 @@ def test_home_fuse_mounts_detected_from_proc_mounts(tmp_path, monkeypatch):
         ("365", "/home/tester/365", "rclone"),
         ("Google Drive", "/home/tester/Google Drive", "rclone"),
     ]
+
+
+def test_macos_volumes_detects_mounted_and_skips_system_and_hidden(tmp_path, monkeypatch):
+    volumes = tmp_path / "Volumes"
+    volumes.mkdir()
+    (volumes / ".timemachine").mkdir()
+    (volumes / "Recovery").mkdir()
+    (volumes / "USB-Drive").mkdir()
+    (volumes / "Backup Disk").mkdir()
+
+    monkeypatch.setattr(bookmarks, "MOUNT_ROOTS", (str(volumes),))
+    monkeypatch.setattr(bookmarks.os.path, "ismount", lambda p: True)
+    monkeypatch.setattr(bookmarks.sys, "platform", "darwin")
+
+    places = bookmarks.detect_mounted()
+    labels = {p.label for p in places}
+
+    assert "USB-Drive" in labels
+    assert "Backup Disk" in labels
+    assert "Recovery" not in labels
+    assert ".timemachine" not in labels
+
+
+def test_linux_does_not_hide_drives_named_like_macos_system_volumes(tmp_path, monkeypatch):
+    root = tmp_path / "mnt"
+    root.mkdir()
+    for name in ("VM", "Update", "Recovery", "MyUSB"):
+        (root / name).mkdir()
+
+    monkeypatch.setattr(bookmarks, "MOUNT_ROOTS", (str(root),))
+    monkeypatch.setattr(bookmarks.os.path, "ismount", lambda p: True)
+    monkeypatch.setattr(bookmarks.sys, "platform", "linux")
+
+    labels = {p.label for p in bookmarks.detect_mounted()}
+
+    assert labels == {"VM", "Update", "Recovery", "MyUSB"}
+
+
+def test_home_fuse_mounts_darwin(monkeypatch):
+    sample_mount_output = (
+        "/dev/disk3s1s1 on / (apfs, sealed, local, read-only)\n"
+        "//user@nas/Media on /Volumes/Media (smbfs, nodev)\n"
+        "rclone: on /Users/tester/365 (macfuse, nodev, nosuid)\n"
+        "google: on /Users/tester/Drive (fuse.rclone, nodev)\n"
+    )
+
+    class DummyResult:
+        returncode = 0
+        stdout = sample_mount_output
+
+    monkeypatch.setattr(bookmarks.subprocess, "run", lambda *a, **kw: DummyResult())
+    monkeypatch.setattr(bookmarks.os.path, "expanduser", lambda p: "/Users/tester")
+
+    places = bookmarks._detect_home_mounts_darwin()
+    assert [(p.label, p.path, p.kind) for p in places] == [
+        ("365", "/Users/tester/365", "macfuse"),
+        ("Drive", "/Users/tester/Drive", "fuse.rclone"),
+    ]

{commandertui-1.0.0 → commandertui-1.1.0}/tests/test_executor.py

@@ -1,9 +1,15 @@
+import os
+
 from commandertui.diff import compare
 from commandertui.executor import execute
 from commandertui.plan import plan_mirror
 
 
-def test_execute_mirror_makes_right_match_left(tmp_path):
+def test_execute_mirror_makes_right_match_left(tmp_path, monkeypatch):
+    import commandertui.sync as sync_mod
+
+    monkeypatch.setattr(sync_mod, "send_to_trash", lambda p: os.remove(p) or True)
+
     left = tmp_path / "left"
     right = tmp_path / "right"
     left.mkdir()

commandertui-1.0.0/commandertui/__init__.py

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