omlish 0.0.0.dev232__py3-none-any.whl → 0.0.0.dev233__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev232'
-__revision__ = '2f0435f277c869f9ecf426be2aeaf08eeb9792de'
+__version__ = '0.0.0.dev233'
+__revision__ = '104fc39d3a0d5ea92881a45333cbcb1810f6b7ff'
 
 
 #

omlish/codecs/registry.py

@@ -105,7 +105,7 @@ def _install_standard_codecs(registry: CodecRegistry) -> None:
 @cached.function
 def _build_manifest_lazy_loaded_codecs() -> ta.Sequence[LazyLoadedCodec]:
     ldr = manifest_load.MANIFEST_LOADER
-    pkgs = {__package__.split('.')[0], *ldr.discover()}
+    pkgs = {__package__.split('.')[0], *ldr.discover_pkgs()}
     mns = ldr.load(*pkgs, only=[LazyLoadedCodec])
     return [m.value for m in mns]
 

omlish/manifests/load.py

@@ -9,6 +9,7 @@ import dataclasses as dc
 import importlib.machinery
 import importlib.resources
 import json
+import os.path
 import threading
 import typing as ta
 
@@ -193,7 +194,7 @@ class ManifestLoader:
 
     ENTRY_POINT_GROUP = 'omlish.manifests'
 
-    def discover(self) -> ta.Sequence[str]:
+    def discover_pkgs(self) -> ta.Sequence[str]:
         # This is a fat dep so do it late.
         import importlib.metadata
 
@@ -202,6 +203,35 @@ class ManifestLoader:
             for ep in importlib.metadata.entry_points(group=self.ENTRY_POINT_GROUP)
         ]
 
+    def scan_pkg_root(self, root: str) -> ta.Sequence[str]:
+        pkgs: ta.List[str] = []
+        for n in os.listdir(root):
+            if os.path.isdir(p := os.path.join(root, n)) and os.path.exists(os.path.join(p, '__init__.py')):
+                pkgs.append(n)
+        return pkgs
+
+    def scan_or_discover_pkgs(
+            self,
+            *,
+            specified_roots: ta.Optional[ta.Sequence[str]] = None,
+            fallback_root: ta.Optional[str] = None,
+    ) -> ta.Sequence[str]:
+        pkgs: list[str] = []
+
+        if specified_roots is not None:
+            if isinstance(specified_roots, str):
+                raise TypeError(specified_roots)
+            for r in specified_roots:
+                pkgs.extend(self.scan_pkg_root(r))
+
+        else:
+            pkgs.extend(self.discover_pkgs())
+
+            if not pkgs and fallback_root is not None:
+                pkgs.extend(self.scan_pkg_root(fallback_root))
+
+        return pkgs
+
 
 ##
 

{omlish-0.0.0.dev232.dist-info → omlish-0.0.0.dev233.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev232
+Version: 0.0.0.dev233
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev232.dist-info → omlish-0.0.0.dev233.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=vQTAIvR8OblSq-uP2GUfnbei0RnmAnM5j0T1-OToh9E,8253
-omlish/__about__.py,sha256=-wogzlxSt20e8KuTBCH4MRnaUQhIUXLRZdyQ82uUp4E,3380
+omlish/__about__.py,sha256=hETL5TQrI5YAv_0oaMECavt9Vu8jjHjGR0tqTGZ353U,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=UI-XTFBwA6YXWJJJeBn-WkwBkfzDjLBBaZf4nIJA9y0,510
@@ -131,7 +131,7 @@ omlish/codecs/base.py,sha256=uFrDvP7SZdeBbpuUzGHvyOdFNAmhjkBG2cVaVydRsjw,2221
 omlish/codecs/bytes.py,sha256=jlZ87OmZ52HhQDNyL87R3OIviK2qV5iU2jZYOTOLWjk,2157
 omlish/codecs/chain.py,sha256=DrBi5vbaFfObfoppo6alwOmyW2XbrH2051cjExwr2Gs,527
 omlish/codecs/funcs.py,sha256=p4imNt7TobyZVXWC-WhntHVu9KfJrO4QwdtPRh-cVOk,850
-omlish/codecs/registry.py,sha256=Ald3fs707cJsUovYjNmxdT2zAQworvDxwMFk7DBT8r0,3995
+omlish/codecs/registry.py,sha256=yDkDpRJXD7owFCa4b0R4MMf3Le6KxknNBewjSrehepw,4000
 omlish/codecs/standard.py,sha256=eiZ4u9ep0XrA4Z_D1zJI0vmWyuN8HLrX4Se_r_Cq_ZM,60
 omlish/codecs/text.py,sha256=JzrdwMpQPo2NBBg3K1EZszzQy5vEWmd82SIerJd4yeQ,5723
 omlish/collections/__init__.py,sha256=ddzZS3C2rvDo65hspO9KlFsrinElxPWvYEgVyBUZdb0,2164
@@ -461,7 +461,7 @@ omlish/logs/standard.py,sha256=FbKdF2Z4Na5i2TNwKn0avLJXyICe2JKsPufjvKCHGn0,3162
 omlish/logs/timing.py,sha256=XrFUHIPT4EHDujLKbGs9fGFMmoM3NEP8xPRaESJr7bQ,1513
 omlish/logs/utils.py,sha256=mzHrZ9ji75p5A8qR29eUr05CBAHMb8J753MSkID_VaQ,393
 omlish/manifests/__init__.py,sha256=P2B0dpT8D7l5lJwRGPA92IcQj6oeXfd90X5-q9BJrKg,51
-omlish/manifests/load.py,sha256=LrWAvBfdzDkFdLuVwfw2RwFvLjxx-rvfkpU9eBsWeIc,5626
+omlish/manifests/load.py,sha256=u84sAHhDgHefTDK8S50W5czRnqfwm0obqiOzNBCBP9Q,6603
 omlish/manifests/types.py,sha256=d8bv5tknCJqclRfxCpao_8XxHo2yofhLpVHQTB-MfNw,260
 omlish/marshal/__init__.py,sha256=00D3S6qwUld1TUWd67hVHuNcrj3c_FAFSkCVXgGWT-s,2607
 omlish/marshal/base.py,sha256=tJ4iNuD7cW2GpGMznOhkAf2hugqp2pF2em0FaQcekrk,6740
@@ -705,9 +705,9 @@ omlish/text/indent.py,sha256=YjtJEBYWuk8--b9JU_T6q4yxV85_TR7VEVr5ViRCFwk,1336
 omlish/text/minja.py,sha256=jZC-fp3Xuhx48ppqsf2Sf1pHbC0t8XBB7UpUUoOk2Qw,5751
 omlish/text/parts.py,sha256=JkNZpyR2tv2CNcTaWJJhpQ9E4F0yPR8P_YfDbZfMtwQ,6182
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev232.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev232.dist-info/METADATA,sha256=q9xYAS00xDATKtVjZBhWNKwkSnMAIV0By4EIl_2vqFs,4176
-omlish-0.0.0.dev232.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omlish-0.0.0.dev232.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev232.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev232.dist-info/RECORD,,
+omlish-0.0.0.dev233.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev233.dist-info/METADATA,sha256=0YKyq7oO-djATl7sDOSc7EmgfhqGDWCX7iWI3ND1lpo,4176
+omlish-0.0.0.dev233.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omlish-0.0.0.dev233.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev233.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev233.dist-info/RECORD,,