jwbmisc 0.0.3__py3-none-any.whl → 0.0.5__py3-none-any.whl

jwbmisc/__init__.py

@@ -1,9 +1,10 @@
 from .passwd import get_pass
-from .string import jinja_replace
+from .string import jinja_replace, randomsuffix, qw, split_host
 from .exec import run_cmd
 from .json import jsonc_loads, jsonc_read, ndjson_read, ndjson_write, resilient_loads
 from .fs import fzf, find_root
-from .util import goo, ask, confirm, randomsuffix, qw, split_host
+from .collection import goo
+from .interactive import ask, confirm
 
 __all__ = [
     "get_pass",

jwbmisc/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.3'
-__version_tuple__ = version_tuple = (0, 0, 3)
+__version__ = version = '0.0.5'
+__version_tuple__ = version_tuple = (0, 0, 5)
 
 __commit_id__ = commit_id = None

jwbmisc/collection.py

@@ -0,0 +1,27 @@
+from typing import Any
+
+
+def goo(
+    d: dict[str, Any],
+    *keys: str | int,
+    default: Any | None = None,
+    raise_on_default: bool = False,
+):
+    path = ".".join(str(k) for k in keys)
+    parts = path.split(".")
+
+    res = d
+    for p in parts:
+        if res is None:
+            if raise_on_default:
+                raise ValueError(f"'{path}' does not exist")
+            return default
+        if isinstance(res, (list, set, tuple)):
+            res = res[int(p)]
+        else:
+            res = res.get(p)
+    if res is None:
+        if raise_on_default:
+            raise ValueError(f"'{path}' does not exist")
+        return default
+    return res

jwbmisc/interactive.py

@@ -0,0 +1,13 @@
+def ask(question: str, default: None | str = None):
+    if default is not None:
+        question += f" [{default}]"
+    answer = input(question.strip() + " ").strip()
+    return answer if answer else default
+
+
+def confirm(question: str, default: str = "n") -> bool:
+    prompt = f"{question} (y/n)"
+    answer = ask(prompt, default=default)
+    if not answer:
+        return False
+    return answer.lower().startswith("y")

jwbmisc/keeper.py

@@ -1,11 +1,11 @@
 import json
-from keepercommander import vault as keeper_vault
+from keepercommander import vault
 from keepercommander import api
 from time import sleep
 from keepercommander.params import KeeperParams
 from keepercommander.config_storage import loader
 import os
-from .util import ask
+from .interactive import ask
 from pathlib import Path
 import webbrowser
 from keepercommander.auth import login_steps
@@ -13,8 +13,10 @@ from logging import getLogger
 
 logger = getLogger(__name__)
 
+CONFIG_FILE = Path.home() / ".config" / "jwbmisc" / "keeper.json"
 
-class _MinimalKeeperUI:
+
+class MinimalKeeperUI:
     def __init__(self):
         self.waiting_for_sso_data_key = False
 
@@ -65,19 +67,19 @@ class _MinimalKeeperUI:
         step.resume()
 
 
-def _extract_keeper_field(record, field: str) -> str | None:
-    if isinstance(record, keeper_vault.TypedRecord):
-        value = record.get_typed_field(field)
-        if value is None:
-            value = next((f for f in record.custom if f.label == field), None)
+def extract_record_field(record, field: str) -> str | None:
+    if not isinstance(record, vault.TypedRecord):
+        raise TypeError("only TypedRecord is supported")
+
+    value = record.get_typed_field(field) or record.get_typed_field(None, field)
 
-        if value and value.value:
-            return value.value[0] if isinstance(value.value, list) else str(value.value)
+    if value and value.value:
+        return value.value[0] if isinstance(value.value, list) else str(value.value)
 
     return None
 
 
-def _perform_keeper_login(params):
+def perform_login(params):
     if not params.user:
         user = os.environ.get("KEEPER_USERNAME", None)
         if user is None:
@@ -96,29 +98,28 @@ def _perform_keeper_login(params):
         params.server = server
 
     try:
-        api.login(params, login_ui=_MinimalKeeperUI())
+        api.login(params, login_ui=MinimalKeeperUI())
     except KeyboardInterrupt:
         raise KeyError("\nKeeper login cancelled by user.") from None
     except Exception as e:
         raise KeyError(f"Keeper login failed: {e}") from e
 
 
-def get_keeper_password(record_uid: str, field_path: str) -> str:
-    config_file = Path.home() / ".config" / "keeper" / "config.json"
-    config_file.parent.mkdir(parents=True, exist_ok=True)
+def get_password(record_uid: str, field_path: str) -> str:
+    CONFIG_FILE.parent.mkdir(parents=True, exist_ok=True)
 
-    params = KeeperParams(config_filename=str(config_file))
+    params = KeeperParams(config_filename=str(CONFIG_FILE))
 
-    if config_file.exists():
+    if CONFIG_FILE.exists():
         try:
-            params.config = json.loads(config_file.read_text())
+            params.config = json.loads(CONFIG_FILE.read_text())
             loader.load_config_properties(params)
             if not params.session_token:
                 raise ValueError("No session token")
         except Exception:
-            _perform_keeper_login(params)
+            perform_login(params)
     else:
-        _perform_keeper_login(params)
+        perform_login(params)
 
     try:
         api.sync_down(params)
@@ -126,11 +127,11 @@ def get_keeper_password(record_uid: str, field_path: str) -> str:
         raise KeyError(f"Failed to sync Keeper vault: {e}") from e
 
     try:
-        record = keeper_vault.KeeperRecord.load(params, record_uid)
+        record = vault.KeeperRecord.load(params, record_uid)
     except Exception as e:
         raise KeyError(f"Record {record_uid} not found: {e}") from e
 
-    value = _extract_keeper_field(record, field_path)
+    value = extract_record_field(record, field_path)
     if value is None:
         raise KeyError(f"Field '{field_path}' not found in record {record_uid}")
 

jwbmisc/passwd.py

@@ -2,6 +2,8 @@ import subprocess as sp
 import os
 from pathlib import Path
 
+PASS_BIN = os.environ.get("JWBMISC_PASS_BIN", "pass")
+
 
 def get_pass(*pass_keys: str):
     if not pass_keys:
@@ -48,7 +50,7 @@ def get_pass(*pass_keys: str):
 
 
 def _call_unix_pass(key, lnum=1):
-    proc = sp.Popen(["pass", "show", key], stdout=sp.PIPE, stderr=sp.PIPE, encoding="utf-8")
+    proc = sp.Popen([PASS_BIN, "show", key], stdout=sp.PIPE, stderr=sp.PIPE, encoding="utf-8")
     value, stderr = proc.communicate()
 
     if proc.returncode != 0:
@@ -70,6 +72,6 @@ def _call_unix_pass(key, lnum=1):
 
 
 def _keeper_password(record_uid: str, field_path: str) -> str:
-    from .keeper import get_keeper_password
+    from .keeper import get_password as keeper_get_password
 
-    return get_keeper_password(record_uid, field_path)
+    return keeper_get_password(record_uid, field_path)

jwbmisc/string.py

@@ -1,4 +1,6 @@
 import re
+import random
+import string
 
 
 def jinja_replace(s, config, relaxed: bool = False, delim: tuple[str, str] = ("{{", "}}")):
@@ -20,3 +22,21 @@ def jinja_replace(s, config, relaxed: bool = False, delim: tuple[str, str] = ("{
         raise KeyError(f"{k} is not in the supplied replacement variables")
 
     return re.sub(re.escape(delim[0]) + r"\s*(\w+)\s*" + re.escape(delim[1]), handle_match, s)
+
+
+def randomsuffix(length: int):
+    letters = string.ascii_lowercase
+    return "".join(random.choice(letters) for _ in range(length))
+
+
+def qw(s: str) -> list[str]:
+    return s.split()
+
+
+def split_host(host: str) -> tuple[str | None, int | None]:
+    if not host:
+        return (None, None)
+    res = host.split(":", 1)
+    if len(res) == 1:
+        return (res[0], None)
+    return (res[0], int(res[1]))

{jwbmisc-0.0.3.dist-info → jwbmisc-0.0.5.dist-info}/METADATA

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

jwbmisc-0.0.5.dist-info/RECORD

@@ -0,0 +1,15 @@
+jwbmisc/__init__.py,sha256=5VXxKCMejjLWaiECh64309WJ2LpHHSULxaGOvCAOzyU,581
+jwbmisc/_version.py,sha256=YRV1ohn6CdKEhsUOmFFMmr5UTjMv4Ydw3WJGxF2BHBs,704
+jwbmisc/collection.py,sha256=mICHxBFfk2XY8ajdWkLvmQF1R6oo6d0torpRAeDvd1c,663
+jwbmisc/exec.py,sha256=9g1Jc7iDkBj1Y-dn5VhnwH1JqvWSbrFe6Mmvnf-iqag,1177
+jwbmisc/fs.py,sha256=Vf28qbOnBeHEbXNMUZjOQXtMWBurjkzD2KmfV2gJQXM,599
+jwbmisc/interactive.py,sha256=qMgpQNHvUg4AYw-aAAy2qdxri1aKr-mffoLfUgh8TWE,423
+jwbmisc/json.py,sha256=h3CBDNNZjcTDxydViyydPsQufXQLuxqP24wBBAT2nDs,1198
+jwbmisc/keeper.py,sha256=Fj9k8vWpfp2UMFiCfghWlnc5UxnkcR0oBQgY7NiJhsM,4241
+jwbmisc/passwd.py,sha256=pTa0Lo7Qq10oo7PDlbq8lS3f5IaMFspKB27QI1NQB5k,2593
+jwbmisc/string.py,sha256=0_AvtAyXUlyVL6yw1iMjs3vMunubTTTWS0PSu_qKgi8,1232
+jwbmisc-0.0.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jwbmisc-0.0.5.dist-info/METADATA,sha256=PEKl-YazmyJFlnl8uAYVHcpUhPbyUWp4L5ly1eEf_T4,14507
+jwbmisc-0.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jwbmisc-0.0.5.dist-info/top_level.txt,sha256=FqEYs8zdG3iGOJmC6cutDXfGQUNptzfYeKsaG43y1HE,8
+jwbmisc-0.0.5.dist-info/RECORD,,

jwbmisc/util.py

@@ -1,64 +0,0 @@
-import random
-import string
-from typing import Any
-
-
-def ask(question, default=None):
-    if default is not None:
-        question += f" [{default}]"
-    answer = input(question.strip() + " ").strip()
-    return answer if answer else default
-
-
-def confirm(question, default="n"):
-    prompt = f"{question} (y/n)"
-    if default is not None:
-        prompt += f" [{default}]"
-    answer = input(prompt).strip().lower()
-    if not answer:
-        answer = default.lower() if default else "n"
-    return answer.startswith("y")
-
-
-def randomsuffix(length):
-    letters = string.ascii_lowercase
-    return "".join(random.choice(letters) for _ in range(length))
-
-
-def qw(s: str) -> list[str]:
-    return s.split()
-
-
-def split_host(host: str) -> tuple[str | None, int | None]:
-    if not host:
-        return (None, None)
-    res = host.split(":", 1)
-    if len(res) == 1:
-        return (res[0], None)
-    return (res[0], int(res[1]))
-
-
-def goo(
-    d: dict[str, Any],
-    *keys: str | int,
-    default: Any | None = None,
-    raise_on_default: bool = False,
-):
-    path = ".".join(str(k) for k in keys)
-    parts = path.split(".")
-
-    res = d
-    for p in parts:
-        if res is None:
-            if raise_on_default:
-                raise ValueError(f"'{path}' does not exist")
-            return default
-        if isinstance(res, (list, set, tuple)):
-            res = res[int(p)]
-        else:
-            res = res.get(p)
-    if res is None:
-        if raise_on_default:
-            raise ValueError(f"'{path}' does not exist")
-        return default
-    return res

jwbmisc-0.0.3.dist-info/RECORD

@@ -1,14 +0,0 @@
-jwbmisc/__init__.py,sha256=VT_f1aG3ufoT7mYV1Ho0ocNtydMTIPbmcvOANwQE-CQ,551
-jwbmisc/_version.py,sha256=pBZsQt6tlL02W-ri--X_4JCubpAK7jjCSnOmUp_isjc,704
-jwbmisc/exec.py,sha256=9g1Jc7iDkBj1Y-dn5VhnwH1JqvWSbrFe6Mmvnf-iqag,1177
-jwbmisc/fs.py,sha256=Vf28qbOnBeHEbXNMUZjOQXtMWBurjkzD2KmfV2gJQXM,599
-jwbmisc/json.py,sha256=h3CBDNNZjcTDxydViyydPsQufXQLuxqP24wBBAT2nDs,1198
-jwbmisc/keeper.py,sha256=nOOfzoAPF7Uy3TuMPPdBdq9DvwNanyrQp6lVFI66LnU,4317
-jwbmisc/passwd.py,sha256=ZcOIT_RrwDR3uZgrcWASRLz8D6gf6iAHOEdyfwTuX4I,2520
-jwbmisc/string.py,sha256=pUNAMaP5531mBy3mrp9GCZ3QRPy6MQwegt5yzcWP1wQ,795
-jwbmisc/util.py,sha256=XCF5LEOLjI4IsYP-FF2ytbzo4J0rlCNJzrdNrtNWSGM,1568
-jwbmisc-0.0.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jwbmisc-0.0.3.dist-info/METADATA,sha256=U6WTkWiesNELCpjGh0Myaj-Uzd6To1qw7K28--fAWkU,14507
-jwbmisc-0.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jwbmisc-0.0.3.dist-info/top_level.txt,sha256=FqEYs8zdG3iGOJmC6cutDXfGQUNptzfYeKsaG43y1HE,8
-jwbmisc-0.0.3.dist-info/RECORD,,