omlish 0.0.0.dev56__py3-none-any.whl → 0.0.0.dev57__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev56'
-__revision__ = '1d081aeb233ec7ae534199fc0a6c063d4c79fcf7'
+__version__ = '0.0.0.dev57'
+__revision__ = '6bc82bd3fa6f9a7e33d9f3a69e8d3e1855aa6417'
 
 
 #

omlish/formats/json/cli.py

@@ -1,13 +1,34 @@
 import argparse
 import contextlib
+import dataclasses as dc
+import enum
 import json
+import subprocess
 import sys
 import typing as ta
 
+from ... import lang
 from ... import term
 from .render import JsonRenderer
 
 
+if ta.TYPE_CHECKING:
+    import tomllib
+
+    import yaml
+
+    from .. import dotenv
+    from .. import props
+
+else:
+    tomllib = lang.proxy_import('tomllib')
+
+    yaml = lang.proxy_import('yaml')
+
+    dotenv = lang.proxy_import('..dotenv', __package__)
+    props = lang.proxy_import('..props', __package__)
+
+
 def term_color(o: ta.Any, state: JsonRenderer.State) -> tuple[str, str]:
     if state is JsonRenderer.State.KEY:
         return term.SGR(term.SGRs.FG.BRIGHT_BLUE), term.SGR(term.SGRs.RESET)
@@ -17,14 +38,39 @@ def term_color(o: ta.Any, state: JsonRenderer.State) -> tuple[str, str]:
         return '', ''
 
 
+@dc.dataclass(frozen=True)
+class Format:
+    names: ta.Sequence[str]
+    load: ta.Callable[[ta.TextIO], ta.Any]
+
+
+class Formats(enum.Enum):
+    JSON = Format(['json'], json.load)
+    YAML = Format(['yaml', 'yml'], lambda f: yaml.safe_load(f))
+    TOML = Format(['toml'], lambda f: tomllib.loads(f.read()))
+    ENV = Format(['env', 'dotenv'], lambda f: dotenv.dotenv_values(stream=f))
+    PROPS = Format(['properties', 'props'], lambda f: dict(props.Properties().load(f.read())))
+
+
+FORMATS_BY_NAME: ta.Mapping[str, Format] = {
+    n: f
+    for e in Formats
+    for f in [e.value]
+    for n in f.names
+}
+
+
 def _main() -> None:
     parser = argparse.ArgumentParser()
+
     parser.add_argument('file', nargs='?')
+    parser.add_argument('-f', '--format')
     parser.add_argument('-z', '--compact', action='store_true')
     parser.add_argument('-p', '--pretty', action='store_true')
     parser.add_argument('-i', '--indent')
     parser.add_argument('-s', '--sort-keys', action='store_true')
     parser.add_argument('-c', '--color', action='store_true')
+    parser.add_argument('-l', '--less', action='store_true')
     args = parser.parse_args()
 
     separators = None
@@ -40,32 +86,55 @@ def _main() -> None:
         except ValueError:
             indent = args.indent
 
+    fmt_name = args.format
+    if fmt_name is None:
+        if args.file is not None:
+            ext = args.file.rpartition('.')[2]
+            if ext in FORMATS_BY_NAME:
+                fmt_name = ext
+    if fmt_name is None:
+        fmt_name = 'json'
+    fmt = FORMATS_BY_NAME[fmt_name]
+
     with contextlib.ExitStack() as es:
         if args.file is None:
             in_file = sys.stdin
         else:
             in_file = es.enter_context(open(args.file))
 
-        data = json.load(in_file)
+        data = fmt.load(in_file)
 
     kw: dict[str, ta.Any] = dict(
         indent=indent,
         separators=separators,
+        sort_keys=args.sort_keys,
     )
 
     if args.color:
-        JsonRenderer(
-            sys.stdout,
+        out = JsonRenderer.render_str(
+            data,
             **kw,
             style=term_color,
-        ).render(data)
-        print()
+        )
 
     else:
-        print(json.dumps(
+        out = json.dumps(
             data,
             **kw,
-        ))
+        )
+
+    if args.less:
+        subprocess.run(
+            [
+                'less',
+                *(['-R'] if args.color else []),
+            ],
+            input=out.encode(),
+            check=True,
+        )
+
+    else:
+        print(out)
 
 
 if __name__ == '__main__':

omlish/formats/props.py

@@ -508,7 +508,7 @@ class Properties(collections.abc.MutableMapping):
             source_data,
             encoding: str | None = 'iso-8859-1',
             metadoc: bool = False,
