dotlocalslashbin 0.0.25__tar.gz → 0.0.26__tar.gz

{dotlocalslashbin-0.0.25 → dotlocalslashbin-0.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotlocalslashbin
-Version: 0.0.25
+Version: 0.0.26
 Summary: Download and extract files to `~/.local/bin/`.
 Author-email: Keith Maxwell <keith.maxwell@gmail.com>
 Requires-Python: >=3.11
@@ -81,7 +81,7 @@ ignore = ["LICENSE", "README.md", "CHANGELOG.md"]
 
 Command:
 
-    uv tool run dotlocalslashbin --input=tofu.toml --output=.
+    uv tool run dotlocalslashbin --output=. tofu.toml
 
 Further examples are available in files like `linux-amd64.toml` and
 `github.toml` in the `bin` directory of

{dotlocalslashbin-0.0.25 → dotlocalslashbin-0.0.26}/README.md

@@ -57,7 +57,7 @@ ignore = ["LICENSE", "README.md", "CHANGELOG.md"]
 
 Command:
 
-    uv tool run dotlocalslashbin --input=tofu.toml --output=.
+    uv tool run dotlocalslashbin --output=. tofu.toml
 
 Further examples are available in files like `linux-amd64.toml` and
 `github.toml` in the `bin` directory of

{dotlocalslashbin-0.0.25 → dotlocalslashbin-0.0.26}/src/dotlocalslashbin.py

@@ -8,27 +8,26 @@
 # ///
 """Download and extract files to `~/.local/bin/`."""
 
-import gzip
-import tarfile
 from argparse import ArgumentParser, BooleanOptionalAction, Namespace
 from dataclasses import dataclass
 from enum import Enum
+from gzip import GzipFile
 from hashlib import file_digest
 from pathlib import Path
 from shlex import split
 from shutil import copy, copyfileobj
 from stat import S_IEXEC
 from subprocess import run
+from tarfile import open as tar_open, TarFile, TarInfo
 from tomllib import load
 from urllib.error import HTTPError
 from urllib.request import urlopen
-from zipfile import ZipFile
+from zipfile import ZipFile, ZipInfo
 
-__version__ = "0.0.25"
+__version__ = "0.0.26"
 
 _CACHE = Path("~/.cache/dotlocalslashbin/")
 _HOME = str(Path("~").expanduser())
-_INPUT = "bin.toml"
 _OUTPUT = Path("~/.local/bin/")
 _SHA512_LENGTH = 128
 
@@ -44,7 +43,7 @@ Action = Enum("Action", ["command", "copy", "gunzip", "symlink", "untar", "unzip
 
 @dataclass(init=False)
 class Item:
-    """Class for an application."""
+    """Class for an artifact listed in input."""
 
     name: str
     url: str
@@ -58,9 +57,9 @@ class Item:
     ignore: set
 
 
-def main() -> int:
+def main(_args: list[str] | None = None) -> int:
     """Parse command line arguments and download each file."""
-    args = _parse_args()
+    args = _parse_args(_args)
 
     if args.clear:
         for path in args.cache.expanduser().iterdir():
@@ -100,7 +99,11 @@ def main() -> int:
 
         arg0 = str(item.target.absolute())
         prompt = "#" if item.version else "$"
-        print(" ".join((prompt, arg0.replace(_HOME, "~"), item.version)))
+        if item.target.exists():
+            print(" ".join((prompt, arg0.replace(_HOME, "~"), item.version)))
+        else:
+            destination = str(item.target.parent).replace(_HOME, "~")
+            print(f"$ {destination} now contains {item.name}")
         if item.version:
             run([arg0, *split(item.version)], check=True)
         print()
@@ -125,28 +128,22 @@ def _process(item: Item) -> None:
     item.target.parent.mkdir(parents=True, exist_ok=True)
     item.target.unlink(missing_ok=True)
     _action(item)
-    if not item.target.is_symlink():
+    if item.target.exists() and not item.target.is_symlink():
         item.target.chmod(item.target.stat().st_mode | S_IEXEC)
 
 
-def _parse_args() -> _CustomNamespace:
-    parser = ArgumentParser(
-        prog=Path(__file__).name,
-        epilog="¹ --input can be specified multiple times",
-    )
+def _parse_args(args: list[str] | None) -> _CustomNamespace:
+    parser = ArgumentParser(prog=Path(__file__).name)
     parser.add_argument("--version", action="version", version=__version__)
-    help_ = f"TOML specification (default: {_INPUT})¹"
-    parser.add_argument("--input", action="append", help=help_, type=Path)
     help_ = f"Target directory (default: {_OUTPUT})"
     parser.add_argument("--output", default=_OUTPUT, help=help_, type=Path)
     help_ = f"Cache directory (default: {_CACHE})"
     parser.add_argument("--cache", default=_CACHE, help=help_, type=Path)
     help_ = "Clear the cache directory first (default: --no-clear)"
     parser.add_argument("--clear", action=BooleanOptionalAction, help=help_)
-    result = parser.parse_args(namespace=_CustomNamespace())
-    if not result.input:
-        result.input = [Path(_INPUT)]
-    return result
+    help_ = "input specification in TOML"
+    parser.add_argument("input", nargs="+", help=help_, type=Path)
+    return parser.parse_args(args, namespace=_CustomNamespace())
 
 
 def _download(item: Item) -> None:
@@ -166,25 +163,50 @@ def _action(item: Item) -> None:
         copy(item.downloaded, item.target)
     elif item.action == Action.symlink:
         item.target.symlink_to(item.downloaded)
-    elif item.action == Action.unzip:
-        with ZipFile(item.downloaded, "r") as file:
-            file.extract(item.target.name, path=item.target.parent)
     elif item.action == Action.gunzip:
-        with gzip.open(item.downloaded, "r") as fsrc, item.target.open("wb") as fdst:
+        with GzipFile(item.downloaded, "r") as fsrc, item.target.open("wb") as fdst:
             copyfileobj(fsrc, fdst)
-    elif item.action == Action.untar:
-        with tarfile.open(item.downloaded, "r") as file:
+    elif item.action in (Action.unzip, Action.untar):
+        _many_files(item)
+    elif item.action == Action.command and item.command is not None:
+        cmd = item.command.format(target=item.target, downloaded=item.downloaded)
+        run(split(cmd), check=True)
+
+
+def _many_files(item: Item) -> None:
+    """Unzip or untar an item.
+
+    These two actions should respect 'ignore' and 'prefix' similarly.
+    """
+
+    def _should_continue(filename: str) -> bool:
+        return any(
+            [
+                filename in item.ignore,
+                filename == item.prefix,
+                item.prefix != "" and not filename.startswith(item.prefix),
+            ],
+        )
+
+    file: TarFile | ZipFile
+    member: TarInfo | ZipInfo
+    if item.action == Action.untar:
+        with tar_open(item.downloaded, "r") as file:
             for member in file.getmembers():
-                if member.name in item.ignore:
+                if _should_continue(member.name):
                     continue
                 member.name = member.name.removeprefix(item.prefix)
                 try:
                     file.extract(member, path=item.target.parent, filter="tar")
                 except TypeError:  # before 3.11.4 e.g. Debian 12
                     file.extract(member, path=item.target.parent)
-    elif item.action == Action.command and item.command is not None:
-        cmd = item.command.format(target=item.target, downloaded=item.downloaded)
-        run(split(cmd), check=True)
+    else:
+        with ZipFile(item.downloaded, "r") as file:
+            for member in file.infolist():
+                if _should_continue(member.filename):
+                    continue
+                member.filename = member.filename.removeprefix(item.prefix)
+                file.extract(member, path=item.target.parent)
 
 
 def _guess_action(item: Item) -> Action: