commandertui 1.4.1__tar.gz → 1.4.3__tar.gz

{commandertui-1.4.1 → commandertui-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.4.1
+Version: 1.4.3
 Summary: Dual-pane retro terminal file manager: compare, sync, copy and move folders
 Author: Humberto Barchini
 License-Expression: MIT
@@ -140,7 +140,7 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `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, `e` unmount a mounted SMB share |
+| `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, `l` change the login of a saved network location (forgets the session, then anonymous or another user) |
 | `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 |
@@ -162,7 +162,9 @@ 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 (on macOS, the system login dialog asks and saves it in Keychain).
-If the GVFS backend for the chosen protocol is not installed (a bare Ubuntu server, for example, has none), the app says so and offers to install it for you (`apt-get install gvfs-backends`, `pacman -S gvfs gvfs-smb` or `dnf install gvfs-smb`); it asks for your sudo password in the terminal and only runs if you answer *Install now*.
+For SMB and FTP the app first asks **Anonymous (no login)** or **User and password**; anonymous connects with `gio mount --anonymous`, with no user, workgroup or password prompt, and is remembered per location. Choosing *User and password* forgets any earlier session for that server first, so the login prompt always appears.
+
+If the GVFS backend (or `gvfs-fuse`, which gives a mounted share a folder to browse) for the chosen protocol is not installed (a bare Ubuntu server, for example, has none), the app says so and offers to install it for you (`apt-get install gvfs-backends gvfs-fuse`, `pacman -S gvfs gvfs-smb` or `dnf install gvfs-smb gvfs-fuse`); it asks for your sudo password in the terminal and only runs if you answer *Install now*.
 
 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.1 → commandertui-1.4.3}/README.md

@@ -121,7 +121,7 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `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, `e` unmount a mounted SMB share |
+| `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, `l` change the login of a saved network location (forgets the session, then anonymous or another user) |
 | `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 |
@@ -143,7 +143,9 @@ 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 (on macOS, the system login dialog asks and saves it in Keychain).
-If the GVFS backend for the chosen protocol is not installed (a bare Ubuntu server, for example, has none), the app says so and offers to install it for you (`apt-get install gvfs-backends`, `pacman -S gvfs gvfs-smb` or `dnf install gvfs-smb`); it asks for your sudo password in the terminal and only runs if you answer *Install now*.
+For SMB and FTP the app first asks **Anonymous (no login)** or **User and password**; anonymous connects with `gio mount --anonymous`, with no user, workgroup or password prompt, and is remembered per location. Choosing *User and password* forgets any earlier session for that server first, so the login prompt always appears.
+
+If the GVFS backend (or `gvfs-fuse`, which gives a mounted share a folder to browse) for the chosen protocol is not installed (a bare Ubuntu server, for example, has none), the app says so and offers to install it for you (`apt-get install gvfs-backends gvfs-fuse`, `pacman -S gvfs gvfs-smb` or `dnf install gvfs-smb gvfs-fuse`); it asks for your sudo password in the terminal and only runs if you answer *Install now*.
 
 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.3/commandertui/__init__.py

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

{commandertui-1.4.1 → commandertui-1.4.3}/commandertui/main_screen.py

@@ -13,6 +13,7 @@ from .compare_screen import CompareScreen
 from . import __version__, editor, netlocations, preview, theme, updater
 from .modals import (
     ADD_NETWORK,
+    CHANGE_LOGIN,
     ChoiceScreen,
     FilterScreen,
     InputScreen,
@@ -26,6 +27,9 @@ from .run_queue import run_queue_with_progress
 from .scanner import path_size
 from .widgets import PARENT_MARK, FilePanel, FunctionBar, MainTopBar
 
+LOGIN_ANON = "Anonymous (no login)"
+LOGIN_USER = "User and password"
+
 
 class MainScreen(Screen):
     """The dual-pane view and its keybindings.
@@ -346,7 +350,9 @@ class MainScreen(Screen):
                     )
                 else:
                     self.app.push_screen(
-                        MessageScreen("The update did not finish. Check the terminal output, then try again.")
+                        MessageScreen(
+                            "The update did not finish. The package index may not have the new version yet:\nwait a few minutes and try again, or check the terminal output."
+                        )
                     )
 
         self.app.push_screen(UpdateScreen(info), on_choice)
@@ -519,6 +525,8 @@ class MainScreen(Screen):
                 return
             if path == ADD_NETWORK:
                 self._add_network()
+            elif path.startswith(CHANGE_LOGIN):
+                self._change_login(path[len(CHANGE_LOGIN) :])
             elif netlocations.is_uri(path):
                 self._connect(path)
             else:
@@ -547,14 +555,27 @@ class MainScreen(Screen):
             if not host or not host.strip():
                 return
             host_clean = host.strip()
-            if scheme == "smb":
-                if netlocations.is_macos():
-                    self.app.push_screen(InputScreen("SMB user:"), lambda u: on_user(host_clean, u))
-                else:
-                    self._pick_share(host_clean)
+            if scheme == "smb" and netlocations.is_macos():
+                self.app.push_screen(InputScreen("SMB user:"), lambda u: on_user(host_clean, u))
+            elif scheme in ("smb", "ftp"):
+                self.app.push_screen(
+                    ChoiceScreen(f"Login for {host_clean}", [LOGIN_ANON, LOGIN_USER]),
+                    lambda choice: on_login(scheme, host_clean, choice),
+                )
             else:
                 self._connect(netlocations.build_uri(scheme, host_clean), save=True)
 
+        def on_login(scheme: str, host: str, choice: str | None) -> None:
+            if not choice:
+                return
+            anonymous = choice == LOGIN_ANON
+            if scheme == "smb":
+                self._pick_share(host, anonymous=anonymous, reset=not anonymous)
+            else:
+                self._connect(
+                    netlocations.build_uri(scheme, host), save=True, anonymous=anonymous, reset=not anonymous
+                )
+
         def on_scheme(choice: str | None) -> None:
             if not choice:
                 return
@@ -571,6 +592,32 @@ class MainScreen(Screen):
 
         self.app.push_screen(ChoiceScreen("Protocol", ["SMB", "SFTP", "FTP"]), on_scheme)
 
+    def _change_login(self, uri: str) -> None:
+        """Forget the session of a saved location and connect again, anonymous or with another user."""
+        if netlocations.is_macos():
+            self.app.push_screen(
+                MessageScreen("Change login is not available on macOS: remove the location and add it again.")
+            )
+            return
+        local = netlocations.local_path(uri)
+        if local:
+            for side in ("left", "right"):
+                panel = self._panel(side)
+                if panel.path == local or panel.path.startswith(local.rstrip(os.sep) + os.sep):
+                    panel.path = os.path.expanduser("~")
+                    panel.marked.clear()
+                    panel.refresh_listing()
+
+        def on_choice(choice: str | None) -> None:
+            if not choice:
+                return
+            anonymous = choice == LOGIN_ANON
+            self._connect(uri, save=True, anonymous=anonymous, reset=True)
+
+        scheme = uri.partition("://")[0].lower()
+        options = [LOGIN_ANON, LOGIN_USER] if scheme in ("smb", "ftp") else [LOGIN_USER]
+        self.app.push_screen(ChoiceScreen(f"Login for {netlocations.label_for(uri)}", options), on_choice)
+
     def _offer_backend_install(self, scheme: str, label: str) -> None:
         command = netlocations.backend_install_command()
         if command is None:
@@ -606,16 +653,25 @@ class MainScreen(Screen):
             on_choice,
         )
 
-    def _pick_share(self, host: str, retried: bool = False, user: str | None = None) -> None:
+    def _pick_share(
+        self,
+        host: str,
+        retried: bool = False,
+        user: str | None = None,
+        anonymous: bool = False,
+        reset: bool = False,
+    ) -> None:
         self.notify(f"Listing shares on {host}...")
 
         def work() -> None:
-            shares, err = netlocations.list_shares(host, user=user)
+            if reset:  # forget a previous session so the server asks for a login again
+                netlocations.reset_login(netlocations.build_uri("smb", host))
+            shares, err = netlocations.list_shares(host, user=user, anonymous=anonymous)
             self.app.call_from_thread(done, shares, err)
 
         def done(shares: list[str] | None, err: str) -> None:
             if shares is None:
-                if retried:
+                if retried or anonymous:
                     self.app.push_screen(MessageScreen(f"Could not list shares on {host}.\n{err}"))
                     return
                 if netlocations.is_macos():
@@ -633,33 +689,45 @@ class MainScreen(Screen):
             self.app.push_screen(
                 ChoiceScreen(f"Shares on {host}", shares),
                 lambda share: share
-                and self._connect(netlocations.build_uri("smb", host, share, user=user), save=True),
+                and self._connect(
+                    netlocations.build_uri("smb", host, share, user=user), save=True, anonymous=anonymous
+                ),
             )
 
         self.run_worker(work, thread=True)
 
-    def _connect(self, uri: str, save: bool = False, retried: bool = False) -> None:
+    def _connect(
+        self,
+        uri: str,
+        save: bool = False,
+        retried: bool = False,
+        anonymous: bool | None = None,
+        reset: 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} ...")
+        anon = netlocations.is_anonymous(uri) if anonymous is None else anonymous
 
         def work() -> None:
-            ok, err = netlocations.mount(uri)
+            if reset:  # forget a previous session so the server asks for a login again
+                netlocations.reset_login(uri)
+            ok, err = netlocations.mount(uri, anonymous=anon)
             path = netlocations.local_path(uri) if ok else None
             self.app.call_from_thread(done, path, err)
 
         def done(path: str | None, err: str) -> None:
             if path:
                 if save:
-                    netlocations.save_location(uri)
+                    netlocations.save_location(uri, anonymous=anon)
                 self._go_to(path)
                 return
-            if retried or netlocations.is_macos():
+            if retried or anon or netlocations.is_macos():
                 self.app.push_screen(MessageScreen(f"Could not connect to {uri}.\n{err}"))
                 return
             with self.app.suspend():
-                netlocations.mount(uri, interactive=True)
-            self._connect(uri, save=save, retried=True)
+                netlocations.mount(uri, interactive=True, anonymous=False)
+            self._connect(uri, save=save, retried=True, anonymous=False)
 
         self.run_worker(work, thread=True)

{commandertui-1.4.1 → commandertui-1.4.3}/commandertui/modals.py

@@ -117,6 +117,7 @@ class ConfirmScreen(ModalScreen[bool]):
         self.dismiss(False)
 
 
+CHANGE_LOGIN = "\0change-login:"  # prefix PlacesScreen dismisses with, followed by the saved location's URI
 ADD_NETWORK = "\0add-network"  # sentinel PlacesScreen dismisses with to start the add-network flow
 
 
@@ -160,6 +161,7 @@ class PlacesScreen(ModalScreen[str | None]):
         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("l", "change_login", "Change login", priority=True),
         Binding("escape", "cancel", "Cancel", priority=True),
     ]
 
@@ -178,6 +180,7 @@ class PlacesScreen(ModalScreen[str | None]):
                 yield Button("Save here  (s)", id="save")
                 yield Button("Delete saved  (d)", id="delete")
                 yield Button("Unmount share  (e)", id="unmount")
+                yield Button("Change login  (l)", id="login")
                 yield Button("Close  (Esc)", id="close")
 
     def on_mount(self) -> None:
@@ -238,6 +241,17 @@ class PlacesScreen(ModalScreen[str | None]):
                 panel.marked.clear()
                 panel.refresh_listing()
 
+    def action_change_login(self) -> None:
+        """Forget the session of a saved network location to log in again (anonymous or another user)."""
+        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]
+        if place.kind != "net-saved":
+            self.notify("Pick a saved network location to change its login.", severity="warning")
+            return
+        self.dismiss(CHANGE_LOGIN + place.path)
+
     def action_unmount_share(self) -> None:
         table = self.query_one("#places-table", DataTable)
         if not self.places or table.cursor_row >= len(self.places):
@@ -268,6 +282,7 @@ class PlacesScreen(ModalScreen[str | None]):
             "save": self.action_save_here,
             "delete": self.action_delete_saved,
             "unmount": self.action_unmount_share,
+            "login": self.action_change_login,
         }.get(event.button.id, self.action_cancel)()
 
     def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:

{commandertui-1.4.1 → commandertui-1.4.3}/commandertui/netlocations.py

@@ -32,6 +32,7 @@ class NetLocation:
     label: str
     uri: str
     user: str | None = None
+    anonymous: bool = False
 
 
 def is_macos() -> bool:
@@ -57,19 +58,36 @@ def _gvfs_mount_dirs() -> list[str]:
     ]
 
 
+_FUSE_DAEMONS = (
+    "/usr/libexec/gvfsd-fuse",
+    "/usr/lib/gvfsd-fuse",
+    "/usr/lib/gvfs/gvfsd-fuse",
+    "/usr/lib64/gvfs/gvfsd-fuse",
+    "/usr/lib/x86_64-linux-gnu/gvfs/gvfsd-fuse",
+    "/usr/lib/aarch64-linux-gnu/gvfs/gvfsd-fuse",
+)
+
+
+def _fuse_present() -> bool:
+    """GVFS shows a mounted share as a local folder (~/.../gvfs/...) only through gvfsd-fuse."""
+    return any(os.path.isfile(p) for p in _FUSE_DAEMONS) or shutil.which("gvfsd-fuse") is not None
+
+
 def backend_missing(scheme: str) -> bool:
-    """True on Linux when GVFS has no backend for `scheme` (gio then answers
-    "Operation not supported"). Always False on macOS and when `gio` is absent."""
+    """True on Linux when GVFS cannot serve `scheme`: no backend for it (gio then answers
+    "Operation not supported") or no gvfsd-fuse (the share mounts but has no local folder to open).
+    Always False on macOS and when `gio` is absent."""
     if is_macos() or not gio_available():
         return False
-    return not any(os.path.isfile(os.path.join(d, f"{scheme}.mount")) for d in _gvfs_mount_dirs())
+    has_backend = any(os.path.isfile(os.path.join(d, f"{scheme}.mount")) for d in _gvfs_mount_dirs())
+    return not (has_backend and _fuse_present())
 
 
 # Package that ships the GVFS backends, per package manager.
 _BACKEND_INSTALL = {
-    "apt-get": ["sudo", "apt-get", "install", "gvfs-backends"],
+    "apt-get": ["sudo", "apt-get", "install", "gvfs-backends", "gvfs-fuse"],
     "pacman": ["sudo", "pacman", "-S", "gvfs", "gvfs-smb"],
-    "dnf": ["sudo", "dnf", "install", "gvfs-smb"],
+    "dnf": ["sudo", "dnf", "install", "gvfs-smb", "gvfs-fuse"],
 }
 
 
@@ -86,7 +104,11 @@ def install_backend() -> bool:
     command = backend_install_command()
     if command is None:
         return False
-    return subprocess.run(command).returncode == 0
+    if subprocess.run(command).returncode != 0:
+        return False
+    # A gvfsd that was already running does not know the new components: let it restart on demand.
+    subprocess.run(["pkill", "-x", "gvfsd"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    return True
 
 
 def build_uri(scheme: str, host: str, share: str | None = None, user: str | None = None) -> str:
@@ -187,11 +209,15 @@ def _list_shares_darwin(host: str, user: str | None = None) -> tuple[list[str] |
     return _parse_smbutil_view(res.stdout), ""
 
 
-def list_shares(host: str, user: str | None = None) -> tuple[list[str] | None, str]:
+def list_shares(host: str, user: str | None = None, anonymous: bool = False) -> tuple[list[str] | None, str]:
     """Shares on an SMB server. Returns (names, "") or (None, error) -- the
     caller retries after an interactive mount if login was the problem."""
     if is_macos():
         return _list_shares_darwin(host, user=user)
+    if anonymous:
+        ok, err = mount(build_uri("smb", host), anonymous=True)
+        if not ok:
+            return None, err
     try:
         res = _gio(["list", build_uri("smb", host)])
     except subprocess.TimeoutExpired:
@@ -291,11 +317,17 @@ def _mount_darwin(uri: str, interactive: bool = False) -> tuple[bool, str]:
     return False, f"timed out waiting for /Volumes/{share}"
 
 
-def mount(uri: str, interactive: bool = False) -> tuple[bool, str]:
+def mount(uri: str, interactive: bool = False, anonymous: bool | None = None) -> tuple[bool, str]:
+    """`anonymous=None` means: anonymous if the saved location says so. An anonymous
+    mount never prompts (`gio mount --anonymous`), so it is never interactive."""
     if is_macos():
         return _mount_darwin(uri, interactive=interactive)
+    if anonymous is None:
+        anonymous = is_anonymous(uri)
+    if anonymous:
+        interactive = False
     try:
-        res = _gio(["mount", uri], interactive)
+        res = _gio(["mount", "--anonymous", uri] if anonymous else ["mount", uri], interactive)
     except subprocess.TimeoutExpired:
         return False, "timed out"
     if res.returncode == 0:
@@ -397,7 +429,9 @@ def load_locations() -> list[NetLocation]:
             for d in json.load(f):
                 uri = d["uri"]
                 user = d.get("user") or _split_uri(uri)[1] or None
-                items.append(NetLocation(label=d["label"], uri=uri, user=user))
+                items.append(
+                    NetLocation(label=d["label"], uri=uri, user=user, anonymous=bool(d.get("anonymous")))
+                )
             return items
     except (OSError, ValueError, KeyError):
         return []
@@ -412,18 +446,38 @@ def _write(locations: list[NetLocation]) -> None:
         user = loc.user or uri_user
         if user:
             row["user"] = user
+        if loc.anonymous:
+            row["anonymous"] = True
         rows.append(row)
     with open(NETWORK_FILE, "w") as f:
         json.dump(rows, f, indent=2)
 
 
-def save_location(uri: str, user: str | None = None) -> None:
+def save_location(uri: str, user: str | None = None, anonymous: bool = False) -> None:
     _, uri_user, _, _ = _split_uri(uri)
-    effective_user = user or uri_user or None
+    effective_user = None if anonymous else (user or uri_user or None)
     locations = [loc for loc in load_locations() if loc.uri != uri]
-    locations.append(NetLocation(label=label_for(uri), uri=uri, user=effective_user))
+    locations.append(NetLocation(label=label_for(uri), uri=uri, user=effective_user, anonymous=anonymous))
     _write(locations)
 
 
+def is_anonymous(uri: str) -> bool:
+    """True when `uri` is a saved location that connects without a login."""
+    return any(loc.anonymous for loc in load_locations() if loc.uri == uri)
+
+
 def remove_location(uri: str) -> None:
     _write([loc for loc in load_locations() if loc.uri != uri])
+
+
+def reset_login(uri: str) -> None:
+    """Make gio forget the session for this location so the next connect asks for a login again:
+    unmounts the share and the server's browse mount. Not being mounted is fine; macOS has no such session."""
+    if is_macos():
+        return
+    scheme, _, host, _ = _split_uri(uri)
+    for target in dict.fromkeys([uri, build_uri(scheme, host)]):
+        try:
+            _gio(["mount", "-u", target])
+        except subprocess.TimeoutExpired:
+            pass

{commandertui-1.4.1 → commandertui-1.4.3}/commandertui/updater.py

@@ -112,10 +112,12 @@ makepkg -si
 
 def update_command(install: str, latest: str) -> list[str] | None:
     """The command to run for `install`, or None when there isn't a safe one."""
+    # --no-cache-dir: pip keeps the package index for minutes, so right after a release it
+    # can still say "already up to date" for a version PyPI already serves.
     if install == "pipx":
-        return ["pipx", "upgrade", PACKAGE]
+        return ["pipx", "upgrade", "--pip-args=--no-cache-dir", PACKAGE]
     if install == "pip":
-        return [sys.executable, "-m", "pip", "install", "--upgrade", PACKAGE]
+        return [sys.executable, "-m", "pip", "install", "--upgrade", "--no-cache-dir", PACKAGE]
     if install == "pacman":
         return ["bash", "-c", _ARCH_SCRIPT.format(repo=REPO, latest=latest)]
     return None  # git checkout: the user updates it with git
@@ -174,9 +176,25 @@ def skip_version(version: str) -> None:
     _save_cache(cache)
 
 
+def installed_version() -> str | None:
+    """The version on disk right now (not the one this process started with), or None if unknown."""
+    try:
+        from importlib import metadata
+
+        metadata.MetadataPathFinder.invalidate_caches()
+        return metadata.version(PACKAGE)
+    except Exception:
+        return None
+
+
 def run_update(info: UpdateInfo) -> bool:
-    """Run the upgrade attached to the real terminal. True if it exited 0."""
+    """Run the upgrade attached to the real terminal. True only if it exited 0 AND the
+    new version is really installed: a package manager can exit 0 with "already up to date"
+    when its index has not caught up with the release yet."""
     command = update_command(info.install, info.latest)
     if command is None:
         return False
-    return subprocess.run(command).returncode == 0
+    if subprocess.run(command).returncode != 0:
+        return False
+    now = installed_version()
+    return now is None or now == info.latest  # unknown version: trust the exit code

{commandertui-1.4.1 → commandertui-1.4.3}/commandertui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.4.1
+Version: 1.4.3
 Summary: Dual-pane retro terminal file manager: compare, sync, copy and move folders
 Author: Humberto Barchini
 License-Expression: MIT
@@ -140,7 +140,7 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `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, `e` unmount a mounted SMB share |
+| `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, `l` change the login of a saved network location (forgets the session, then anonymous or another user) |
 | `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 |
@@ -162,7 +162,9 @@ 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 (on macOS, the system login dialog asks and saves it in Keychain).
-If the GVFS backend for the chosen protocol is not installed (a bare Ubuntu server, for example, has none), the app says so and offers to install it for you (`apt-get install gvfs-backends`, `pacman -S gvfs gvfs-smb` or `dnf install gvfs-smb`); it asks for your sudo password in the terminal and only runs if you answer *Install now*.
+For SMB and FTP the app first asks **Anonymous (no login)** or **User and password**; anonymous connects with `gio mount --anonymous`, with no user, workgroup or password prompt, and is remembered per location. Choosing *User and password* forgets any earlier session for that server first, so the login prompt always appears.
+
+If the GVFS backend (or `gvfs-fuse`, which gives a mounted share a folder to browse) for the chosen protocol is not installed (a bare Ubuntu server, for example, has none), the app says so and offers to install it for you (`apt-get install gvfs-backends gvfs-fuse`, `pacman -S gvfs gvfs-smb` or `dnf install gvfs-smb gvfs-fuse`); it asks for your sudo password in the terminal and only runs if you answer *Install now*.
 
 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.1 → commandertui-1.4.3}/tests/test_app_smoke.py

@@ -1222,3 +1222,121 @@ async def test_missing_gvfs_backend_cancel_installs_nothing(tmp_path, monkeypatc
         await pilot.press("down", "enter")  # "Cancel"
         await pilot.pause()
         assert ran == []
+
+
+@pytest.mark.asyncio
+async def test_add_smb_asks_login_and_anonymous_skips_every_prompt(tmp_path, monkeypatch):
+    from commandertui import netlocations
+    from commandertui.modals import ChoiceScreen, InputScreen
+
+    seen = {}
+    monkeypatch.setattr(netlocations, "gio_available", lambda: True)
+    monkeypatch.setattr(netlocations, "backend_missing", lambda scheme: False)
+    monkeypatch.setattr(netlocations.sys, "platform", "linux")
+
+    def fake_list(host, user=None, anonymous=False):
+        seen["list"] = (host, user, anonymous)
+        return ["Public", "HD1"], ""
+
+    monkeypatch.setattr(netlocations, "list_shares", fake_list)
+    monkeypatch.setattr(netlocations, "reset_login", lambda uri: seen.setdefault("reset", uri))
+    monkeypatch.setattr(
+        netlocations,
+        "mount",
+        lambda uri, interactive=False, anonymous=None: seen.update(mount=(uri, interactive, anonymous))
+        or (True, ""),
+    )
+    monkeypatch.setattr(netlocations, "local_path", lambda uri: str(tmp_path))
+    saved = []
+    monkeypatch.setattr(
+        netlocations, "save_location", lambda uri, user=None, anonymous=False: saved.append((uri, anonymous))
+    )
+
+    app, left, right = await _open_confirm(tmp_path, "")
+    async with app.run_test(size=(140, 30)) as pilot:
+        await _skip_boot(pilot)
+        await pilot.press("p", "a", "enter")  # Places -> Add -> SMB
+        await pilot.pause()
+        assert isinstance(app.screen, InputScreen)
+        app.screen.query_one("#input-field").value = "192.168.100.14"
+        await pilot.press("enter")
+        await pilot.pause()
+        assert isinstance(app.screen, ChoiceScreen) and app.screen.options == [
+            "Anonymous (no login)",
+            "User and password",
+        ]
+        await pilot.press("enter")  # Anonymous
+        await pilot.pause()
+        await pilot.pause()
+        assert seen["list"] == ("192.168.100.14", None, True)
+        assert "reset" not in seen  # anonymous does not need a fresh session
+        assert isinstance(app.screen, ChoiceScreen) and app.screen.options == ["Public", "HD1"]
+        await pilot.press("enter")  # Public
+        await pilot.pause()
+        await pilot.pause()
+        assert seen["mount"] == ("smb://192.168.100.14/Public/", False, True)
+        assert saved == [("smb://192.168.100.14/Public/", True)]
+
+
+@pytest.mark.asyncio
+async def test_add_smb_with_user_resets_the_old_session_first(tmp_path, monkeypatch):
+    from commandertui import netlocations
+
+    seen = {}
+    monkeypatch.setattr(netlocations, "gio_available", lambda: True)
+    monkeypatch.setattr(netlocations, "backend_missing", lambda scheme: False)
+    monkeypatch.setattr(netlocations.sys, "platform", "linux")
+    monkeypatch.setattr(netlocations, "reset_login", lambda uri: seen.update(reset=uri))
+    monkeypatch.setattr(
+        netlocations,
+        "list_shares",
+        lambda host, user=None, anonymous=False: seen.update(list=anonymous) or (["HD1"], ""),
+    )
+
+    app, left, right = await _open_confirm(tmp_path, "")
+    async with app.run_test(size=(140, 30)) as pilot:
+        await _skip_boot(pilot)
+        await pilot.press("p", "a", "enter")
+        await pilot.pause()
+        app.screen.query_one("#input-field").value = "nas"
+        await pilot.press("enter")
+        await pilot.pause()
+        await pilot.press("down", "enter")  # User and password
+        await pilot.pause()
+        await pilot.pause()
+        assert seen == {"reset": "smb://nas/", "list": False}
+
+
+@pytest.mark.asyncio
+async def test_places_change_login_resets_and_reconnects(tmp_path, monkeypatch):
+    from commandertui import netlocations
+    from commandertui.modals import ChoiceScreen
+
+    monkeypatch.setattr(netlocations, "NETWORK_FILE", str(tmp_path / "network.json"))
+    monkeypatch.setattr(netlocations.sys, "platform", "linux")
+    netlocations.save_location("smb://nas/HD1/", user="old")
+    seen = {}
+    monkeypatch.setattr(netlocations, "reset_login", lambda uri: seen.update(reset=uri))
+    monkeypatch.setattr(
+        netlocations,
+        "mount",
+        lambda uri, interactive=False, anonymous=None: seen.update(mount=(uri, anonymous)) or (True, ""),
+    )
+    monkeypatch.setattr(netlocations, "local_path", lambda uri: str(tmp_path))
+
+    app, left, right = await _open_confirm(tmp_path, "")
+    async with app.run_test(size=(140, 30)) as pilot:
+        await _skip_boot(pilot)
+        await pilot.press("p")
+        await pilot.pause()
+        table = app.screen.query_one("#places-table")
+        row = [i for i, pl in enumerate(app.screen.places) if pl.path == "smb://nas/HD1/"][0]
+        table.move_cursor(row=row)
+        await pilot.press("l")
+        await pilot.pause()
+        assert isinstance(app.screen, ChoiceScreen) and app.screen.options[0] == "Anonymous (no login)"
+        await pilot.press("enter")  # Anonymous
+        await pilot.pause()
+        await pilot.pause()
+        assert seen == {"reset": "smb://nas/HD1/", "mount": ("smb://nas/HD1/", True)}
+        assert netlocations.is_anonymous("smb://nas/HD1/")

{commandertui-1.4.1 → commandertui-1.4.3}/tests/test_netlocations.py

@@ -252,10 +252,15 @@ def test_backend_missing_checks_gvfs_mount_files(monkeypatch, tmp_path):
     mounts = tmp_path / "gvfs" / "mounts"
     mounts.mkdir(parents=True)
     monkeypatch.setattr(netlocations, "_gvfs_mount_dirs", lambda: [str(mounts)])
+    monkeypatch.setattr(netlocations, "_fuse_present", lambda: True)
     assert netlocations.backend_missing("smb") is True
     (mounts / "smb.mount").write_text("")
     assert netlocations.backend_missing("smb") is False
     assert netlocations.backend_missing("sftp") is True
+    monkeypatch.setattr(
+        netlocations, "_fuse_present", lambda: False
+    )  # backend ok but no folder to open the share in
+    assert netlocations.backend_missing("smb") is True
 
 
 def test_backend_missing_is_false_on_macos_or_without_gio(monkeypatch):
@@ -270,7 +275,13 @@ def test_backend_install_command_per_package_manager(monkeypatch):
     monkeypatch.setattr(
         netlocations.shutil, "which", lambda name: "/usr/bin/" + name if name == "apt-get" else None
     )
-    assert netlocations.backend_install_command() == ["sudo", "apt-get", "install", "gvfs-backends"]
+    assert netlocations.backend_install_command() == [
+        "sudo",
+        "apt-get",
+        "install",
+        "gvfs-backends",
+        "gvfs-fuse",
+    ]
     monkeypatch.setattr(
         netlocations.shutil, "which", lambda name: "/usr/bin/pacman" if name == "pacman" else None
     )
@@ -282,7 +293,58 @@ def test_backend_install_command_per_package_manager(monkeypatch):
 
 def test_install_backend_reports_exit_code(monkeypatch):
     monkeypatch.setattr(netlocations, "backend_install_command", lambda: ["sudo", "true"])
-    monkeypatch.setattr(netlocations.subprocess, "run", lambda cmd: subprocess.CompletedProcess(cmd, 0))
+    monkeypatch.setattr(netlocations.subprocess, "run", lambda cmd, **kw: subprocess.CompletedProcess(cmd, 0))
     assert netlocations.install_backend() is True
-    monkeypatch.setattr(netlocations.subprocess, "run", lambda cmd: subprocess.CompletedProcess(cmd, 1))
+    monkeypatch.setattr(netlocations.subprocess, "run", lambda cmd, **kw: subprocess.CompletedProcess(cmd, 1))
     assert netlocations.install_backend() is False
+
+
+def test_anonymous_location_is_saved_and_mounted_without_prompting(monkeypatch, tmp_path):
+    monkeypatch.setattr(netlocations.sys, "platform", "linux")
+    monkeypatch.setattr(netlocations, "NETWORK_FILE", str(tmp_path / "network.json"))
+    netlocations.save_location("smb://nas/Public/", anonymous=True)
+    loc = netlocations.load_locations()[0]
+    assert loc.anonymous is True and loc.user is None
+    assert netlocations.is_anonymous("smb://nas/Public/") and not netlocations.is_anonymous("smb://other/")
+    calls = []
+
+    def fake_gio(args, interactive=False):
+        calls.append((args, interactive))
+        return _cp()
+
+    monkeypatch.setattr(netlocations, "_gio", fake_gio)
+    assert netlocations.mount("smb://nas/Public/", interactive=True) == (True, "")  # saved as anonymous
+    assert calls == [(["mount", "--anonymous", "smb://nas/Public/"], False)]
+    calls.clear()
+    netlocations.mount("smb://nas/Public/", anonymous=False)  # explicit user login wins over the saved flag
+    assert calls == [(["mount", "smb://nas/Public/"], False)]
+
+
+def test_anonymous_list_shares_mounts_the_server_first(monkeypatch):
+    monkeypatch.setattr(netlocations.sys, "platform", "linux")
+    calls = []
+
+    def fake_gio(args, interactive=False):
+        calls.append(args)
+        return _cp(stdout="Public\nHD1\n") if args[0] == "list" else _cp()
+
+    monkeypatch.setattr(netlocations, "_gio", fake_gio)
+    assert netlocations.list_shares("nas", anonymous=True) == (["Public", "HD1"], "")
+    assert calls == [["mount", "--anonymous", "smb://nas/"], ["list", "smb://nas/"]]
+    monkeypatch.setattr(
+        netlocations, "_gio", lambda args, interactive=False: _cp(returncode=1, stderr="denied")
+    )
+    assert netlocations.list_shares("nas", anonymous=True) == (None, "denied")
+
+
+def test_reset_login_unmounts_the_share_and_the_server(monkeypatch):
+    monkeypatch.setattr(netlocations.sys, "platform", "linux")
+    calls = []
+    monkeypatch.setattr(
+        netlocations, "_gio", lambda args, interactive=False: calls.append(args) or _cp(returncode=1)
+    )
+    netlocations.reset_login("smb://nas/Public/")  # "not mounted" errors are fine
+    assert calls == [["mount", "-u", "smb://nas/Public/"], ["mount", "-u", "smb://nas/"]]
+    calls.clear()
+    netlocations.reset_login("smb://nas/")
+    assert calls == [["mount", "-u", "smb://nas/"]]

{commandertui-1.4.1 → commandertui-1.4.3}/tests/test_updater.py

@@ -62,9 +62,14 @@ def test_fake_latest_env_shows_an_update_without_a_release(monkeypatch):
 
 
 def test_update_commands_per_install_kind():
-    assert updater.update_command("pipx", "2.0.0") == ["pipx", "upgrade", "commandertui"]
+    assert updater.update_command("pipx", "2.0.0") == [
+        "pipx",
+        "upgrade",
+        "--pip-args=--no-cache-dir",
+        "commandertui",
+    ]
     pip = updater.update_command("pip", "2.0.0")
-    assert pip[1:] == ["-m", "pip", "install", "--upgrade", "commandertui"]
+    assert pip[1:] == ["-m", "pip", "install", "--upgrade", "--no-cache-dir", "commandertui"]
     assert updater.update_command("source", "2.0.0") is None
     arch = updater.update_command("pacman", "2.0.0")
     assert arch[:2] == ["bash", "-c"]
@@ -116,3 +121,30 @@ def test_check_status_tells_ok_new_skipped_and_offline(monkeypatch):
     assert updater.check_status(current="1.1.0") == (None, "skipped")
     monkeypatch.setattr(updater, "fetch_latest", lambda: None)
     assert updater.check_status(current="1.1.0") == (None, "offline")
+
+
+def _info(latest="2.0.0", install="pipx"):
+    return updater.UpdateInfo(current="1.0.0", latest=latest, install=install)
+
+
+def test_run_update_requires_the_new_version_to_be_installed(monkeypatch):
+    import subprocess
+
+    monkeypatch.setattr(updater.subprocess, "run", lambda cmd, **kw: subprocess.CompletedProcess(cmd, 0))
+    monkeypatch.setattr(updater, "installed_version", lambda: "2.0.0")
+    assert updater.run_update(_info()) is True
+    # pipx said "already up to date" (exit 0) but the old version is still there
+    monkeypatch.setattr(updater, "installed_version", lambda: "1.0.0")
+    assert updater.run_update(_info()) is False
+    # version unknown: trust the exit code
+    monkeypatch.setattr(updater, "installed_version", lambda: None)
+    assert updater.run_update(_info()) is True
+
+
+def test_run_update_fails_on_nonzero_exit_without_checking_version(monkeypatch):
+    import subprocess
+
+    monkeypatch.setattr(updater.subprocess, "run", lambda cmd, **kw: subprocess.CompletedProcess(cmd, 1))
+    monkeypatch.setattr(updater, "installed_version", lambda: "2.0.0")
+    assert updater.run_update(_info()) is False
+    assert updater.run_update(_info(install="source")) is False

commandertui-1.4.1/commandertui/__init__.py

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