python-httpfile 0.0.4.1__tar.gz → 0.0.4.3__tar.gz

{python_httpfile-0.0.4.1 → python_httpfile-0.0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-httpfile
-Version: 0.0.4.1
+Version: 0.0.4.3
 Summary: Python httpfile.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-httpfile
 License: MIT

{python_httpfile-0.0.4.1 → python_httpfile-0.0.4.3}/httpfile/__init__.py

@@ -215,6 +215,8 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         return self.file.fileno()
 
     def flush(self, /):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return self.file.flush()
 
     def isatty(self, /) -> bool:
@@ -533,7 +535,8 @@ class AsyncHTTPFileReader(HTTPFileReader):
         seek_threshold: int = 1 << 20, 
         urlopen = None, 
     ):
-        run_async(self.__ainit__(
+        self.__dict__.update(closed=False, start=0)
+        self.__dict__["_initing"] = run_async(self.__ainit__(
             url=url, 
             headers=headers, 
             start=start, 
@@ -542,6 +545,9 @@ class AsyncHTTPFileReader(HTTPFileReader):
         ))
 
     async def __aenter__(self, /) -> Self:
+        if _initing := self.__dict__.get("_initing"):
+            await _initing
+            self.__dict__.pop("_initing", None)
         return self
 
     async def __aexit__(self, /, *exc_info):
@@ -602,12 +608,12 @@ class AsyncHTTPFileReader(HTTPFileReader):
             length = get_total_length(response) or 0, 
             chunked = is_chunked(response), 
             start = start, 
-            closed = False, 
             urlopen = urlopen, 
             headers = MappingProxyType(headers), 
             seek_threshold = max(seek_threshold, 0), 
             _seekable = is_range_request(response), 
         )
+        self.__dict__.pop("_initing", None)
 
     async def aclose(self, /):
         if not self.closed:
@@ -620,7 +626,10 @@ class AsyncHTTPFileReader(HTTPFileReader):
             try:
                 ret = self.response.aclose()
             except (AttributeError, TypeError):
-                ret = self.response.close()
+                try:
+                    ret = self.response.close()
+                except (AttributeError, TypeError):
+                    return
             if isawaitable(ret):
                 run_async(ret)
 
@@ -628,16 +637,27 @@ class AsyncHTTPFileReader(HTTPFileReader):
         try:
             ret = self.response.aclose()
         except (AttributeError, TypeError):
-            ret = self.response.close()
+            try:
+                ret = self.response.close()
+            except (AttributeError, TypeError):
+                return
         if isawaitable(ret):
             await ret
 
     async def flush(self, /):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
+        if _initing := self.__dict__.get("_initing"):
+            await _initing
+            self.__dict__.pop("_initing", None)
         return await ensure_async(self.file.flush, threaded=True)()
 
     async def read(self, size: int = -1, /) -> bytes: # type: ignore
         if self.closed:
             raise ValueError("I/O operation on closed file.")
+        if _initing := self.__dict__.get("_initing"):
+            await _initing
+            self.__dict__.pop("_initing", None)
         if size == 0 or not self.chunked and self.tell() >= self.length:
             return b""
         if self.file_closed:
@@ -654,6 +674,9 @@ class AsyncHTTPFileReader(HTTPFileReader):
     async def readinto(self, buffer, /) -> int: # type: ignore
         if self.closed:
             raise ValueError("I/O operation on closed file.")
+        if _initing := self.__dict__.get("_initing"):
+            await _initing
+            self.__dict__.pop("_initing", None)
         if not buffer or not self.chunked and self.tell() >= self.length:
             return 0
         if self.file_closed:
@@ -675,6 +698,9 @@ class AsyncHTTPFileReader(HTTPFileReader):
     async def readline(self, size: None | int = -1, /) -> bytes: # type: ignore
         if self.closed:
             raise ValueError("I/O operation on closed file.")
+        if _initing := self.__dict__.get("_initing"):
+            await _initing
+            self.__dict__.pop("_initing", None)
         if size == 0 or not self.chunked and self.tell() >= self.length:
             return b""
         if self.file_closed:
@@ -691,6 +717,9 @@ class AsyncHTTPFileReader(HTTPFileReader):
     async def readlines(self, hint: int = -1, /) -> list[bytes]: # type: ignore
         if self.closed:
             raise ValueError("I/O operation on closed file.")
+        if _initing := self.__dict__.get("_initing"):
+            await _initing
+            self.__dict__.pop("_initing", None)
         if not self.chunked and self.tell() >= self.length:
             return []
         if self.file_closed:
@@ -702,6 +731,9 @@ class AsyncHTTPFileReader(HTTPFileReader):
         return ls
 
     async def reconnect(self, /, start: None | int = None) -> int: # type: ignore
+        if _initing := self.__dict__.get("_initing"):
+            await _initing
+            self.__dict__.pop("_initing", None)
         if not self._seekable:
             if start is None and self.tell() or start:
                 raise OSError(errno.EOPNOTSUPP, "Unsupport for reconnection of non-seekable streams.")
@@ -734,6 +766,9 @@ class AsyncHTTPFileReader(HTTPFileReader):
     async def seek(self, pos: int, whence: int = 0, /) -> int: # type: ignore
         if self.closed:
             raise ValueError("I/O operation on closed file.")
+        if _initing := self.__dict__.get("_initing"):
+            await _initing
+            self.__dict__.pop("_initing", None)
         if not self._seekable:
             raise OSError(errno.EINVAL, "not a seekable stream")
         if whence == 0:
@@ -1151,7 +1186,7 @@ if find_spec("httpx"):
             elif urlopen is None:
                 if _httpx_urlopen_async is None:
                     if "__del__" not in AsyncClient.__dict__:
-                        setattr(AsyncClient, "__del__", lambda self: run_async(self.aclose()))
+                       setattr(AsyncClient, "__del__", lambda self: run_async(self.aclose()))
                     def async_stream(
                         method, 
                         url, 

{python_httpfile-0.0.4.1 → python_httpfile-0.0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-httpfile"
-version = "0.0.4.1"
+version = "0.0.4.3"
 description = "Python httpfile."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"