python-filewrap 0.2.7__tar.gz → 0.2.8__tar.gz

{python_filewrap-0.2.7 → python_filewrap-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-filewrap
-Version: 0.2.7
+Version: 0.2.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.2.7 → python_filewrap-0.2.8}/filewrap/__init__.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 2, 7)
+__version__ = (0, 2, 8)
 __all__ = [
     "SupportsRead", "SupportsReadinto", "SupportsWrite", "SupportsSeek", 
     "AsyncBufferedReader", "AsyncTextIOWrapper", "buffer_length", 
@@ -640,9 +640,9 @@ class AsyncTextIOWrapper(TextIOWrapper):
             if newline is None:
                 text_new = CRE_NOT_UNIX_NEWLINES.sub("\n", text_new)
             self._text = ""
-            return text_new
+            return text + text_new
 
-        ls_parts = [text]
+        ls_parts: list[str] = []
         add_part = ls_parts.append
 
         def process_part(data, errors="strict", /) -> int:
@@ -719,14 +719,29 @@ class AsyncTextIOWrapper(TextIOWrapper):
                 idx += 1
             return idx
         if size > 0:
-            text = await self.read(size)
-            stop = find_stop(text)
-            if not stop or stop == len(text):
-                return text
-            self._text = text[stop:] + self._text
-            return text[:stop]
+            if text := self._text:
+                if stop := find_stop(text):
+                    stop = min(stop, size)
+                    self._text = text[stop:]
+                    return text[:stop]
+                elif size <= len(text):
+                    self._text = text[size:]
+                    return text[:size]
+                self._text = ""
+                size -= len(text)
+            text_new = await self.read(size)
+            stop = find_stop(text_new)
+            if not stop or stop == len(text_new):
+                return text + text_new
+            self._text = text_new[stop:] + self._text
+            return text + text_new[:stop]
         else:
-            ls_part: list[str] = []
+            if text := self._text:
+                if stop := find_stop(text):
+                    self._text = text[stop:]
+                    return text[:stop]
+                self._text = ""
+            ls_part: list[str] = [text]
             add_part = ls_part.append
             while text := await self.read(READ_BUFSIZE):
                 if stop := find_stop(text):
@@ -1260,28 +1275,28 @@ def bytes_iter_to_reader(
         if at_end or not (bufsize := buffer_length(buf)):
             return 0
         with lock:
-            n = buffer_length(unconsumed)
-            if bufsize <= n:
-                buf[:], unconsumed = unconsumed[:bufsize], unconsumed[bufsize:]
-                pos += bufsize
-                return bufsize
-            buf[:n] = unconsumed
-            del unconsumed[:]
+            if n := buffer_length(unconsumed):
+                if bufsize <= n:
+                    buf[:], unconsumed = unconsumed[:bufsize], unconsumed[bufsize:]
+                    pos += bufsize
+                    return bufsize
+                buf[:n] = unconsumed
+                pos += n
+                del unconsumed[:]
             try:
                 while True:
-                    b = memoryview(getnext())
-                    if not b:
-                        continue
-                    m = n + buffer_length(b)
-                    if m >= bufsize:
-                        buf[n:] = b[:bufsize-n]
-                        unconsumed += b[bufsize-n:]
-                        pos += bufsize
-                        return bufsize
-                    else:
-                        buf[n:m] = b
-                        pos += buffer_length(b)
-                        n = m
+                    if b := memoryview(getnext()):
+                        m = n + len(b)
+                        if m >= bufsize:
+                            delta = bufsize - n
+                            buf[n:] = b[:delta]
+                            unconsumed += b[delta:]
+                            pos += delta
+                            return bufsize
+                        else:
+                            buf[n:m] = b
+                            pos += len(b)
+                            n = m
             except StopIteration:
                 at_end = True
                 return n
@@ -1386,15 +1401,7 @@ def bytes_iter_to_async_reader(
         except:
             pass
     def close():
-        nonlocal at_end
-        try:
-            method = getattr(it, "aclose")
-        except AttributeError:
-            method = getattr(it, "close")
-        ret = method()
-        if isawaitable(ret):
-            run_async(ret)
-        at_end = True
+        run_async(aclose())
     async def aclose():
         nonlocal at_end
         try:
@@ -1437,28 +1444,28 @@ def bytes_iter_to_async_reader(
         if at_end or not (bufsize := buffer_length(buf)):
             return 0
         async with lock:
-            n = buffer_length(unconsumed)
-            if bufsize <= n:
-                buf[:], unconsumed = unconsumed[:bufsize], unconsumed[bufsize:]
-                pos += bufsize
-                return bufsize
-            buf[:n] = unconsumed
-            del unconsumed[:]
+            if n := buffer_length(unconsumed):
+                if bufsize <= n:
+                    buf[:], unconsumed = unconsumed[:bufsize], unconsumed[bufsize:]
+                    pos += bufsize
+                    return bufsize
+                buf[:n] = unconsumed
+                pos += n
+                del unconsumed[:]
             try:
                 while True:
-                    b = memoryview(await getnext())
-                    if not b:
-                        continue
-                    m = n + buffer_length(b)
-                    if m >= bufsize:
-                        buf[n:] = b[:bufsize-n]
-                        unconsumed += b[bufsize-n:]
-                        pos += bufsize
-                        return bufsize
-                    else:
-                        buf[n:m] = b
-                        pos += buffer_length(b)
-                        n = m
+                    if b := memoryview(await getnext()):
+                        m = n + len(b)
+                        if m >= bufsize:
+                            delta = bufsize - n
+                            buf[n:] = b[:delta]
+                            unconsumed += b[delta:]
+                            pos += delta
+                            return bufsize
+                        else:
+                            buf[n:m] = b
+                            pos += len(b)
+                            n = m
             except (StopIteration, StopAsyncIteration):
                 at_end = True
                 return n

{python_filewrap-0.2.7 → python_filewrap-0.2.8}/pyproject.toml

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