commandertui 1.4.0__tar.gz → 1.4.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.4.0
+Version: 1.4.1
 Summary: Dual-pane retro terminal file manager: compare, sync, copy and move folders
 Author: Humberto Barchini
 License-Expression: MIT
@@ -162,6 +162,7 @@ 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*.
 
 Every key also has a clickable box on the bottom bar: one row on wide windows
 (168+ columns), two rows when narrower (120 columns is the practical minimum).

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

@@ -143,6 +143,7 @@ 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*.
 
 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/__init__.py

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

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

@@ -365,7 +365,10 @@ class MainScreen(Screen):
 
         self.app.push_screen(
             ChoiceScreen(
-                "Color theme", labels, initial=initial, on_highlight=lambda i: self.app.preview_theme(names[i])
+                "Color theme",
+                labels,
+                initial=initial,
+                on_highlight=lambda i: self.app.preview_theme(names[i]),
             ),
             on_choice,
         )
@@ -421,9 +424,7 @@ class MainScreen(Screen):
             return
         command = editor.editor_command()
         if command is None:
-            self.app.push_screen(
-                MessageScreen("No text editor found.\nSet $EDITOR or install nano.")
-            )
+            self.app.push_screen(MessageScreen("No text editor found.\nSet $EDITOR or install nano."))
             return
         with self.app.suspend():
             try:
@@ -561,12 +562,50 @@ class MainScreen(Screen):
             if netlocations.is_macos() and scheme != "smb":
                 self.app.push_screen(MessageScreen(netlocations.MACOS_UNSUPPORTED_MSG))
                 return
+            if netlocations.backend_missing(scheme):
+                self._offer_backend_install(scheme, choice)
+                return
             self.app.push_screen(
                 InputScreen(f"{choice} server (IP or name):"), lambda host: on_host(scheme, host)
             )
 
         self.app.push_screen(ChoiceScreen("Protocol", ["SMB", "SFTP", "FTP"]), on_scheme)
 
+    def _offer_backend_install(self, scheme: str, label: str) -> None:
+        command = netlocations.backend_install_command()
+        if command is None:
+            self.app.push_screen(
+                MessageScreen(
+                    f"{label} needs the GVFS {scheme} backend, which is not installed.\nInstall your system's GVFS backends package and try again."
+                )
+            )
+            return
+        text = " ".join(command)
+
+        def on_choice(choice: str | None) -> None:
+            if choice != "Install now":
+                return
+            with self.app.suspend():
+                ok = netlocations.install_backend()
+            if ok:
+                self.app.push_screen(
+                    MessageScreen(
+                        "GVFS backends installed.\nQuit and reopen CommanderTUI, then add the location again."
+                    )
+                )
+            else:
+                self.app.push_screen(
+                    MessageScreen("The install did not finish. Check the terminal output, then try again.")
+                )
+
+        self.app.push_screen(
+            ChoiceScreen(
+                f"{label} needs the GVFS backend, which is missing. Install it now? ({text}; asks for your sudo password)",
+                ["Install now", "Cancel"],
+            ),
+            on_choice,
+        )
+
     def _pick_share(self, host: str, retried: bool = False, user: str | None = None) -> None:
         self.notify(f"Listing shares on {host}...")
 

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

@@ -48,6 +48,47 @@ def network_available() -> bool:
     return gio_available()
 
 
