python-filewrap 0.0.7.2__py3-none-any.whl → 0.0.8__py3-none-any.whl

filewrap/__init__.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 7)
+__version__ = (0, 0, 8)
 __all__ = [
     "SupportsRead", "SupportsWrite", "SupportsSeek", 
     "bio_chunk_iter", "bio_chunk_async_iter", 
@@ -45,7 +45,7 @@ class SupportsWrite(Protocol[_T_contra]):
 
 
 @runtime_checkable
-class SupportsSeek(Protocol[_T_contra]):
+class SupportsSeek(Protocol):
     def seek(self, /, __offset: int, __whence: int = 0) -> int: ...
 
 
@@ -54,30 +54,60 @@ def bio_chunk_iter(
     /, 
     size: int = -1, 
     chunksize: int = COPY_BUFSIZE, 
+    can_buffer: bool = False, 
     callback: None | Callable[[int], Any] = None, 
 ) -> Iterator[Buffer]:
+    use_readinto = False
     if callable(bio):
         read = bio
+    elif can_buffer and hasattr(bio, "readinto"):
+        readinto = bio.readinto
+        use_readinto = True
     else:
         read = bio.read
     if not callable(callback):
         callback = None
-    if size > 0:
-        while size:
-            readsize = min(chunksize, size)
-            chunk = read(readsize)
-            length = len(chunk)
-            if callback:
-                callback(length)
-            yield chunk
-            if length < readsize:
-                break
-            size -= readsize
-    elif size < 0:
-        while (chunk := read(chunksize)):
-            if callback:
-                callback(len(chunk))
-            yield chunk
+    if use_readinto:
+        buf = bytearray(chunksize)
+        if size > 0:
+            while size:
+                if size < chunksize:
+                    del buf[size:]
+                length = readinto(buf)
+                if callback:
+                    callback(length)
+                if length < len(buf):
+                    del buf[length:]
+                    yield buf
+                    break
+                yield buf
+                size -= length
+        else:
+            while (length := readinto(buf)):
+                if callback:
+                    callback(length)
+                if length < chunksize:
+                    del buf[length:]
+                    yield buf
+                    break
+                yield buf
+    else:
+        if size > 0:
+            while size:
+                readsize = min(chunksize, size)
+                chunk = read(readsize)
+                length = len(chunk)
+                if callback:
+                    callback(length)
+                yield chunk
+                if length < readsize:
+                    break
+                size -= length
+        elif size < 0:
+            while (chunk := read(chunksize)):
+                if callback:
+                    callback(len(chunk))
+                yield chunk
 
 
 async def bio_chunk_async_iter(
@@ -85,29 +115,59 @@ async def bio_chunk_async_iter(
     /, 
     size: int = -1, 
     chunksize: int = COPY_BUFSIZE, 
+    can_buffer: bool = False, 
     callback: None | Callable[[int], Any] = None, 
 ) -> AsyncIterator[Buffer]:
+    use_readinto = False
     if callable(bio):
         read = ensure_async(bio)
+    elif can_buffer and hasattr(bio, "readinto"):
+        readinto = ensure_async(bio.readinto)
+        use_readinto = True
     else:
         read = ensure_async(bio.read)
     callback = ensure_async(callback) if callable(callback) else None
-    if size > 0:
-        while size:
-            readsize = min(chunksize, size)
-            chunk = await read(readsize)
-            length = len(chunk)
-            if callback:
-                await callback(length)
-            yield chunk
-            if length < readsize:
-                break
-            size -= readsize
-    elif size < 0:
-        while (chunk := (await read(chunksize))):
-            if callback:
-                await callback(len(chunk))
-            yield chunk
+    if use_readinto:
+        buf = bytearray(chunksize)
+        if size > 0:
+            while size:
+                if size < chunksize:
+                    del buf[size:]
+                length = await readinto(buf)
+                if callback:
+                    await callback(length)
+                if length < len(buf):
+                    del buf[length:]
+                    yield buf
+                    break
+                yield buf
+                size -= length
+        else:
+            while (length := (await readinto(buf))):
+                if callback:
+                    await callback(length)
+                if length < chunksize:
+                    del buf[length:]
+                    yield buf
+                    break
+                yield buf
+    else:
+        if size > 0:
+            while size:
+                readsize = min(chunksize, size)
+                chunk = await read(readsize)
+                length = len(chunk)
+                if callback:
+                    await callback(length)
+                yield chunk
+                if length < readsize:
+                    break
+                size -= readsize
+        elif size < 0:
+            while (chunk := (await read(chunksize))):
+                if callback:
+                    await callback(len(chunk))
+                yield chunk
 
 
 def bio_skip_iter(

{python_filewrap-0.0.7.2.dist-info → python_filewrap-0.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-filewrap
-Version: 0.0.7.2
+Version: 0.0.8
 Summary: Python file wrappers.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-filewrap
 License: MIT

python_filewrap-0.0.8.dist-info/RECORD

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+filewrap/__init__.py,sha256=kgvpxjHpP0ZfyZsxofnSEjYXClNVhbsQARewbytl01Q,18778
+filewrap/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_filewrap-0.0.8.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_filewrap-0.0.8.dist-info/METADATA,sha256=Eb2gtpXftkLvFpwHFIlq8QOw1qHwbWBu0mWxhdEPfP4,1362
+python_filewrap-0.0.8.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+python_filewrap-0.0.8.dist-info/RECORD,,

python_filewrap-0.0.7.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-filewrap/__init__.py,sha256=6XD5ftZ6z5WDo6RDOpGONYlEp7rzBYbqulXVm9z-HnA,16773
-filewrap/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_filewrap-0.0.7.2.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_filewrap-0.0.7.2.dist-info/METADATA,sha256=6yuS1eI1vZTXQUNqg4ysI4B1L0qfOqeJJuCFzJvH9ZQ,1364
-python_filewrap-0.0.7.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-python_filewrap-0.0.7.2.dist-info/RECORD,,