omdev 0.0.0.dev103__py3-none-any.whl → 0.0.0.dev112__py3-none-any.whl

omdev/.manifests.json

@@ -123,7 +123,7 @@
     "module": ".ptk.apps.ncdu",
     "attr": "_CLI_MODULE",
     "file": "omdev/ptk/apps/ncdu.py",
-    "line": 155,
+    "line": 159,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "ptk/ncdu",
@@ -131,6 +131,18 @@
       }
     }
   },
+  {
+    "module": ".pycharm.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/pycharm/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "pycharm",
+        "mod_name": "omdev.pycharm.__main__"
+      }
+    }
+  },
   {
     "module": ".pyproject.__main__",
     "attr": "_CLI_MODULE",
@@ -191,6 +203,18 @@
       }
     }
   },
+  {
+    "module": ".scripts.tmpexec",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/scripts/tmpexec.py",
+    "line": 50,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "tmpexec",
+        "mod_name": "omdev.scripts.tmpexec"
+      }
+    }
+  },
   {
     "module": ".tools.doc",
     "attr": "_CLI_MODULE",
@@ -219,7 +243,7 @@
     "module": ".tools.git",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/git.py",
-    "line": 124,
+    "line": 128,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "git",
@@ -282,7 +306,7 @@
     "module": ".tools.pip",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/pip.py",
-    "line": 88,
+    "line": 164,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "pip",
@@ -302,6 +326,18 @@
       }
     }
   },
+  {
+    "module": ".tools.qr",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/qr.py",
+    "line": 74,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "qr",
+        "mod_name": "omdev.tools.qr"
+      }
+    }
+  },
   {
     "module": ".tools.sqlrepl",
     "attr": "_CLI_MODULE",

omdev/__about__.py

@@ -41,6 +41,10 @@ class Project(ProjectBase):
             'prompt-toolkit ~= 3.0',
         ],
 
+        'qr': [
+            'segno ~= 1.6',
+        ],
+
         'tokens': [
             'tokenize-rt ~= 6.1',
         ],

omdev/clipboard/darwin.py

@@ -1,4 +1,31 @@
 # ruff: noqa: N802 N816
+"""
+        imageProperties = dict(
+            ColorModel = "RGB"
+            DPIHeight = 144
+            DPIWidth = 144
+            Depth = 8
+            PixelHeight = 1236
+            PixelWidth = 602
+            ProfileName = "Color LCD"
+            kCGImageDestinationAllowAlpha = true
+            {Exif} = dict(
+                PixelXDimension = 602
+                PixelYDimension = 1236
+                UserComment = "Screenshot"
+            )
+            {PNG} = dict(
+                InterlaceType = 0
+                XPixelsPerMeter = 5669
+                YPixelsPerMeter = 5669
+            )
+            {TIFF} = dict(
+                ResolutionUnit = 2
+                XResolution = 144
+                YResolution = 144
+            )
+        )
+"""
 import ctypes as ct
 import ctypes.util
 import dataclasses as dc
@@ -114,7 +141,7 @@ def cfstring_to_string(cf_string: CFStringRef) -> str:
     max_size = cf.CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8) + 1
     buffer = ct.create_string_buffer(max_size)
 
-    if success := cf.CFStringGetCString(cf_string, buffer, max_size, kCFStringEncodingUTF8):  # noqa
+    if not (success := cf.CFStringGetCString(cf_string, buffer, max_size, kCFStringEncodingUTF8)):  # noqa
         return ''
 
     return buffer.value.decode('utf-8')
@@ -142,6 +169,7 @@ class DarwinClipboardItem:
 def get_darwin_clipboard_data(
         *,
         types: ta.Container[str | None] | None = None,
+        skip_types: ta.Container[str | None] | None = None,
         strict: bool = False,
         types_only: bool = False,
 ) -> list[DarwinClipboardItem]:
