rtzip 0.2.0__tar.gz → 0.2.1__tar.gz

{rtzip-0.2.0 → rtzip-0.2.1}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.4
 Name: rtzip
-Version: 0.2.0
+Version: 0.2.1
 Requires-Python: >=3.12
 Requires-Dist: obstruct==0.5.2

rtzip-0.2.1/README.md

@@ -0,0 +1,18 @@
+# Rtzip
+_一个以最小的数据量提取远程 zip 文件内容的库_
+
+
+## 特点
+- 不与任何 HTTP 库耦合
+- 依赖简单（只有用于解析二进制结构的 `obstruct`）
+- 兼容标准 zip 格式、ZIP64 扩展
+
+
+## 安装
+```commandline
+pip install rtzip
+```
+
+> [!TIP]
+> 本库无计划新功能，若是让自行添加功能，可克隆仓库并重写 `rtzip/remotezip.py` 下的代码
+> 大多数库的功能已完成并可以直接投入使用

{rtzip-0.2.0 → rtzip-0.2.1}/pyproject.toml

@@ -1,7 +1,12 @@
 [project]
 name = "rtzip"
-version = "0.2.0"
+version = "0.2.1"
 requires-python = ">=3.12"
 dependencies = [
     "obstruct==0.5.2",
 ]
+
+[dependency-groups]
+dev = [
+    "niquests>=3.21.0",
+]

{rtzip-0.2.0 → rtzip-0.2.1}/src/rtzip/__init__.py

@@ -1,3 +1,3 @@
 from .models import EOCD, Zip64EOCD, CDEntry
 from .errors import *
-from .remotezip import RemoteZip
+from .remotezip import RemoteZip, DataSourceCallbacks

{rtzip-0.2.0 → rtzip-0.2.1}/src/rtzip/const.py

@@ -1,5 +1,5 @@
 EOCD_SIGNATURE = b'PK\x05\x06'
-CDENTITY_SIGNATURE = b'PK\x01\x02'
+CDENTRY_SIGNATURE = b'PK\x01\x02'
 LFH_SIGNATURE = b'PK\x03\x04'
 ZIP64_EOCD_LOCATOR_SIGNATURE = b'PK\x06\x07'
 ZIP64_EOCD_SIGNATURE = b'PK\x06\x06'

{rtzip-0.2.0 → rtzip-0.2.1}/src/rtzip/models.py

@@ -5,6 +5,8 @@ from typing import Annotated, Self
 
 import obstruct as obs
 
+from rtzip.utils import exactly_get_slice
+
 EXTRA_FIELD_HEADER = struct.Struct("<HH")
 
 
@@ -245,13 +247,13 @@ class CDEntry(obs.Struct):
         filename_len, extra_len, comment_len = self.filename_len, self.extra_len, self.comment_len
 
         pos = offset + header_size
-        filename = bytes(buffer[pos: pos + filename_len])
+        filename = bytes(exactly_get_slice(buffer, pos, filename_len))
         pos += filename_len
 
-        extra_attrs = buffer[pos: pos + extra_len].tobytes()
+        extra_attrs = bytes(exactly_get_slice(buffer, pos, extra_len))
         pos += extra_len
 
-        comment = buffer[pos: pos + comment_len].tobytes()
+        comment = bytes(exactly_get_slice(buffer, pos, comment_len))
         pos += comment_len
 
         self.filename = filename

{rtzip-0.2.0 → rtzip-0.2.1}/src/rtzip/remotezip.py

@@ -1,11 +1,11 @@
 import struct
 from typing import AsyncGenerator
 
+from .const import *
 from .errors import UnsupportedAlgorithmError, UnsupportedCryptoError, UnsupportedDataDescriptorError
 from .models import EOCD, Zip64EOCD, CDEntry, LocalFileHeader
 from .utils import deflate_wrapper, single_chunk_wrapper
 
-from .const import *
 
 
 class DataSourceCallbacks:
@@ -18,7 +18,7 @@ class DataSourceCallbacks:
         :return: bytes | bytearray | memoryview
         """
 
-    def read_range_stream(self, offset, length) -> AsyncGenerator[bytes | bytearray | memoryview]:
+    def read_range_stream(self, offset, length) -> AsyncGenerator[bytes | bytearray | memoryview, None]:
         """
         流式读取时指定的一段数据
 
@@ -48,6 +48,7 @@ class RemoteZip:
     :ivar file_mapping: 构建的文件映射表，可能为 None
     :ivar is_zip64: 此 zip 文件是否启动了 zip64 扩展，默认为 False
     """
+
     async def _read_range(self, offset, length):
         return await self.source.read_range(offset, length)
 
@@ -78,6 +79,7 @@ class RemoteZip:
         chunk_size = initial_chunk
 
         last_start = await self._get_total_size()
+        # print("File Size:", last_start)
         cnt = 0
 
         buffer = b''
@@ -174,6 +176,8 @@ class RemoteZip:
             nonlocal buffer
             entry, nbytes = CDEntry.from_buffer(buffer)
 
+            # print(f'{len(files) + 1:03} Get Entry', entry)
+
             if self.is_zip64:
                 entry.fix_by_zip64()
 
@@ -181,13 +185,14 @@ class RemoteZip:
             buffer = buffer[nbytes + 4:]
 
         async for chunk in self._read_range_stream(eocd.cd_offset, eocd.cd_size):
+            # print("Read Chunk", len(chunk))
             # print(chunk)
             buffer.extend(chunk)
 
-            while buffer and buffer[:4] == CDENTITY_SIGNATURE:
+            while buffer and buffer[:4] == CDENTRY_SIGNATURE:
                 try:
                     consume_entry()
-                except struct.error:
+                except (struct.error, AssertionError):
                     continue
 
         if buffer and not ignore_extra:

{rtzip-0.2.0 → rtzip-0.2.1}/src/rtzip/utils.py

@@ -13,3 +13,9 @@ async def deflate_wrapper(gen):
 
 async def single_chunk_wrapper(data: Buffer):
     yield data
+
+
+def exactly_get_slice(__obj, __offset, __length):
+    result = __obj[__offset:__offset + __length]
+    assert len(result) == __length
+    return result

{rtzip-0.2.0 → rtzip-0.2.1}/src/rtzip.egg-info/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.4
 Name: rtzip
-Version: 0.2.0
+Version: 0.2.1
 Requires-Python: >=3.12
 Requires-Dist: obstruct==0.5.2

{rtzip-0.2.0 → rtzip-0.2.1}/src/rtzip.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+README.md
 pyproject.toml
 src/rtzip/__init__.py
 src/rtzip/const.py