-    ) -> None:
+    ) -> ta.Self:
         self.reset(metadoc)
 
         if isinstance(source_data, bytes):
@@ -522,6 +522,8 @@ class Properties(collections.abc.MutableMapping):
 
         self._parse()
 
+        return self
+
     def store(
             self,
             out_stream,
@@ -530,7 +532,7 @@ class Properties(collections.abc.MutableMapping):
             strict: bool = True,
             strip_meta: bool = True,
             timestamp: bool = True,
-    ) -> None:
+    ) -> ta.Self:
         out_codec_info = codecs.lookup(encoding)
         wrapped_out_stream = out_codec_info.streamwriter(out_stream, _jbackslash_replace_codec_name)
         properties_escape_nonprinting = strict and out_codec_info == codecs.lookup('latin_1')
@@ -597,6 +599,8 @@ class Properties(collections.abc.MutableMapping):
                     file=wrapped_out_stream,
                 )
 
+        return self
+
     def list(self, out_stream=sys.stderr) -> None:
         print('-- listing properties --', file=out_stream)
         for key in self._properties:

{omlish-0.0.0.dev56.dist-info → omlish-0.0.0.dev57.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev56
+Version: 0.0.0.dev57
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev56.dist-info → omlish-0.0.0.dev57.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=wTGXwNmvtaKsDWtTwwj3Uib5Inaj8ZBn0MB69bE80X4,1419
-omlish/__about__.py,sha256=OmcoVJ5WHgdOGJt6I58kb1scFk6M-rJM3RyqDolJYdE,3420
+omlish/__about__.py,sha256=TcVGEzTkX3fMqsIJaOXPCs013BBL_Tc4-lqbwNV4bgs,3420
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Vr70_85EVLJLgEkRtwOr264tMRtqtlN7ncFfXRUk5aM,6914
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -116,11 +116,11 @@ omlish/docker/hub.py,sha256=YcDYOi6t1FA2Sp0RVrmZ9cBXbzFWQ8wTps3wOskA-K0,1955
 omlish/docker/manifests.py,sha256=LR4FpOGNUT3bZQ-gTjB6r_-1C3YiG30QvevZjrsVUQM,7068
 omlish/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/dotenv.py,sha256=UjZl3gac-0U24sDjCCGMcCqO1UCWG2Zs8PZ4JdAg2YE,17348
-omlish/formats/props.py,sha256=diYjZDsG1s50ImJhkpeinMwjr8952nIVI-0gYhBIvCY,18897
+omlish/formats/props.py,sha256=JwFJbKblqzqnzXf7YKFzQSDfcAXzkKsfoYvad6FPy98,18945
 omlish/formats/yaml.py,sha256=R3NTkjomsIfjsUNmSf_bOaCUIID3JTyHJHsliQDSYQo,6688
 omlish/formats/json/__init__.py,sha256=moSR67Qkju2eYb_qVDtaivepe44mxAnYuC8OCSbtETg,298
 omlish/formats/json/__main__.py,sha256=1wxxKZVkj_u7HCcewwMIbGuZj_Wph95yrUbm474Op9M,188
-omlish/formats/json/cli.py,sha256=4zNG69FUQ58F0sxZ-va0ysmthzuVAEFzYpDUoHB-itA,1734
+omlish/formats/json/cli.py,sha256=4zftNijlIOnGUHYn5J1s4yRDRM1K4udBzS3Kh8R2vNc,3374
 omlish/formats/json/json.py,sha256=y8d8WWgzGZDTjzYc_xe9v4T0foXHI-UP7gjCwnHzUIA,828
 omlish/formats/json/render.py,sha256=6edhSrxXWW3nzRfokp5qaldT0_YAj-HVEan_rErf-vo,3208
 omlish/formats/json/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -347,9 +347,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev56.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev56.dist-info/METADATA,sha256=LAf0N5afnrlk6A12ObzkTXJ8pDcdKwjpADduKtBz6f4,4167
-omlish-0.0.0.dev56.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev56.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev56.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev56.dist-info/RECORD,,
+omlish-0.0.0.dev57.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev57.dist-info/METADATA,sha256=SSyQEUrMKl0Bkig1soCu8_V7T-AVM8weCHYyMkDp8bc,4167
+omlish-0.0.0.dev57.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev57.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev57.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev57.dist-info/RECORD,,