jwbmisc 0.0.6__py3-none-any.whl → 0.0.7__py3-none-any.whl

jwbmisc/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.6'
-__version_tuple__ = version_tuple = (0, 0, 6)
+__version__ = version = '0.0.7'
+__version_tuple__ = version_tuple = (0, 0, 7)
 
 __commit_id__ = commit_id = None

jwbmisc/passwd.py

@@ -1,5 +1,6 @@
 import subprocess as sp
 import os
+from urllib.parse import urlparse, parse_qs
 from pathlib import Path
 
 PASS_BIN = os.environ.get("JWBMISC_PASS_BIN", "pass")
@@ -11,11 +12,18 @@ def get_pass(*pass_keys: str):
 
     for pass_key in pass_keys:
         if pass_key.startswith("pass://"):
-            k = pass_key.removeprefix("pass://")
-            lnum = 1
-            if "?" in k:
-                k, lnum = k.rsplit("?", 1)
-            return _call_unix_pass(k, int(lnum))
+            url = urlparse(pass_key, scheme="pass")
+            query = parse_qs(url.query)
+            lines = query.get("lines", ["1"])[0]
+            format = query.get("format", ["raw"])[0]
+            if lines == "all":
+                lines = None
+            else:
+                lines = [int(n) - 1 for n in lines.split(",")]
+            netloc = url.netloc.rstrip("/")
+            path = url.path.lstrip("/")
+            key = f"{netloc}/{path}".lstrip("/")
+            return _call_unix_pass(key, lines, format)
 
         if pass_key.startswith("env://"):
             env_var = pass_key.removeprefix("env://").replace("/", "__")
@@ -47,26 +55,25 @@ def get_pass(*pass_keys: str):
     raise KeyError(f"Could not acquire password from one of {pass_keys}")
 
 
-def _call_unix_pass(key, lnum=1):
+def _call_unix_pass(key: str, idcs: list[int] | None = None, format: str = "list") -> str | list[str] | None:
     proc = sp.Popen([PASS_BIN, "show", key], stdout=sp.PIPE, stderr=sp.PIPE, encoding="utf-8")
     value, stderr = proc.communicate()
 
     if proc.returncode != 0:
         raise KeyError(f"pass failed for '{key}': {stderr.strip()}")
 
-    if lnum is None or lnum == 0:
-        return value.strip()
-    lines = value.splitlines()
+    if idcs is None or idcs == [-1]:
+        return value.rstrip()
 
+    lines = value.splitlines()
     try:
-        if isinstance(lnum, list):
-            pw = [lines[ln - 1].strip() for ln in lnum]
-        else:
-            pw = lines[lnum - 1].strip()
+        lines = [lines[idx] for idx in idcs]
     except IndexError:
-        raise KeyError(f"could not retrieve lines {lnum} for {key}")
+        raise KeyError(f"could not retrieve line idcs {idcs} for {key}")
 
-    return pw
+    if format == "list":
+        return lines
+    return "\n".join(lines)
 
 
 def _keeper_password(record_uid: str, field_path: str | None = None) -> str:

{jwbmisc-0.0.6.dist-info → jwbmisc-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jwbmisc
-Version: 0.0.6
+Version: 0.0.7
 Summary: Misc util functions of jwb
 Author-email: Joachim Bargsten <jw@bargsten.org>
 License:                                  Apache License

{jwbmisc-0.0.6.dist-info → jwbmisc-0.0.7.dist-info}/RECORD

@@ -1,15 +1,15 @@
 jwbmisc/__init__.py,sha256=5VXxKCMejjLWaiECh64309WJ2LpHHSULxaGOvCAOzyU,581
-jwbmisc/_version.py,sha256=7MyqQ3iPP2mJruPfRYGCNCq1z7_Nk7c-eyYecYITxsY,704
+jwbmisc/_version.py,sha256=AV58KqMkBGaCvmPdbd3g9huyNXfIVxjw8QbCMdaeivU,704
 jwbmisc/collection.py,sha256=mICHxBFfk2XY8ajdWkLvmQF1R6oo6d0torpRAeDvd1c,663
 jwbmisc/exec.py,sha256=_3Xf0D342VDoVwtCZLjnyJ8N-WuHJfeIrBGFsL2qUW4,1260
 jwbmisc/fs.py,sha256=Vf28qbOnBeHEbXNMUZjOQXtMWBurjkzD2KmfV2gJQXM,599
 jwbmisc/interactive.py,sha256=qMgpQNHvUg4AYw-aAAy2qdxri1aKr-mffoLfUgh8TWE,423
 jwbmisc/json.py,sha256=h3CBDNNZjcTDxydViyydPsQufXQLuxqP24wBBAT2nDs,1198
 jwbmisc/keeper.py,sha256=mKhrUjNvlePxDv89tMcDs4dEgHWTVbtzMPH1jMRuylU,5201
-jwbmisc/passwd.py,sha256=UKQk9sDJFYQSqBvTjPjtYLC1arAol82GlUdlc_PK4Eo,2433
+jwbmisc/passwd.py,sha256=VfE3P6B_DpRS7htzKTdvtxlxQj9OkFMVGeGZxNZ9B5w,2856
 jwbmisc/string.py,sha256=0_AvtAyXUlyVL6yw1iMjs3vMunubTTTWS0PSu_qKgi8,1232
-jwbmisc-0.0.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jwbmisc-0.0.6.dist-info/METADATA,sha256=7ixSPZaGjryN7NKhu88Q9AAoMaAkU1E_Q25_48eXfT0,14507
-jwbmisc-0.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jwbmisc-0.0.6.dist-info/top_level.txt,sha256=FqEYs8zdG3iGOJmC6cutDXfGQUNptzfYeKsaG43y1HE,8
-jwbmisc-0.0.6.dist-info/RECORD,,
+jwbmisc-0.0.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jwbmisc-0.0.7.dist-info/METADATA,sha256=LuXHFOVggPnK2nA1w9Hg9_LBchkGHtVumeH7bUwqzuY,14507
+jwbmisc-0.0.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+jwbmisc-0.0.7.dist-info/top_level.txt,sha256=FqEYs8zdG3iGOJmC6cutDXfGQUNptzfYeKsaG43y1HE,8
+jwbmisc-0.0.7.dist-info/RECORD,,

{jwbmisc-0.0.6.dist-info → jwbmisc-0.0.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any