python-httpfile 0.0.1.3__py3-none-any.whl → 0.0.2.1__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,7 +19,6 @@ from typing import Any, BinaryIO, IO, Optional, Protocol, Self, TypeVar
 from types import MappingProxyType
 from warnings import warn
 
-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 property import funcproperty
 from urlopen import urlopen
@@ -175,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, /):
@@ -186,8 +186,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
     def file(self, /) -> BinaryIO:
         return self.response
 
-    @funcproperty
-    def fileno(self, /):
+    def fileno(self, /) -> int:
         return self.file.fileno()
 
     def flush(self, /):
@@ -225,7 +224,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()
@@ -302,9 +301,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:
-                for _ in bio_skip_iter(self, pos - old_pos):
-                    pass
+            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
@@ -378,6 +384,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         else:
             return buffer
 
+
 try:
     from requests import Session
 
@@ -416,6 +423,7 @@ try:
             if start >= self.length:
                 return start
             return start + self.file.tell()
+
     __all__.append("RequestsFileReader")
 except ImportError:
     pass
@@ -437,6 +445,7 @@ except ImportError:
     pass
 
 
+# TODO: 实现 AsyncHTTPFileReader
 # TODO: 支持异步文件，使用 aiohttp，参考 aiofiles 的接口实现
 # TODO: 设计实现一个 HTTPFileWriter，用于实现上传，关闭后视为上传完成
 

{python_httpfile-0.0.1.3.dist-info → python_httpfile-0.0.2.1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: python-httpfile
-Version: 0.0.1.3
-Summary: Python httpfile classes.
+Version: 0.0.2.1
+Summary: Python httpfile.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-httpfile
 License: MIT
 Keywords: http,file,wrapper
@@ -22,13 +22,12 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: http_response
-Requires-Dist: python-filewrap
 Requires-Dist: python-property
 Requires-Dist: python-urlopen
 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.1.dist-info/RECORD

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+httpfile/__init__.py,sha256=9qTmQOShcWtnLtIsqL3NbIeH9M2tAWE9NquEjyFs9ZM,13416
+httpfile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_httpfile-0.0.2.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_httpfile-0.0.2.1.dist-info/METADATA,sha256=tKxwg73IETWHCmf-F7--YKrQtlgn15r4iUxA7BzDkqQ,1416
+python_httpfile-0.0.2.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+python_httpfile-0.0.2.1.dist-info/RECORD,,

python_httpfile-0.0.1.3.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-httpfile/__init__.py,sha256=HB4QguYNM1Jri_2ZIkERW9LN6-BXS4ZnLKf7F06aQkg,13090
-httpfile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_httpfile-0.0.1.3.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_httpfile-0.0.1.3.dist-info/METADATA,sha256=2OM3725fbgLkcH7ZgWXXI0uRwAY1H1RdYag7Ng5KRR4,1463
-python_httpfile-0.0.1.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-python_httpfile-0.0.1.3.dist-info/RECORD,,