python-httpfile 0.0.1.2__py3-none-any.whl → 0.0.2__py3-none-any.whl

httpfile/__init__.py

@@ -2,8 +2,8 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 1)
-__all__ = ["HTTPFileReader", "RequestsFileReader"]
+__version__ = (0, 0, 2)
+__all__ = ["HTTPFileReader", "AsyncHTTPFileReader"]
 
 import errno
 
@@ -19,12 +19,8 @@ from typing import Any, BinaryIO, IO, Optional, Protocol, Self, TypeVar
 from types import MappingProxyType
 from warnings import warn
 
-from aiohttp import ClientSession
-from filewrap import bio_skip_iter
 from http_response import get_filename, get_length, get_range, get_total_length, is_chunked, is_range_request
-from iterutils import through
 from property import funcproperty
-from requests import Session
 from urlopen import urlopen
 
 
@@ -107,6 +103,18 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             headers["Range"] = f"bytes={start}-"
         elif start < 0:
             headers["Range"] = f"bytes={start}"
+        if callable(url):
+            geturl = url
+            def url():
+                url = geturl()
+                headers_extra = getattr(url, "headers")
+                if headers_extra:
+                    headers.update(headers_extra)
+                return url
+        elif hasattr(url, "headers"):
+            headers_extra = getattr(url, "headers")
+            if headers_extra:
+                headers.update(headers_extra)
         response = urlopen(url() if callable(url) else url, headers=headers)
         if start:
             rng = get_range(response)
@@ -166,8 +174,9 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         self.__dict__["start"] += delta
 
     def close(self, /):
-        self.response.close()
-        self.__dict__["closed"] = True
+        if not self.closed:
+            self.response.close()
+            self.__dict__["closed"] = True
 
     @funcproperty
     def closed(self, /):
@@ -216,7 +225,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
     def readinto(self, buffer, /) -> int:
         if self.closed:
             raise ValueError("I/O operation on closed file.")
-        if not self.chunked and self.tell() >= self.length:
+        if not buffer or not self.chunked and self.tell() >= self.length:
             return 0
         if self.file.closed:
             self.reconnect()
@@ -293,8 +302,16 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             old_pos = self.tell()
             if old_pos == pos:
                 return pos
-            if pos > old_pos and pos - old_pos <= self.seek_threshold:
-                through(bio_skip_iter(self, pos - old_pos))
+            if pos > old_pos and (size := pos - old_pos) <= self.seek_threshold:
+                if size <= COPY_BUFSIZE:
+                    self.read(size)
+                else:
+                    buf = bytearray(COPY_BUFSIZE)
+                    readinto = self.readinto
+                    while size > COPY_BUFSIZE:
+                        readinto(buf)
+                        size -= COPY_BUFSIZE
+                    self.read(size)
             else:
                 self.reconnect(pos)
             return pos
@@ -369,43 +386,67 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             return buffer
 
 
-class RequestsFileReader(HTTPFileReader):
+try:
+    from requests import Session
+
+    class RequestsFileReader(HTTPFileReader):
+
+        def __init__(
+            self, 
+            /, 
+            url: str | Callable[[], str], 
+            headers: Optional[Mapping] = None, 
+            start: int = 0, 
+            seek_threshold: int = 1 << 20, 
+            urlopen: Callable = Session().get, 
+        ):
+            def urlopen_wrapper(url: str, headers: Optional[Mapping] = headers):
+                resp = urlopen(url, headers=headers, stream=True)
+                resp.raise_for_status()
+                return resp
+            super().__init__(
+                url, 
+                headers=headers, 
+                start=start, 
+                seek_threshold=seek_threshold, 
+                urlopen=urlopen_wrapper, 
+            )
 
-    def __init__(
-        self, 
-        /, 
-        url: str | Callable[[], str], 
-        headers: Optional[Mapping] = None, 
-        start: int = 0, 
-        seek_threshold: int = 1 << 20, 
-        urlopen: Callable = Session().get, 
-    ):
-        def urlopen_wrapper(url: str, headers: Optional[Mapping] = headers):
-            resp = urlopen(url, headers=headers, stream=True)
-            resp.raise_for_status()
-            return resp
-        super().__init__(
-            url, 
-            headers=headers, 
-            start=start, 
-            seek_threshold=seek_threshold, 
-            urlopen=urlopen_wrapper, 
-        )
+        def _add_start(self, delta: int, /):
+            pass
 
-    def _add_start(self, delta: int, /):
-        pass
+        @funcproperty
+        def file(self, /) -> BinaryIO:
+            return self.response.raw
 
-    @funcproperty
-    def file(self, /) -> BinaryIO:
-        return self.response.raw
+        def tell(self, /) -> int:
+            start = self.start
+            if start >= self.length:
+                return start
+            return start + self.file.tell()
 
-    def tell(self, /) -> int:
-        start = self.start
-        if start >= self.length:
-            return start
-        return start + self.file.tell()
+    __all__.append("RequestsFileReader")
+except ImportError:
+    pass
+
+
+try:
+    from aiohttp import ClientSession
+
+    ...
+except ImportError:
+    pass
+
+
+try:
+    from httpx import Client, AsyncClient
+
+    ...
+except ImportError:
+    pass
 
 
+# TODO: 实现 AsyncHTTPFileReader
 # TODO: 支持异步文件，使用 aiohttp，参考 aiofiles 的接口实现
 # TODO: 设计实现一个 HTTPFileWriter，用于实现上传，关闭后视为上传完成
 

{python_httpfile-0.0.1.2.dist-info → python_httpfile-0.0.2.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: python-httpfile
-Version: 0.0.1.2
-Summary: Python httpfile classes.
+Version: 0.0.2
+Summary: Python httpfile.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-httpfile
 License: MIT
 Keywords: http,file,wrapper
@@ -21,17 +21,13 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: aiohttp
 Requires-Dist: http_response
-Requires-Dist: python-filewrap
-Requires-Dist: python-iterutils
 Requires-Dist: python-property
 Requires-Dist: python-urlopen
-Requires-Dist: requests
 Project-URL: Repository, https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-httpfile
 Description-Content-Type: text/markdown
 
-# Python httpfile classes.
+# Python httpfile.
 
 ## Installation
 

python_httpfile-0.0.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+httpfile/__init__.py,sha256=cZZjfftX2nWqEZQ0jjDnrTOW2NLbfnQy8ZEnP52y_tY,13427
+httpfile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_httpfile-0.0.2.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_httpfile-0.0.2.dist-info/METADATA,sha256=-hanQvHDGCiX4-fYjubZmioS7o3nAnGPtSkF47eEXr0,1414
+python_httpfile-0.0.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+python_httpfile-0.0.2.dist-info/RECORD,,

python_httpfile-0.0.1.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-httpfile/__init__.py,sha256=QMeil_PlioH8MCXWfK4Pty5hJEPFryrkjXTAy_t2anE,12317
-httpfile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_httpfile-0.0.1.2.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_httpfile-0.0.1.2.dist-info/METADATA,sha256=mRCnDifm57cPKclZ4pF9B7g2Xc1naxBCfJzeU0sZF3Q,1542
-python_httpfile-0.0.1.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-python_httpfile-0.0.1.2.dist-info/RECORD,,