tacklebox-cli 0.4.2__tar.gz → 0.4.3__tar.gz

{tacklebox_cli-0.4.2 → tacklebox_cli-0.4.3}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: tacklebox-cli
-Version: 0.4.2
+Version: 0.4.3
 Summary: A small collection of CLI utilities.
 Project-URL: Homepage, https://c.csw.im/cswimr/tacklebox
 Project-URL: Issues, https://c.csw.im/cswimr/tacklebox/issues
-Project-URL: Source Archive, https://c.csw.im/cswimr/tacklebox/archive/bd061b0360efe66956b1bfd3d7ec74b23cd84d67.tar.gz
+Project-URL: Source Archive, https://c.csw.im/cswimr/tacklebox/archive/d62432a7c631e0b612f20744c68f03c88dbc5313.tar.gz
 Author-email: cswimr <seaswimmerthefsh@gmail.com>
 License-Expression: MIT
 License-File: LICENSE.md
@@ -20,14 +20,14 @@ Description-Content-Type: text/markdown
 [<img alt="Actions Status" src="https://c.csw.im/cswimr/tacklebox/badges/workflows/actions.yml/badge.svg?style=plastic">](https://c.csw.im/cswimr/tacklebox/actions?workflow=actions.yml)
 [<img alt="PyPI - Version" src="https://img.shields.io/pypi/v/tacklebox-cli?style=plastic">](https://pypi.org/project/tacklebox-cli/)
 [<img alt="PyPI - Python Version" src="https://img.shields.io/pypi/pyversions/tacklebox-cli?style=plastic">](https://pypi.org/project/tacklebox-cli/)
-[<img alt="PyPI - License" src="https://img.shields.io/pypi/l/tacklebox-cli?style=plastic">](https://c.csw.im/cswimr/tacklebox/src/tag/0.4.2/LICENSE.md)  
+[<img alt="PyPI - License" src="https://img.shields.io/pypi/l/tacklebox-cli?style=plastic">](https://c.csw.im/cswimr/tacklebox/src/tag/0.4.3/LICENSE.md)  
 tacklebox-cli offers a suite of useful CLI tools.
 
 ## Usage
 
 ### tacklebox copy / paste
 
-Cross-platform clipboard management tool. Uses system tools such as `wl-copy` on Linux Wayland or `clip.exe` on Windows, and [OSC 52](https://www.reddit.com/r/vim/comments/k1ydpn/a_guide_on_how_to_copy_text_from_anywhere/) escape codes when **copying** over SSH or when no other tools are available. See [`copy_with_tooling()`](https://c.csw.im/cswimr/tacklebox/src/tag/0.4.2/tacklebox/commands/clipboard.py) for all supported tools.
+Cross-platform clipboard management tool. Uses system tools such as `wl-copy` on Linux Wayland or `clip.exe` on Windows, and [OSC 52](https://www.reddit.com/r/vim/comments/k1ydpn/a_guide_on_how_to_copy_text_from_anywhere/) escape codes when **copying** over SSH or when no other tools are available. See [`copy_with_tooling()`](https://c.csw.im/cswimr/tacklebox/src/tag/0.4.3/tacklebox/commands/clipboard.py) for all supported tools.
 
 ```bash
 $ echo "a" | tacklebox copy --trim && tacklebox paste

{tacklebox_cli-0.4.2 → tacklebox_cli-0.4.3}/tacklebox/commands/clipboard.py

@@ -7,7 +7,7 @@ from base64 import b64encode
 from enum import Enum
 from typing import Annotated, Literal
 
-from typer import Argument, Exit, Option, Typer, echo
+from typer import Argument, Exit, Option, Typer
 
 from tacklebox.utils import get_environment, stderr, stdout
 
@@ -33,7 +33,7 @@ def _try_command(mode: ClipboardMode, cmd: list[str], verbose: bool = False, dat
     """
     if shutil.which(cmd[0]) is None:
         if verbose:
-            echo(f"{cmd[0]} not found in PATH.", err=True)
+            stderr.print(f"{cmd[0]} not found in PATH.")
         return False, None
 
     if cmd[0] == "clip.exe":
@@ -45,20 +45,26 @@ def _try_command(mode: ClipboardMode, cmd: list[str], verbose: bool = False, dat
         result = subprocess.run(
             cmd,
             input=data.encode(encoder) if data else None,
-            capture_output=True,
+            # in PASTE mode, we need stdout, but we don't care about it in COPY mode
+            # this fixes a bug where `wl-copy` sometimes hangs when stdout is piped
+            capture_output=True if mode == ClipboardMode.PASTE else False,
             env=get_environment(),
             timeout=30,
         )
         if result.returncode == 0:
             if verbose:
-                echo(f"{mode.value} using {' '.join(cmd)}", err=True)
+                stderr.print(f"{mode.value} using {' '.join(cmd)}")
             return True, result.stdout.decode(encoder) if result.stdout else None
     except subprocess.TimeoutExpired:
         if verbose:
-            echo(f"{cmd[0]} timed out", err=True)
+            stderr.print(
+                f"{cmd[0]} timed out",
+            )
     except OSError as e:
         if verbose:
-            echo(f"{cmd[0]} execution failed: {e}", err=True)
+            stderr.print(
+                f"{cmd[0]} execution failed: {e}",
+            )
     return False, None
 
 
@@ -71,7 +77,6 @@ def use_tooling(
     - The content of the `command` argument.
     - If `mode == ClipboardMode.COPY`:
         - Linux (Wayland):
-            - `wl-copy -o`
             - `wl-copy`
             - `copyq add -`
         - Linux (X11):
@@ -116,13 +121,10 @@ def use_tooling(
 
     tools: dict[ClipboardMode, dict[str, list[list[str]]]] = {
         ClipboardMode.COPY: {
-            "wayland": [["wl-copy", "-o"], ["wl-copy"], ["copyq", "add", "-"]],
+            "wayland": [["wl-copy"], ["copyq", "add", "-"]],
             "x11": [["xclip", "-selection", "clipboard"], ["xsel", "--clipboard", "--input"], ["copyq", "add", "-"]],
             "darwin": [["reattach-to-user-namespace", "pbcopy"], ["pbcopy"]],
-            "windows": [
-                ["win32yank.exe", "-i"],
-                ["clip.exe"],
-            ],
+            "windows": [["win32yank.exe", "-i"], ["clip.exe"]],
         },
         ClipboardMode.PASTE: {
             "wayland": [["wl-paste", "--no-newline"], ["copyq", "read", "0"]],

{tacklebox_cli-0.4.2 → tacklebox_cli-0.4.3}/tacklebox/version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.4.2'
-__version_tuple__ = version_tuple = (0, 4, 2)
+__version__ = version = '0.4.3'
+__version_tuple__ = version_tuple = (0, 4, 3)
 
 __commit_id__ = commit_id = None