python-filewrap 0.1.3__tar.gz → 0.1.4__tar.gz

{python_filewrap-0.1.3 → python_filewrap-0.1.4}/PKG-INFO

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

{python_filewrap-0.1.3 → python_filewrap-0.1.4}/filewrap/__init__.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 1, 3)
+__version__ = (0, 1, 4)
 __all__ = [
     "Buffer", "SupportsRead", "SupportsReadinto", 
     "SupportsWrite", "SupportsSeek", 
@@ -90,7 +90,7 @@ class SupportsSeek(Protocol):
 
 
 def bio_chunk_iter(
-    bio: SupportsRead[Buffer] | Callable[[int], Buffer], 
+    bio: SupportsRead[Buffer] | SupportsReadinto | Callable[[int], Buffer], 
     /, 
     size: int = -1, 
     chunksize: int = COPY_BUFSIZE, 
@@ -100,11 +100,19 @@ def bio_chunk_iter(
     use_readinto = False
     if callable(bio):
         read = bio
-    elif can_buffer and hasattr(bio, "readinto"):
+    elif can_buffer and isinstance(bio, SupportsReadinto):
         readinto = bio.readinto
         use_readinto = True
-    else:
+    elif isinstance(bio, SupportsRead):
         read = bio.read
+    else:
+        readinto = bio.readinto
+        def read(_):
+            buf = bytearray(chunksize)
+            length = readinto(buf)
+            if length == chunksize:
+                return buf
+            return buf[:length]
     if not callable(callback):
         callback = None
     if use_readinto:
@@ -151,7 +159,7 @@ def bio_chunk_iter(
 
 
 async def bio_chunk_async_iter(
-    bio: SupportsRead[Buffer] | Callable[[int], Buffer | Awaitable[Buffer]], 
+    bio: SupportsRead[Buffer] | SupportsReadinto | Callable[[int], Buffer | Awaitable[Buffer]], 
     /, 
     size: int = -1, 
     chunksize: int = COPY_BUFSIZE, 
@@ -160,12 +168,20 @@ async def bio_chunk_async_iter(
 ) -> AsyncIterator[Buffer]:
     use_readinto = False
     if callable(bio):
-        read = ensure_async(bio)
-    elif can_buffer and hasattr(bio, "readinto"):
-        readinto = ensure_async(bio.readinto)
+        read = ensure_async(bio, threaded=True)
+    elif can_buffer and isinstance(bio, SupportsReadinto):
+        readinto = ensure_async(bio.readinto, threaded=True)
         use_readinto = True
+    elif isinstance(bio, SupportsRead):
+        read = ensure_async(bio.read, threaded=True)
     else:
-        read = ensure_async(bio.read)
+        readinto = ensure_async(bio.readinto, threaded=True)
+        async def read(_):
+            buf = bytearray(chunksize)
+            length = await readinto(buf)
+            if length == chunksize:
+                return buf
+            return buf[:length]
     callback = ensure_async(callback) if callable(callback) else None
     if use_readinto:
         buf = bytearray(chunksize)
@@ -211,7 +227,7 @@ async def bio_chunk_async_iter(
 
 
 def bio_skip_iter(
-    bio: SupportsRead[Buffer] | Callable[[int], Buffer], 
+    bio: SupportsRead[Buffer] | SupportsReadinto | Callable[[int], Buffer], 
     /, 
     size: int = -1, 
     chunksize: int = COPY_BUFSIZE, 
@@ -282,7 +298,7 @@ def bio_skip_iter(
 
 
 async def bio_skip_async_iter(
-    bio: SupportsRead[Buffer] | Callable[[int], Buffer | Awaitable[Buffer]], 
+    bio: SupportsRead[Buffer] | SupportsReadinto | Callable[[int], Buffer | Awaitable[Buffer]], 
     /, 
     size: int = -1, 
     chunksize: int = COPY_BUFSIZE, 
@@ -293,7 +309,7 @@ async def bio_skip_async_iter(
     callback = ensure_async(callback) if callable(callback) else None
     length: int
     try:
-        seek = ensure_async(getattr(bio, "seek"))
+        seek = ensure_async(getattr(bio, "seek"), threaded=True)
         curpos = await seek(0, 1)
         if size > 0:
             length = (await seek(size, 1)) - curpos
@@ -303,9 +319,9 @@ async def bio_skip_async_iter(
         if chunksize <= 0:
             chunksize = COPY_BUFSIZE
         if callable(bio):
-            read = ensure_async(bio)
+            read = ensure_async(bio, threaded=True)
         elif hasattr(bio, "readinto"):
-            readinto = ensure_async(bio.readinto)
+            readinto = ensure_async(bio.readinto, threaded=True)
             buf = bytearray(chunksize)
             if size > 0:
                 while size >= chunksize:
@@ -329,7 +345,7 @@ async def bio_skip_async_iter(
                         await callback(length)
                     yield length
         else:
-            read = ensure_async(bio.read)
+            read = ensure_async(bio.read, threaded=True)
         if size > 0:
             while size:
                 readsize = min(chunksize, size)

{python_filewrap-0.1.3 → python_filewrap-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-filewrap"
-version = "0.1.3"
+version = "0.1.4"
 description = "Python file wrappers."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"