+def _gvfs_mount_dirs() -> list[str]:
+    data_dirs = os.environ.get("XDG_DATA_DIRS") or "/usr/local/share:/usr/share"
+    return [
+        os.path.join(d, "gvfs", "mounts")
+        for d in ["/usr/share", "/usr/local/share", *data_dirs.split(":")]
+        if d
+    ]
+
+
+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."""
+    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())
+
+
+# Package that ships the GVFS backends, per package manager.
+_BACKEND_INSTALL = {
+    "apt-get": ["sudo", "apt-get", "install", "gvfs-backends"],
+    "pacman": ["sudo", "pacman", "-S", "gvfs", "gvfs-smb"],
+    "dnf": ["sudo", "dnf", "install", "gvfs-smb"],
+}
+
+
+def backend_install_command() -> list[str] | None:
+    """The command that installs the GVFS backends here, or None if the package manager is unknown."""
+    for manager, command in _BACKEND_INSTALL.items():
+        if shutil.which(manager):
+            return list(command)
+    return None
+
+
+def install_backend() -> bool:
+    """Run the install attached to the real terminal (sudo asks for the password). True if it exited 0."""
+    command = backend_install_command()
+    if command is None:
+        return False
+    return subprocess.run(command).returncode == 0
+
+
 def build_uri(scheme: str, host: str, share: str | None = None, user: str | None = None) -> str:
     host = host.strip().strip("/")
     user_clean = user.strip() if user else ""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.4.0
+Version: 1.4.1
 Summary: Dual-pane retro terminal file manager: compare, sync, copy and move folders
 Author: Humberto Barchini
 License-Expression: MIT
@@ -162,6 +162,7 @@ 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*.
 
 Every key also has a clickable box on the bottom bar: one row on wide windows
 (168+ columns), two rows when narrower (120 columns is the practical minimum).

{commandertui-1.4.0 → commandertui-1.4.1}/tests/test_app_smoke.py

@@ -1159,3 +1159,66 @@ async def test_places_unmount_share_checks_type_evicts_panel_and_reports_busy(tm
         await pilot.pause()
         assert isinstance(app.screen, MessageScreen)
         assert "failed to unmount" in app.screen.text
+
+
+@pytest.mark.asyncio
+async def test_missing_gvfs_backend_offers_install_and_runs_it(tmp_path, monkeypatch):
+    import contextlib
+
+    from commandertui import netlocations
+    from commandertui.modals import ChoiceScreen, InputScreen
+
+    left = tmp_path / "left"
+    right = tmp_path / "right"
+    left.mkdir()
+    right.mkdir()
+    ran = []
+    monkeypatch.setattr(netlocations, "gio_available", lambda: True)
+    monkeypatch.setattr(netlocations, "backend_missing", lambda scheme: True)
+    monkeypatch.setattr(
+        netlocations, "backend_install_command", lambda: ["sudo", "apt-get", "install", "gvfs-backends"]
+    )
+    monkeypatch.setattr(netlocations, "install_backend", lambda: ran.append(True) or True)
+
+    app = CommanderApp(left_path=str(left), right_path=str(right))
+    async with app.run_test() as pilot:
+        await _skip_boot(pilot)
+        app.suspend = contextlib.nullcontext  # headless: no real terminal to hand over
+        app.screen._add_network()
+        await pilot.pause()
+        await pilot.press("enter")  # protocol: SMB
+        await pilot.pause()
+        # no server prompt: the app asks to install first
+        assert isinstance(app.screen, ChoiceScreen) and not isinstance(app.screen, InputScreen)
+        assert "gvfs-backends" in app.screen.prompt
+        await pilot.press("enter")  # "Install now"
+        await pilot.pause()
+        assert ran == [True]
+
+
+@pytest.mark.asyncio
+async def test_missing_gvfs_backend_cancel_installs_nothing(tmp_path, monkeypatch):
+    from commandertui import netlocations
+
+    left = tmp_path / "left"
+    right = tmp_path / "right"
+    left.mkdir()
+    right.mkdir()
+    ran = []
+    monkeypatch.setattr(netlocations, "gio_available", lambda: True)
+    monkeypatch.setattr(netlocations, "backend_missing", lambda scheme: True)
+    monkeypatch.setattr(
+        netlocations, "backend_install_command", lambda: ["sudo", "apt-get", "install", "gvfs-backends"]
+    )
+    monkeypatch.setattr(netlocations, "install_backend", lambda: ran.append(True) or True)
+
+    app = CommanderApp(left_path=str(left), right_path=str(right))
+    async with app.run_test() as pilot:
+        await _skip_boot(pilot)
+        app.screen._add_network()
+        await pilot.pause()
+        await pilot.press("enter")
+        await pilot.pause()
+        await pilot.press("down", "enter")  # "Cancel"
+        await pilot.pause()
+        assert ran == []

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

@@ -244,3 +244,45 @@ def test_trash_fallback_uses_macos_trash_on_darwin(tmp_path, monkeypatch):
     assert trash.send_to_trash(str(f)) is True
     assert not f.exists()
     assert (fake_home / ".Trash" / "doc.txt").read_text() == "trash me"
+
+
+def test_backend_missing_checks_gvfs_mount_files(monkeypatch, tmp_path):
+    monkeypatch.setattr(netlocations.sys, "platform", "linux")
+    monkeypatch.setattr(netlocations, "gio_available", lambda: True)
+    mounts = tmp_path / "gvfs" / "mounts"
+    mounts.mkdir(parents=True)
+    monkeypatch.setattr(netlocations, "_gvfs_mount_dirs", lambda: [str(mounts)])
+    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
+
+
+def test_backend_missing_is_false_on_macos_or_without_gio(monkeypatch):
+    monkeypatch.setattr(netlocations.sys, "platform", "darwin")
+    assert netlocations.backend_missing("smb") is False
+    monkeypatch.setattr(netlocations.sys, "platform", "linux")
+    monkeypatch.setattr(netlocations, "gio_available", lambda: False)
+    assert netlocations.backend_missing("smb") is False
+
+
+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"]
+    monkeypatch.setattr(
+        netlocations.shutil, "which", lambda name: "/usr/bin/pacman" if name == "pacman" else None
+    )
+    assert netlocations.backend_install_command() == ["sudo", "pacman", "-S", "gvfs", "gvfs-smb"]
+    monkeypatch.setattr(netlocations.shutil, "which", lambda name: None)
+    assert netlocations.backend_install_command() is None
+    assert netlocations.install_backend() is False
+
+
+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))
+    assert netlocations.install_backend() is True
+    monkeypatch.setattr(netlocations.subprocess, "run", lambda cmd: subprocess.CompletedProcess(cmd, 1))
+    assert netlocations.install_backend() is False

commandertui-1.4.0/commandertui/__init__.py

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