python-httpfile 0.0.4__py3-none-any.whl → 0.0.4.1__py3-none-any.whl

httpfile/__init__.py

@@ -253,7 +253,16 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             return 0
         if self.file_closed:
             self.reconnect()
-        size = self.file.readinto(buffer)
+        try:
+            readinto = self.file.readinto
+        except AttributeError:
+            read = self.file.read
+            def readinto(buffer, /):
+                data = read(len(buffer))
+                size = len(data)
+                buffer[:size] = data
+                return data
+        size = readinto(buffer)
         if size:
             self._add_start(size)
         return size
@@ -265,6 +274,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             return b""
         if self.file_closed:
             self.reconnect()
+        # TODO: if no readline method, give a default impl
         if size is None or size < 0:
             data = self.file.readline()
         else:
@@ -280,6 +290,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             return []
         if self.file_closed:
             self.reconnect()
+        # TODO: if no readlines method, give a default impl
         ls = self.file.readlines(hint)
         if ls:
             self._add_start(sum(map(len, ls)))
@@ -520,7 +531,7 @@ class AsyncHTTPFileReader(HTTPFileReader):
         headers: None | Mapping = None, 
         start: int = 0, 
         seek_threshold: int = 1 << 20, 
-        urlopen = urlopen, 
+        urlopen = None, 
     ):
         run_async(self.__ainit__(
             url=url, 
@@ -631,10 +642,11 @@ class AsyncHTTPFileReader(HTTPFileReader):
             return b""
         if self.file_closed:
             await self.reconnect()
+        read = ensure_async(self.file.read, threaded=True)
         if size is None or size < 0:
-            data = await ensure_async(self.file.read, threaded=True)()
+            data = await read(-1)
         else:
-            data = await ensure_async(self.file.read, threaded=True)(size)
+            data = await read(size)
         if data:
             self._add_start(len(data))
         return data
@@ -646,7 +658,16 @@ class AsyncHTTPFileReader(HTTPFileReader):
             return 0
         if self.file_closed:
             await self.reconnect()
-        size = await ensure_async(self.file.readinto, threaded=True)(buffer)
+        try:
+            readinto = ensure_async(self.file.readinto, threaded=True)
+        except AttributeError:
+            read = ensure_async(self.file.read, threaded=True)
+            async def readinto(buffer, /):
+                data = await read(len(buffer))
+                size = len(data)
+                buffer[:size] = data
+                return size
+        size = await readinto(buffer)
         if size:
             self._add_start(size)
         return size
@@ -658,6 +679,7 @@ class AsyncHTTPFileReader(HTTPFileReader):
             return b""
         if self.file_closed:
             await self.reconnect()
+        # TODO: if no readline method, give a default impl
         if size is None or size < 0:
             data = await ensure_async(self.file.readline, threaded=True)()
         else:
@@ -673,6 +695,7 @@ class AsyncHTTPFileReader(HTTPFileReader):
             return []
         if self.file_closed:
             await self.reconnect()
+        # TODO: if no readlines method, give a default impl
         ls = await ensure_async(self.file.readlines, threaded=True)(hint)
         if ls:
             self._add_start(sum(map(len, ls)))
@@ -1197,4 +1220,5 @@ if find_spec("httpx"):
     __all__.append("HttpxFileReader")
     __all__.append("AsyncHttpxFileReader")
 
+# TODO: 增加 blacksheep 的 HTTPFileReader
 # TODO: 设计实现一个 HTTPFileWriter，用于实现上传，关闭后视为上传完成

{python_httpfile-0.0.4.dist-info → python_httpfile-0.0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-httpfile
-Version: 0.0.4
+Version: 0.0.4.1
 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.dist-info/RECORD

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+httpfile/__init__.py,sha256=ffww3j6Gk2dFLSy18a1PlRlT-yez5V857HbZp080Bxs,39533
+httpfile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_httpfile-0.0.4.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_httpfile-0.0.4.1.dist-info/METADATA,sha256=XreyhqBNvwXua7uaRsVBHkf88xLuhhi2Vmd4UAe5eEk,1522
+python_httpfile-0.0.4.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+python_httpfile-0.0.4.1.dist-info/RECORD,,

python_httpfile-0.0.4.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-httpfile/__init__.py,sha256=PAqvhrEAfTEzVSZ7wbLrPplYX-8G1epkW7MZt2sWWaw,38657
-httpfile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_httpfile-0.0.4.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_httpfile-0.0.4.dist-info/METADATA,sha256=1CtTQ_EoeIP9eVYlevzlEBdA9D26S9pHfZmdTOnXB0Q,1520
-python_httpfile-0.0.4.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-python_httpfile-0.0.4.dist-info/RECORD,,