ominfra 0.0.0.dev256__py3-none-any.whl → 0.0.0.dev258__py3-none-any.whl

ominfra/scripts/journald2aws.py

@@ -2980,15 +2980,21 @@ class ReadableListBuffer:
             raise EOFError(f'ReadableListBuffer got {"no" if d is None else len(d)}, expected {sz}')
         return d
 
-    def read_until(self, delim: bytes = b'\n') -> ta.Optional[bytes]:
+    def read_until_(self, delim: bytes = b'\n', start_buffer: int = 0) -> ta.Union[bytes, int]:
         if not (lst := self._lst):
-            return None
+            return 0
 
-        for i, d in enumerate(lst):
-            if (p := d.find(delim)) >= 0:
+        i = start_buffer
+        while i < len(lst):
+            if (p := lst[i].find(delim)) >= 0:
                 return self._chop(i, p + len(delim))
+            i += 1
 
-        return None
+        return i
+
+    def read_until(self, delim: bytes = b'\n') -> ta.Optional[bytes]:
+        r = self.read_until_(delim)
+        return r if isinstance(r, bytes) else None
 
 
 class IncrementalWriteBuffer:

ominfra/scripts/supervisor.py

@@ -4217,15 +4217,21 @@ class ReadableListBuffer:
             raise EOFError(f'ReadableListBuffer got {"no" if d is None else len(d)}, expected {sz}')
         return d
 
-    def read_until(self, delim: bytes = b'\n') -> ta.Optional[bytes]:
+    def read_until_(self, delim: bytes = b'\n', start_buffer: int = 0) -> ta.Union[bytes, int]:
         if not (lst := self._lst):
-            return None
+            return 0
 
-        for i, d in enumerate(lst):
-            if (p := d.find(delim)) >= 0:
+        i = start_buffer
+        while i < len(lst):
+            if (p := lst[i].find(delim)) >= 0:
                 return self._chop(i, p + len(delim))
+            i += 1
 
-        return None
+        return i
+
+    def read_until(self, delim: bytes = b'\n') -> ta.Optional[bytes]:
+        r = self.read_until_(delim)
+        return r if isinstance(r, bytes) else None
 
 
 class IncrementalWriteBuffer:

{ominfra-0.0.0.dev256.dist-info → ominfra-0.0.0.dev258.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev256
+Version: 0.0.0.dev258
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,11 +12,12 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev256
-Requires-Dist: omlish==0.0.0.dev256
+Requires-Dist: omdev==0.0.0.dev258
+Requires-Dist: omlish==0.0.0.dev258
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"
 Provides-Extra: ssh
 Requires-Dist: paramiko~=3.5; extra == "ssh"
 Requires-Dist: asyncssh~=2.18; extra == "ssh"
+Dynamic: license-file

{ominfra-0.0.0.dev256.dist-info → ominfra-0.0.0.dev258.dist-info}/RECORD

@@ -112,9 +112,9 @@ ominfra/manage/targets/connection.py,sha256=rVI1YJxFClcF-sdttqWyIz9_XjPI01GUdwxY
 ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhhMcE,1561
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=vvuAU6O3tu5deEg5TjPjepgytXCqEvi7EQAMnGZ8NjY,168285
+ominfra/scripts/journald2aws.py,sha256=ZX6qEsLVJSnRm22Mm8-euNG4zCqdMdFPz31pb9RsBOg,168504
 ominfra/scripts/manage.py,sha256=Jpsbj9DUB852agbxWS2wOBWOJUZ1wK-WlRfyDvbhiVs,379523
-ominfra/scripts/supervisor.py,sha256=U9soYrTfOpwei1681aNdCkq94HqGxh5g1IHTMiqM8oU,296898
+ominfra/scripts/supervisor.py,sha256=lv_bv0d15GUsrUN44KaN0n4_NJHhrN66BSsO2swcY7U,297117
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=auGP1LlbBJSFKUWNvQo_UzA8IsBNZBTMwEkFFRJ4FX4,6185
-ominfra-0.0.0.dev256.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev256.dist-info/METADATA,sha256=PGAUnHBdPLbXdWT6OHuKvELOuMjNYzeI_i0jMiRfXs8,731
-ominfra-0.0.0.dev256.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-ominfra-0.0.0.dev256.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev256.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev256.dist-info/RECORD,,
+ominfra-0.0.0.dev258.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev258.dist-info/METADATA,sha256=QqNrCwQmV4Clb9qpP4z3PeUnTAeQ4z7-fuqBHWoHuwQ,753
+ominfra-0.0.0.dev258.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
+ominfra-0.0.0.dev258.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev258.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev258.dist-info/RECORD,,

{ominfra-0.0.0.dev256.dist-info → ominfra-0.0.0.dev258.dist-info}/WHEEL

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