@@ -179,6 +207,8 @@ def get_darwin_clipboard_data(
 
                     if types is not None and data_type_str not in types:
                         continue
+                    if skip_types is not None and data_type_str in skip_types:
+                        continue
 
                     if types_only:
                         lst.append(DarwinClipboardItem(
@@ -188,10 +218,14 @@ def get_darwin_clipboard_data(
                         continue
 
                     data = CFDataRef()
+
+                    # FIXME: dumps to stderr lol:
+                    #  data_type_str = 'public.heics'
                     if status := aps.PasteboardCopyItemFlavorData(pasteboard, item_id, data_type, ct.byref(data)):
                         if not strict:
                             continue
                         raise StatusDarwinClipboardError('PasteboardCopyItemFlavorData', status)
+
                     if not data:
                         continue
 
@@ -221,8 +255,8 @@ def get_darwin_clipboard_data(
 
 
 def _main() -> None:
-    for i in get_darwin_clipboard_data():
-        print(i)
+    for i in get_darwin_clipboard_data(skip_types={'public.heics'}):
+        print(f'type: {i.type}, len: {len(i.data) if i.data is not None else None}')
 
 
 if __name__ == '__main__':

omdev/packaging/__init__.py

@@ -1 +0,0 @@
-# @omlish-lite

omdev/packaging/marshal.py

@@ -0,0 +1,82 @@
+"""
+NOTE: This cannot be auto-imported as @omlish-lite usage of other modules in this package requires it be importable on
+8.
+"""
+import dataclasses as dc
+import typing as ta
+
+from omlish import lang
+from omlish import marshal as msh
+from omlish import matchfns as mfs
+from omlish import reflect as rfl
+
+from .requires import RequiresMarkerItem
+from .requires import RequiresMarkerList
+from .requires import RequiresNode
+from .requires import RequiresOp
+from .requires import RequiresValue
+from .requires import RequiresVariable
+
+
+##
+
+
+class MarshalRequiresMarkerList(lang.NotInstantiable, lang.Final):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class RequiresMarkerListMarshaler(msh.Marshaler):
+    item_m: msh.Marshaler
+    node_m: msh.Marshaler
+
+    def marshal(self, ctx: msh.MarshalContext, o: ta.Any) -> msh.Value:
+        def inner(c: ta.Any) -> ta.Any:
+            if isinstance(c, str):
+                return c
+            elif isinstance(c, RequiresMarkerItem):
+                return self.item_m.marshal(ctx, c)
+            elif isinstance(c, ta.Iterable):
+                return [inner(e) for e in c]
+            else:
+                raise TypeError(c)
+        return [inner(e) for e in o]
+
+
+class RequiresMarkerListMarshalerFactory(msh.MarshalerFactoryMatchClass):
+    @mfs.simple(lambda _, ctx, rty: rty is MarshalRequiresMarkerList)
+    def _build(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
+        return RequiresMarkerListMarshaler(
+            ctx.make(RequiresMarkerItem),
+            ctx.make(RequiresNode),
+        )
+
+
+##
+
+
+@lang.static_init
+def _install_standard_marshalling() -> None:
+    requires_node_poly = msh.Polymorphism(
+        RequiresNode,
+        [
+            msh.Impl(RequiresVariable, 'variable'),
+            msh.Impl(RequiresValue, 'value'),
+            msh.Impl(RequiresOp, 'op'),
+        ],
+    )
+    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [
+        msh.PolymorphismMarshalerFactory(requires_node_poly),
+        msh.PolymorphismUnionMarshalerFactory(requires_node_poly.impls, allow_partial=True),
+        RequiresMarkerListMarshalerFactory(),
+
+    ]
+    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [
+        msh.PolymorphismUnmarshalerFactory(requires_node_poly),
+    ]
+
+    msh.GLOBAL_REGISTRY.register(
+        RequiresMarkerList,
+        msh.ReflectOverride(MarshalRequiresMarkerList),
+        identity=True,
+    )

omdev/packaging/names.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 # Copyright (c) Donald Stufft and individual contributors.
 # All rights reserved.
 #

omdev/packaging/requires.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 # Copyright (c) Donald Stufft and individual contributors.
 # All rights reserved.
 #
@@ -194,10 +195,9 @@ class RequiresTokenizer:
         self.read()
 
 
+@dc.dataclass(frozen=True)
 class RequiresNode:
-    def __init__(self, value: str) -> None:
-        super().__init__()
-        self.value = value
+    value: str
 
     def __str__(self) -> str:
         return self.value
@@ -209,27 +209,36 @@ class RequiresNode:
         raise NotImplementedError
 
 
+@dc.dataclass(frozen=True)
 class RequiresVariable(RequiresNode):
     def serialize(self) -> str:
         return str(self)
 
 
+@dc.dataclass(frozen=True)
 class RequiresValue(RequiresNode):
     def serialize(self) -> str:
         return f'"{self}"'
 
 
+@dc.dataclass(frozen=True)
 class RequiresOp(RequiresNode):
     def serialize(self) -> str:
         return str(self)
 
 
 RequiresMarkerVar = ta.Union['RequiresVariable', 'RequiresValue']
-RequiresMarkerItem = ta.Tuple['RequiresMarkerVar', 'RequiresOp', 'RequiresMarkerVar']
+
 RequiresMarkerAtom = ta.Union['RequiresMarkerItem', ta.Sequence['RequiresMarkerAtom']]
 RequiresMarkerList = ta.Sequence[ta.Union['RequiresMarkerList', 'RequiresMarkerAtom', str]]
 
 
+class RequiresMarkerItem(ta.NamedTuple):
+    l: ta.Union[RequiresVariable, RequiresValue]
+    op: RequiresOp
+    r: ta.Union[RequiresVariable, RequiresValue]
+
+
 class ParsedRequirement(ta.NamedTuple):
     name: str
     url: str
@@ -441,7 +450,7 @@ def _parse_requires_marker_item(tokenizer: RequiresTokenizer) -> RequiresMarkerI
     tokenizer.consume('WS')
     marker_var_right = _parse_requires_marker_var(tokenizer)
     tokenizer.consume('WS')
-    return (marker_var_left, marker_op, marker_var_right)
+    return RequiresMarkerItem(marker_var_left, marker_op, marker_var_right)
 
 
 def _parse_requires_marker_var(tokenizer: RequiresTokenizer) -> RequiresMarkerVar:

omdev/packaging/specifiers.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 # Copyright (c) Donald Stufft and individual contributors.
 # All rights reserved.
 #

omdev/packaging/versions.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 # Copyright (c) Donald Stufft and individual contributors.
 # All rights reserved.
 #

omdev/ptk/apps/ncdu.py

@@ -69,10 +69,14 @@ class NcduApp:
 
         self._kb = ptk.KeyBindings()
         self._kb.add('q')(self.exit_app)
-        self._kb.add('up', 'p')(self.move_up)
-        self._kb.add('down', 'n')(self.move_down)
-        self._kb.add('right', 'enter')(self.enter_directory)
-        self._kb.add('left', 'backspace')(self.go_back)
+        for k in ['up', 'p']:
+            self._kb.add(k)(self.move_up)
+        for k in ['down', 'n']:
+            self._kb.add(k)(self.move_down)
+        for k in ['right', 'enter']:
+            self._kb.add(k)(self.enter_directory)
+        for k in ['left', 'backspace']:
+            self._kb.add(k)(self.go_back)
 
         self._layout = ptk.Layout(ptk.Frame(self._text_area))
 

omdev/pycharm/__main__.py

@@ -0,0 +1,11 @@
+from ..cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('pycharm', __name__)
+
+
+if __name__ == '__main__':
+    from .cli import _main
+
+    _main()

omdev/pycharm/cli.py

@@ -0,0 +1,94 @@
+import inspect
+import os.path
+import subprocess
+import sys
+import tempfile
+
+from omlish import argparse as ap
+from omlish.diag.pycharm import get_pycharm_version
+
+
+_DARWIN_OPEN_SCRIPT = """
+tell application "PyCharm"
+    activate
+    open "{dir}"
+end tell
+return
+"""
+
+
+_LINUX_OPEN_SCRIPT = """
+# Check if PyCharm is already running
+if pgrep -x "pycharm.sh" > /dev/null; then
+    echo "PyCharm is already running. Opening project..."
+
+    # Bring PyCharm to the foreground
+    wmctrl -a "PyCharm"
+
+    # Simulate the keyboard shortcut to open a new project
+    xdotool key --delay 100 ctrl+shift+a
+    xdotool type "$PROJECT_PATH"
+    xdotool key Return
+
+else
+    echo "Starting PyCharm with project..."
+    nohup pycharm.sh "$PROJECT_PATH" > /dev/null 2>&1 &
+fi
+"""
+
+
+class Cli(ap.Cli):
+    @ap.command()
+    def version(self) -> None:
+        print(get_pycharm_version())
+
+    @ap.command(
+        ap.arg('python-exe'),
+        ap.arg('args', nargs=ap.REMAINDER),
+    )
+    def runhack(self) -> int:
+        if not os.path.isfile(exe := self.args.python_exe):
+            raise FileNotFoundError(exe)
+
+        from omlish.diag._pycharm import runhack  # noqa
+        src = inspect.getsource(runhack)
+
+        src_file = tempfile.mktemp(__package__ + '-runhack')  # noqa
+        with open(src_file, 'w') as f:
+            f.write(src)
+
+        proc = subprocess.run([exe, src_file, *self.args.args], check=False)
+        return proc.returncode
+
+    @ap.command(
+        ap.arg('dir', nargs='?'),
+    )
+    def open(self) -> None:
+        dir = os.path.abspath(self.args.dir or '.')  # noqa
+
+        if (plat := sys.platform) == 'darwin':
+            if '"' in dir:
+                raise ValueError(dir)
+
+            scpt_src = _DARWIN_OPEN_SCRIPT.format(dir=dir)
+
+            scpt_file = tempfile.mktemp(__package__ + '-pycharm-open')  # noqa
+            with open(scpt_file, 'w') as f:
+                f.write(scpt_src)
+
+            subprocess.check_call(['osascript', scpt_file])
+
+        elif plat == 'linux':
+            # FIXME:
+            raise NotImplementedError
+
+        else:
+            raise OSError(plat)
+
+
+def _main() -> None:
+    Cli().call_and_exit()
+
+
+if __name__ == '__main__':
+    _main()

omdev/scripts/execrss.py

@@ -16,7 +16,17 @@ _CLI_MODULE = {'$omdev.cli.types.CliModule': {
 
 
 def _main() -> None:
-    [src] = sys.argv[1:]
+    if len(sys.argv) == 2:
+        pre = None
+        [src] = sys.argv[1:]
+    elif len(sys.argv) == 3:
+        [pre, src] = sys.argv[1:]
+    else:
+        raise Exception('Invalid arguments')
+
+    if pre:
+        exec(pre)
+
     start = _get_rss()
     exec(src)
     end = _get_rss()

omdev/scripts/exectime.py

@@ -12,7 +12,17 @@ _CLI_MODULE = {'$omdev.cli.types.CliModule': {
 
 
 def _main() -> None:
-    [src] = sys.argv[1:]
+    if len(sys.argv) == 2:
+        pre = None
+        [src] = sys.argv[1:]
+    elif len(sys.argv) == 3:
+        [pre, src] = sys.argv[1:]
+    else:
+        raise Exception('Invalid arguments')
+
+    if pre:
+        exec(pre)
+
     co = compile(src, '<string>', 'exec')
     start = time.time_ns()
     exec(co)

omdev/scripts/pyproject.py

@@ -3299,7 +3299,10 @@ class UuidObjMarshaler(ObjMarshaler):
         return uuid.UUID(o)
 
 
-_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
+##
+
+
+_DEFAULT_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
     **{t: NopObjMarshaler() for t in (type(None),)},
     **{t: CastObjMarshaler(t) for t in (int, float, str, bool)},
     **{t: Base64ObjMarshaler(t) for t in (bytes, bytearray)},
@@ -3328,20 +3331,19 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
 }
 
 
-def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
-    if ty in _OBJ_MARSHALERS:
-        raise KeyError(ty)
-    _OBJ_MARSHALERS[ty] = m
-
-
-def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
+def _make_obj_marshaler(
+        ty: ta.Any,
+        rec: ta.Callable[[ta.Any], ObjMarshaler],
+        *,
+        nonstrict_dataclasses: bool = False,
+) -> ObjMarshaler:
     if isinstance(ty, type):
         if abc.ABC in ty.__bases__:
             impls = [  # type: ignore
                 PolymorphicObjMarshaler.Impl(
                     ity,
                     ity.__qualname__,
-                    get_obj_marshaler(ity),
+                    rec(ity),
                 )
                 for ity in deep_subclasses(ty)
                 if abc.ABC not in ity.__bases__
@@ -3357,7 +3359,8 @@ def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
         if dc.is_dataclass(ty):
             return DataclassObjMarshaler(
                 ty,
-                {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
+                {f.name: rec(f.type) for f in dc.fields(ty)},
+                nonstrict=nonstrict_dataclasses,
             )
 
     if is_generic_alias(ty):
@@ -3367,7 +3370,7 @@ def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
             pass
         else:
             k, v = ta.get_args(ty)
-            return MappingObjMarshaler(mt, get_obj_marshaler(k), get_obj_marshaler(v))
+            return MappingObjMarshaler(mt, rec(k), rec(v))
 
         try:
             st = _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES[ta.get_origin(ty)]
@@ -3375,33 +3378,71 @@ def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
             pass
         else:
             [e] = ta.get_args(ty)
-            return IterableObjMarshaler(st, get_obj_marshaler(e))
+            return IterableObjMarshaler(st, rec(e))
 
         if is_union_alias(ty):
-            return OptionalObjMarshaler(get_obj_marshaler(get_optional_alias_arg(ty)))
+            return OptionalObjMarshaler(rec(get_optional_alias_arg(ty)))
 
     raise TypeError(ty)
 
 
-def get_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
-    try:
-        return _OBJ_MARSHALERS[ty]
-    except KeyError:
-        pass
+##
 
-    p = ProxyObjMarshaler()
-    _OBJ_MARSHALERS[ty] = p
-    try:
-        m = _make_obj_marshaler(ty)
-    except Exception:
-        del _OBJ_MARSHALERS[ty]
-        raise
-    else:
-        p.m = m
+
+_OBJ_MARSHALERS_LOCK = threading.RLock()
+
+_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = dict(_DEFAULT_OBJ_MARSHALERS)
+
+_OBJ_MARSHALER_PROXIES: ta.Dict[ta.Any, ProxyObjMarshaler] = {}
+
+
+def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
+    with _OBJ_MARSHALERS_LOCK:
+        if ty in _OBJ_MARSHALERS:
+            raise KeyError(ty)
         _OBJ_MARSHALERS[ty] = m
+
+
+def get_obj_marshaler(
+        ty: ta.Any,
+        *,
+        no_cache: bool = False,
+        **kwargs: ta.Any,
+) -> ObjMarshaler:
+    with _OBJ_MARSHALERS_LOCK:
+        if not no_cache:
+            try:
+                return _OBJ_MARSHALERS[ty]
+            except KeyError:
+                pass
+
+        try:
+            return _OBJ_MARSHALER_PROXIES[ty]
+        except KeyError:
+            pass
+
+        rec = functools.partial(
+            get_obj_marshaler,
+            no_cache=no_cache,
+            **kwargs,
+        )
+
+        p = ProxyObjMarshaler()
+        _OBJ_MARSHALER_PROXIES[ty] = p
+        try:
+            m = _make_obj_marshaler(ty, rec, **kwargs)
+        finally:
+            del _OBJ_MARSHALER_PROXIES[ty]
+        p.m = m
+
+        if not no_cache:
+            _OBJ_MARSHALERS[ty] = m
         return m
 
 
+##
+
+
 def marshal_obj(o: ta.Any, ty: ta.Any = None) -> ta.Any:
     return get_obj_marshaler(ty if ty is not None else type(o)).marshal(o)
 

omdev/scripts/tmpexec.py

@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+# @omlish-script
+"""
+TODO:
+ - can xargs just do this lol
+"""
+import argparse
+import os
+import subprocess
+import sys
+import tempfile
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-I', '--replstr', default='%')
+    parser.add_argument('-Q', '--stdout-silenced', action='store_true')
+    parser.add_argument('-E', '--stdout-to-stderr', action='store_true')
+    parser.add_argument('-c', '--cat', action='store_true')
+    parser.add_argument('-k', '--keep', action='store_true')
+    parser.add_argument('--read-size', type=int, default=0x4000)
+    args, rest = parser.parse_known_args()
+
+    fd, tmp_file = tempfile.mkstemp()
+    os.close(fd)
+
+    argv = [tmp_file if a == args.replstr else a for a in rest]
+
+    kw: dict = {}
+    if args.stdout_silenced:
+        kw.update(stdout=open('/dev/null', 'wb'))  # noqa
+    elif args.stdout_to_stderr:
+        kw.update(stdout=sys.stderr)
+
+    subprocess.check_call(argv, **kw)
+
+    if args.cat:
+        try:
+            with open(tmp_file, 'rb') as f:
+                while buf := f.read(args.read_size):
+                    sys.stdout.buffer.write(buf)
+        finally:
+            if not args.keep:
+                os.unlink(tmp_file)
+
+    else:
+        print(tmp_file)
+
+
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'tmpexec',
+    'mod_name': __name__,
+}}
+
+
+if __name__ == '__main__':
+    _main()

omdev/tools/git.py

@@ -61,38 +61,42 @@ class Cli(ap.Cli):
         accepts_unknown=True,
     )
     def clone(self) -> None:
-        out_dir: str
-
-        if (m := self._GITHUB_PAT.fullmatch(self.args.repo)):
-            user = m.group('user')
-            repo = m.group('repo')
-
-            os.makedirs(user, 0o755, exist_ok=True)
-
-            subprocess.check_call([
-                'git',
-                'clone',
-                *self.unknown_args,
-                *self.args.args,
-                f'https://github.com/{user}/{repo}.git',
-                os.path.join(user, repo),
-            ])
-
-            out_dir = os.path.join(user, repo)
-
-        else:
-            parsed = urllib.parse.urlparse(self.args.repo)
-            out_dir = parsed.path.split('/')[-1]
-
-            subprocess.check_call([
-                'git',
-                'clone',
-                *self.unknown_args,
-                *self.args.args,
-                self.args.repo,
-            ])
-
-        print(out_dir)
+        # And expected usage is `cd $(om git clone foo/bar)` and an empty cd arg will return to the previous directory,
+        # so always output at least a . so it'll cd to the current dir at least lol - it still runs even if the proc
+        # fails.
+        out_dir = '.'
+        try:
+            if (m := self._GITHUB_PAT.fullmatch(self.args.repo)):
+                user = m.group('user')
+                repo = m.group('repo')
+
+                os.makedirs(user, 0o755, exist_ok=True)
+
+                subprocess.check_call([
+                    'git',
+                    'clone',
+                    *self.unknown_args,
+                    *self.args.args,
+                    f'git@github.com:{user}/{repo}.git',
+                    os.path.join(user, repo),
+                ])
+
+                out_dir = os.path.join(user, repo)
+
+            else:
+                parsed = urllib.parse.urlparse(self.args.repo)
+                out_dir = parsed.path.split('/')[-1]
+
+                subprocess.check_call([
+                    'git',
+                    'clone',
+                    *self.unknown_args,
+                    *self.args.args,
+                    self.args.repo,
+                ])
+
+        finally:
+            print(out_dir)
 
     @ap.command(
         ap.arg('rev', nargs='?', default='HEAD'),

omdev/tools/pip.py

@@ -1,18 +1,35 @@
+"""
+TODO:
+ - https://github.com/pypa/pip/blob/420435903ff2fc694d6950a47b896427ecaed78f/src/pip/_internal/req/req_file.py ?
+"""
+import contextlib
 import importlib.metadata
 import io
+import os.path
 import sys
+import typing as ta
 import urllib.request
-import xml.etree.ElementTree as ET  # noqa
 
 from omlish import argparse as ap
 from omlish import check
+from omlish import lang
+from omlish import marshal as msh
+from omlish.formats import json
 
 from ..cli import CliModule
+from ..packaging import marshal as _  # noqa
 from ..packaging.names import canonicalize_name
+from ..packaging.requires import ParsedRequirement
 from ..packaging.requires import RequiresVariable
 from ..packaging.requires import parse_requirement
 
 
+if ta.TYPE_CHECKING:
+    import xml.etree.ElementTree as ET  # noqa
+else:
+    ET = lang.proxy_import('xml.etree.ElementTree')
+
+
 PYPI_URL = 'https://pypi.org/'
 
 
@@ -84,6 +101,65 @@ class Cli(ap.Cli):
             if not uses_by_req.get(d):
                 print(d)
 
+    @ap.command(
+        ap.arg('files', nargs='*'),
+        ap.arg('-r', '--follow-requirements', action='store_true'),
+        ap.arg('-j', '--json', action='store_true'),
+        ap.arg('-b', '--bare', action='store_true'),
+    )
+    def parse(self) -> None:
+        def print_req(req: ParsedRequirement) -> None:
+            if self.args.json:
+                req_m = msh.marshal(req)
+                print(json.dumps(req_m))
+
+            elif self.args.bare:
+                print(req.name)
+
+            else:
+                print(f'{req.name}{req.specifier or ""}')
+
+        #
+
+        seen_files: set[str] = set()
+
+        def do_file(file: ta.TextIO | str) -> None:
+            if isinstance(file, str) and file in seen_files:
+                return
+
+            with contextlib.ExitStack() as es:
+                f: ta.TextIO
+                if isinstance(file, str):
+                    f = es.enter_context(open(file))
+                else:
+                    f = file
+
+                for l in f:
+                    if '#' in l:
+                        l = l.partition('#')[0]
+
+                    if not (l := l.strip()):
+                        continue
+
+                    if l.startswith('git+'):
+                        continue  # FIXME
+
+                    elif l.startswith('-r'):  # noqa
+                        if self.args.follow_requirements:
+                            base_dir = os.path.dirname(file) if isinstance(file, str) else '.'
+                            r_file = os.path.join(base_dir, l[2:].strip())
+                            do_file(r_file)
+
+                    else:
+                        req = parse_requirement(l)
+                        print_req(req)
+
+        if self.args.files:
+            for file in self.args.files:
+                do_file(file)
+        else:
+            do_file(sys.stdin)
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('pip', __name__)

omdev/tools/qr.py

@@ -0,0 +1,79 @@
+"""
+https://segno.readthedocs.io/en/stable/comparison-qrcode-libs.html
+- https://github.com/nayuki/QR-Code-generator
+- https://github.com/heuer/segno/
+- https://github.com/lincolnloop/python-qrcode
+"""
+import argparse
+import os
+import subprocess
+import sys
+import tempfile
+import typing as ta
+
+from omlish import lang
+
+from ..cli import CliModule
+
+
+if ta.TYPE_CHECKING:
+    import segno
+else:
+    segno = lang.proxy_import('segno')
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('content', nargs='?')
+
+    parser.add_argument('-x', '--target-size', type=int)
+
+    parser.add_argument('-o', '--output')
+    parser.add_argument('-O', '--open', action='store_true')
+
+    parser.add_argument(
+        '--error', '-e',
+        help=(
+            'Error correction level: '
+            '"L": 7%% (default), '
+            '"M": 15%%, '
+            '"Q": 25%%, '
+            '"H": 30%%, '
+            '"-": no error correction (used for M1 symbols)'
+        ),
+        choices=('L', 'M', 'Q', 'H', '-'),
+    )
+    args = parser.parse_args()
+
+    if (content := args.content) is None:
+        content = sys.stdin.read()
+
+    qr = segno.make(content)
+
+    if (tx := args.target_size) is not None:
+        sz = max(*qr.symbol_size())
+        sc = max(float(tx) / sz, 1)
+    else:
+        sc = 1
+
+    if args.output is not None:
+        out_file = args.output
+    else:
+        fd, out_file = tempfile.mkstemp(suffix='-qrcode.png')
+        os.close(fd)
+
+    qr.save(out_file, scale=sc)
+
+    if args.output is None:
+        print(out_file)
+
+    if args.open:
+        subprocess.check_call(['open', out_file])
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('qr', __name__)
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev103.dist-info → omdev-0.0.0.dev112.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev103
+Version: 0.0.0.dev112
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev103
+Requires-Dist: omlish ==0.0.0.dev112
 Provides-Extra: all
 Requires-Dist: black ~=24.10 ; extra == 'all'
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'
@@ -23,6 +23,7 @@ Requires-Dist: markdown ~=3.7 ; extra == 'all'
 Requires-Dist: mypy ~=1.11 ; extra == 'all'
 Requires-Dist: gprof2dot ~=2024.6 ; extra == 'all'
 Requires-Dist: prompt-toolkit ~=3.0 ; extra == 'all'
+Requires-Dist: segno ~=1.6 ; extra == 'all'
 Requires-Dist: tokenize-rt ~=6.1 ; extra == 'all'
 Requires-Dist: wheel ~=0.44 ; extra == 'all'
 Provides-Extra: black
@@ -40,6 +41,8 @@ Provides-Extra: prof
 Requires-Dist: gprof2dot ~=2024.6 ; extra == 'prof'
 Provides-Extra: ptk
 Requires-Dist: prompt-toolkit ~=3.0 ; extra == 'ptk'
+Provides-Extra: qr
+Requires-Dist: segno ~=1.6 ; extra == 'qr'
 Provides-Extra: tokens
 Requires-Dist: tokenize-rt ~=6.1 ; extra == 'tokens'
 Provides-Extra: wheel

{omdev-0.0.0.dev103.dist-info → omdev-0.0.0.dev112.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omdev/.manifests.json,sha256=6bX1vHV-8UNBIU0fZFolH1APIB10SV3edD3Mejk3-R4,6713
-omdev/__about__.py,sha256=ON7EnhbxbwLsMj60wkd9OEYPloXZ7jmnMMzeLg44LXY,1225
+omdev/.manifests.json,sha256=CttiykwDkNVtWsqk7xCLY0o7eUxPVTJvfS5enx6xg5g,7479
+omdev/__about__.py,sha256=n5x-SO70OgbDQFzQ1d7sZDVMsnkQc4PxQZPFaIQFa0E,1281
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
 omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
@@ -67,7 +67,7 @@ omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
 omdev/cli/types.py,sha256=bqKw9SbtBtAip2vF9v4khh0CqKG6LBr6n9VzWBz7AJE,474
 omdev/clipboard/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/clipboard/clipboard.py,sha256=CmnozkRljJ9UQDHLfCS8wKU0Xg-HfbsAkagAfMEias0,567
-omdev/clipboard/darwin.py,sha256=Nq4SsAEJdIof_mgMTderdeQyuiyI0hlHUxVuom4YAcE,6415
+omdev/clipboard/darwin.py,sha256=zKPmI4mdTTo5ixbOVIBt6OnZE6BrpXgTPf0Tgz_-ds0,7556
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
 omdev/interp/cli.py,sha256=sh7PZQoLletUViw1Y9OXNr9ekyNZ6YyxYuOQ_n9hyqU,2072
@@ -89,11 +89,12 @@ omdev/manifests/load.py,sha256=LtEsluDdd8CkNGj0QGBxee3twBn095Fru0xz2mtr7uk,4788
 omdev/manifests/types.py,sha256=Jv6PAdVLPb9Hh4y6vDhPlWuMNBBViin1bC_u83jfsH4,234
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/mypy/debug.py,sha256=WcZw-3Z1njg_KFGqi3DB6RuqbBa3dLArJnjVCuY1Mn0,3003
-omdev/packaging/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
-omdev/packaging/names.py,sha256=lwws9dgClio0_-w6fZcihOKxx4FPkrHUxum918KjZO8,2513
-omdev/packaging/requires.py,sha256=VQ-rRDK4_w2R-0xMTbLCwhvZwkO-qgS8uEMbRhNmfOw,15598
-omdev/packaging/specifiers.py,sha256=6Odf9e6farwlPRsD_YqwTfYKG-BXn_dIcKtqfkhfodI,17432
-omdev/packaging/versions.py,sha256=ei2eopEsJq3zSMJmezK1nzZgikgCdxFtnF3f69nCRZQ,12246
+omdev/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/packaging/marshal.py,sha256=mWRuZ_okYxRJXylKFQLQpC8Pp7xjkUEfWYNzQIS5A2c,2376
+omdev/packaging/names.py,sha256=-a7AykFPVR1i6EYJepbe3ABRrZQ_tPPmK5olzbn9HLI,2528
+omdev/packaging/requires.py,sha256=kyyVCM0RyaKqmXd6tU5zf0QjWvCLQMNV_ev5hvOee_o,15731
+omdev/packaging/specifiers.py,sha256=X8xOcwRLXTQYx5mYAS3ijqoTLlCtYESyUu4fX9bvblY,17447
+omdev/packaging/versions.py,sha256=K4eUOUvLmYcR4aeUywekeWTBqAvZchrIxLf7dl07MS4,12261
 omdev/precheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/precheck/__main__.py,sha256=UEuS4z5-heIrwTtB-ONe1KeXJdqj8tYXMqWMpuO10so,165
 omdev/precheck/base.py,sha256=a_lGoFM-QhL8u8XDUYFhb-feEyfPbP4j8lcmNO51sHY,732
@@ -104,7 +105,10 @@ omdev/precheck/manifests.py,sha256=YfXqt6u0hlFXY0QkBMec6V_6Y9T4eCVAmrJDkQkB13U,7
 omdev/precheck/scripts.py,sha256=Xw9kkQzlDd_2V9av9qlaNpNZG9jZdy3TTo7x60MeR2I,1273
 omdev/ptk/__init__.py,sha256=StAwXQ96e8Xkkg7ciR9oBBhcSgqHT76vhoZML82BuY0,447
 omdev/ptk/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/ptk/apps/ncdu.py,sha256=m66lMUGuvmFSdpt1tLflvugSHUz-yWbIAKtTLSCcxow,4444
+omdev/ptk/apps/ncdu.py,sha256=dOkEJoc2Wjv1u_Uge7Vpei_LvXldoPP5833Eia355tc,4548
+omdev/pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/pycharm/__main__.py,sha256=hUPp11D024eMdT86BxXiRVtF7AGBk5W6Zn8_mEHSksY,163
+omdev/pycharm/cli.py,sha256=XDR3fYUnGdK2oys3IKs7QrGbYwXUiMba16DNXdMVlAA,2209
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,165
 omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
@@ -114,31 +118,33 @@ omdev/pyproject/pkg.py,sha256=WB9k3zEpHSAR24H09kikgAnLMWUz-bk9f0aB-2L_ITw,14560
 omdev/pyproject/reqs.py,sha256=8feZ71YnGzwKbLK4zO28CDQeNcZIIuq6cnkBhs6M-7E,2406
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,1064
-omdev/scripts/execrss.py,sha256=hJTWBig_-XqKIj1DphYTfeVDtdQTM1XUl-Hvzs2x9iY,451
-omdev/scripts/exectime.py,sha256=dBdn3KV2jR6tCrzGvb9dTl2uGe2vNpLxmHMtExmnaiM,410
+omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
+omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=Jbo3Yk2RAbE8_tJ97iTcVNpoxCJxrRb2tl1W_CV3NG0,14067
 omdev/scripts/interp.py,sha256=U6mU2RPZjwcBhn4Vl4SrAyDUFcf7bBxBnPY5FHCxosw,72496
-omdev/scripts/pyproject.py,sha256=pRQuKcHasQjnO5_Pmx6hLDagujWxJ7de8Ux7Ml4mYpE,164742
+omdev/scripts/pyproject.py,sha256=RNWsO9-cu6MUXuWFT1Y200euUu6WcAC4orwGEUoGVWA,165526
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
+omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
 omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/doc.py,sha256=mv9XfitzqXl3vFHSenv01xHCxWf8g03rUAb_sqoty98,2556
 omdev/tools/docker.py,sha256=k2BrVvFYwyGov064CPHd_HWo9aqR1zHc2UeEsVwPth4,6827
-omdev/tools/git.py,sha256=1Oa2AgdZIJZ2eusso9yFzkd9zLWH3d4lTiVFzwg0uDM,3808
+omdev/tools/git.py,sha256=IARrfL9R9BHpmTBia3svbPeCzf_4qlCCbOsLpohsfUI,4184
 omdev/tools/importscan.py,sha256=QeGjR3UGcuuuDUiisFuAXWHlcKJScGxGEcU6tfOh2CM,4069
 omdev/tools/mkrelimp.py,sha256=wsJAjTIf3nqcSfnT9TkDpS1VUOoM9W2Az5tZdWuzyLM,4054
 omdev/tools/notebook.py,sha256=M8Xi_gfZdlahnyFLtp0RBgYZPSHWQStMMDYZc71Zync,3494
-omdev/tools/pip.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
+omdev/tools/pip.py,sha256=_O7WAACQ1F1ffH4ogZHcppT4P8VQxWQchJMLn9FvsJc,5073
 omdev/tools/prof.py,sha256=8ZU9x_Dq8eT2ZFwU9sJpDIvxcIn9qBc8y2ELKPb5e5M,1382
+omdev/tools/qr.py,sha256=tm68lPwEAkEwIL2sUKPKBYfwwPtjVWG1DBZwur8_jY8,1737
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev103.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev103.dist-info/METADATA,sha256=-uMabB38BqYSy4Z2f78X6mYDUIkzwGM-0pLcTc-L7fc,1704
-omdev-0.0.0.dev103.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-omdev-0.0.0.dev103.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev103.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev103.dist-info/RECORD,,
+omdev-0.0.0.dev112.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev112.dist-info/METADATA,sha256=VeCQ5RyISLmbtXUOxqiBvvzJW3kHbcsb8l6KjNrg0C8,1810
+omdev-0.0.0.dev112.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+omdev-0.0.0.dev112.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev112.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev112.dist-info/RECORD,,

{omdev-0.0.0.dev103.dist-info → omdev-0.0.0.dev112.dist-info}/WHEEL

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