pybase16384 0.3.6__cp310-cp310-win_amd64.whl → 0.3.7__cp310-cp310-win_amd64.whl

pybase16384/backends/cython/_core.pyx

@@ -6,12 +6,13 @@ from cpython.object cimport PyObject_HasAttrString
 from libc.stdint cimport int32_t, uint8_t
 
 from pybase16384.backends.cython.base16384 cimport (
-    BASE16384_DECBUFSZ, BASE16384_ENCBUFSZ, BASE16384_FLAG_NOHEADER,
-    BASE16384_FLAG_SUM_CHECK_ON_REMAIN, BASE16384_SIMPLE_SUM_INIT_VALUE,
-    b14_decode, b14_decode_fd, b14_decode_fd_detailed, b14_decode_file,
-    b14_decode_file_detailed, b14_decode_len, b14_encode, b14_encode_fd,
+    BASE16384_DECBUFSZ, BASE16384_ENCBUFSZ,
+    BASE16384_FLAG_DO_SUM_CHECK_FORCELY, BASE16384_FLAG_NOHEADER,
+    BASE16384_FLAG_SUM_CHECK_ON_REMAIN, b14_decode, b14_decode_fd,
+    b14_decode_fd_detailed, b14_decode_file, b14_decode_file_detailed,
+    b14_decode_len, b14_decode_safe, b14_encode, b14_encode_fd,
     b14_encode_fd_detailed, b14_encode_file, b14_encode_file_detailed,
-    b14_encode_len, base16384_err_fopen_input_file,
+    b14_encode_len, b14_encode_safe, base16384_err_fopen_input_file,
     base16384_err_fopen_output_file, base16384_err_get_file_size,
     base16384_err_invalid_commandline_parameter,
     base16384_err_invalid_decoding_checksum, base16384_err_invalid_file_name,
@@ -25,7 +26,7 @@ ENCBUFSZ = BASE16384_ENCBUFSZ
 DECBUFSZ = BASE16384_DECBUFSZ
 FLAG_NOHEADER = BASE16384_FLAG_NOHEADER
 FLAG_SUM_CHECK_ON_REMAIN = BASE16384_FLAG_SUM_CHECK_ON_REMAIN
-SIMPLE_SUM_INIT_VALUE = BASE16384_SIMPLE_SUM_INIT_VALUE
+FLAG_DO_SUM_CHECK_FORCELY = BASE16384_FLAG_DO_SUM_CHECK_FORCELY
 
 cdef inline bytes ensure_bytes(object inp):
     if isinstance(inp, unicode):
@@ -65,6 +66,22 @@ cpdef inline bytes _encode(const uint8_t[::1] data):
     finally:
         PyMem_Free(output_buf)
 
+cpdef inline bytes _encode_safe(const uint8_t[::1] data):
+    cdef size_t length = data.shape[0]
+    cdef size_t output_size = <size_t> b14_encode_len(<int>length)
+    cdef char *output_buf = <char*>PyMem_Malloc(output_size)
+    if output_buf == NULL:
+        raise MemoryError
+    cdef int count
+    with nogil:
+        count = b14_encode_safe(<const char*> &data[0],
+                                        <int>length,
+                                        output_buf) # encode 整数倍的那个
+    try:
+        return <bytes>output_buf[:count]
+    finally:
+        PyMem_Free(output_buf)
+
 cpdef inline bytes _decode(const uint8_t[::1] data):
     cdef size_t length = data.shape[0]
     cdef size_t output_size = <size_t> b14_decode_len(<int>length, 0) + 16
@@ -81,6 +98,22 @@ cpdef inline bytes _decode(const uint8_t[::1] data):
     finally:
         PyMem_Free(output_buf)
 
+cpdef inline bytes _decode_safe(const uint8_t[::1] data):
+    cdef size_t length = data.shape[0]
+    cdef size_t output_size = <size_t> b14_decode_len(<int>length, 0)
+    cdef char *output_buf = <char *> PyMem_Malloc(output_size)
+    if output_buf == NULL:
+        raise MemoryError
+    cdef int count
+    with nogil:
+        count = b14_decode_safe(<const char *> &data[0],
+                                        <int> length,
+                                        output_buf)  # decode
+    try:
+        return <bytes> output_buf[:count]
+    finally:
+        PyMem_Free(output_buf)
+
 cpdef inline int _encode_into(const uint8_t[::1] data, uint8_t[::1] dest) except -1:
     cdef size_t input_size = data.shape[0]
     cdef size_t output_size = <size_t> b14_encode_len(<int> input_size)
@@ -92,6 +125,17 @@ cpdef inline int _encode_into(const uint8_t[::1] data, uint8_t[::1] dest) except
                                 <int> input_size,
                                 <char *> &dest[0])
 
+cpdef inline int _encode_into_safe(const uint8_t[::1] data, uint8_t[::1] dest) except -1:
+    cdef size_t input_size = data.shape[0]
+    cdef size_t output_size = <size_t> b14_encode_len(<int> input_size)
+    cdef size_t output_buf_size = dest.shape[0]
+    if output_buf_size < output_size:
+        raise ValueError("Buffer is too small to hold result")
+    with nogil:
+        return b14_encode_safe(<const char *> &data[0],
+                                <int> input_size,
+                                <char *> &dest[0])
+
 cpdef inline int _decode_into(const uint8_t[::1] data, uint8_t[::1] dest) except -1:
     cdef size_t input_size = data.shape[0]
     cdef size_t output_size = <size_t> b14_decode_len(<int> input_size, 0)
@@ -103,6 +147,16 @@ cpdef inline int _decode_into(const uint8_t[::1] data, uint8_t[::1] dest) except
                                 <int> input_size,
                                 <char *> &dest[0])
 
+cpdef inline int _decode_into_safe(const uint8_t[::1] data, uint8_t[::1] dest) except -1:
+    cdef size_t input_size = data.shape[0]
+    cdef size_t output_size = <size_t> b14_decode_len(<int> input_size, 0)
+    cdef size_t output_buf_size = dest.shape[0]
+    if output_buf_size < output_size:
+        raise ValueError("Buffer is too small to hold result")
+    with nogil:
+        return b14_decode_safe(<const char *> &data[0],
+                                <int> input_size,
+                                <char *> &dest[0])
 
 def encode_file(object input,
                        object output,
@@ -151,6 +205,53 @@ def encode_file(object input,
     finally:
         PyMem_Free(output_buf)
 
+def encode_file_safe(object input,
+                       object output,
+                       bint write_head = False,
+                       int32_t buf_rate = 10):
+    if not PyFile_Check(input):
+        raise TypeError("input except a file-like object, got %s" % type(input).__name__)
+    if not PyFile_Check(output):
+        raise TypeError("output except a file-like object, got %s" % type(output).__name__)
+    if buf_rate <= 0:
+        buf_rate = 1
+
+    if write_head:
+        output.write(b'\xfe\xff')
+
+    cdef int32_t current_buf_len = buf_rate * 7  # 一次读取这么多字节
+    cdef size_t output_size = <size_t> b14_encode_len(<int> current_buf_len) # 因为encode_len不是单调的 这16备用
+    cdef char *output_buf = <char *> PyMem_Malloc(output_size)
+    if output_buf == NULL:
+        raise MemoryError
+
+    cdef Py_ssize_t size
+    cdef uint8_t first_check = 1  # 检查一次就行了 怎么可能出现第一次读出来是bytes 以后又变卦了的对象呢 不会吧不会吧
+    cdef int count = 0
+    cdef const char *chunk_ptr
+    try:
+        while True:
+            chunk = input.read(current_buf_len)
+            if first_check:
+                first_check = 0
+                if not PyBytes_Check(chunk):
+                    raise TypeError(f"input must be a file-like rb object, got {type(input).__name__}")
+            size = PyBytes_Size(chunk)
+            if <int32_t> size < current_buf_len:  # 数据不够了 要减小一次读取的量
+                if buf_rate > 1:  # 重新设置一次读取的大小 重新设置流的位置 当然要是已经是一次读取7字节了 那就不能再变小了 直接encode吧
+                    buf_rate = buf_rate / 2
+                    current_buf_len = buf_rate * 7
+                    input.seek(-size, 1)
+                    continue
+            chunk_ptr = <const char*>PyBytes_AS_STRING(chunk)
+            with nogil:
+                count = b14_encode_safe(chunk_ptr, <int>size, output_buf)
+            output.write(<bytes>output_buf[:count])
+            if size < 7:
+                break
+    finally:
+        PyMem_Free(output_buf)
+
 def decode_file(object input,
                        object output,
                        int32_t buf_rate = 10):
@@ -203,6 +304,58 @@ def decode_file(object input,
     finally:
         PyMem_Free(output_buf)
 
+def decode_file_safe(object input,
+                       object output,
+                       int32_t buf_rate = 10):
+    if not PyFile_Check(input):
+        raise TypeError("input except a file-like object, got %s" % type(input).__name__)
+    if not PyFile_Check(output):
+        raise TypeError("output except a file-like object, got %s" % type(output).__name__)
+    if buf_rate <= 0:
+        buf_rate = 1
+
+    chunk = input.read(1)  # type: bytes
+    if not PyBytes_Check(chunk):
+        raise TypeError(f"input must be a file-like rb object, got {type(input).__name__}")
+    if chunk == b"\xfe":  # 去头
+        input.read(1)
+    else:
+        input.seek(0, 0)  # 没有头 回到开头
+
+    cdef int32_t current_buf_len = buf_rate * 8
+    cdef size_t output_size = <size_t> b14_decode_len(<int> current_buf_len, 0)
+    cdef char *output_buf = <char *> PyMem_Malloc(output_size)
+    if output_buf == NULL:
+        raise MemoryError
+    cdef Py_ssize_t size
+    cdef int count = 0
+    cdef const char *chunk_ptr
+    try:
+        while True:
+            chunk = input.read(current_buf_len)  # 8的倍数
+            size = PyBytes_Size(chunk)
+            if size == 0:
+                break
+            if <int32_t> size < current_buf_len:  # 长度不够了
+                if buf_rate > 1:  # 还能继续变小
+                    buf_rate = buf_rate / 2  # 重新设置一次读取的大小
+                    current_buf_len = buf_rate * 8
+                    input.seek(-size, 1)
+                    continue
+            tmp = input.read(2)  # type: bytes
+            if PyBytes_Size(tmp) == 2:
+                if tmp[0] == 61:  # = stream完了   一次解码8n+2个字节
+                    chunk += tmp
+                    size += 2
+                else:
+                    input.seek(-2, 1)
+            chunk_ptr = <const char *> PyBytes_AS_STRING(chunk)
+            with nogil:
+                count = b14_decode_safe(chunk_ptr, <int> size, output_buf)
+            output.write(<bytes>output_buf[:count])
+    finally:
+        PyMem_Free(output_buf)
+
 cpdef inline bint is_64bits() nogil:
     return pybase16384_64bits()
 

pybase16384/backends/cython/base16384.pxd

@@ -10,7 +10,7 @@ cdef extern from "base16384.h" nogil:
 
     int BASE16384_FLAG_NOHEADER
     int BASE16384_FLAG_SUM_CHECK_ON_REMAIN
-    int BASE16384_SIMPLE_SUM_INIT_VALUE
+    int BASE16384_FLAG_DO_SUM_CHECK_FORCELY
 
     ctypedef enum base16384_err_t:
         base16384_err_ok
@@ -29,11 +29,14 @@ cdef extern from "base16384.h" nogil:
 # decode_len calc min buf size to fill decode result
     int b14_decode_len "base16384_decode_len" (int dlen, int offset)
 
+    int b14_encode_safe "base16384_encode_safe" (const char * data, int dlen, char * buf)
 # encode data and write result into buf
     int b14_encode "base16384_encode" (const char* data, int dlen, char* buf)
 
     int b14_encode_unsafe "base16384_encode_unsafe" (const char * data, int dlen, char * buf)
 # decode data and write result into buf
+    int b14_decode_safe "base16384_decode_safe" (const char * data, int dlen, char * buf)
+
     int b14_decode "base16384_decode" (const char* data, int dlen, char* buf)
 
     int b14_decode_unsafe "base16384_decode_unsafe"(const char * data, int dlen, char * buf)
@@ -87,9 +90,9 @@ cdef extern from "base16384.h" nogil:
 cdef extern from * nogil:
     """
 #ifdef CPUBIT32
-#define pybase16384_64bits() 0
+#define pybase16384_64bits() (0)
 #else
-#define pybase16384_64bits() 1
+#define pybase16384_64bits() (1)
 #endif
     """
     int32_t pybase16384_64bits()

{pybase16384-0.3.6.dist-info → pybase16384-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybase16384
-Version: 0.3.6
+Version: 0.3.7
 Summary: fast base16384 encode and decode
 Home-page: https://github.com/synodriver/pybase16384
 Author: synodriver
@@ -78,37 +78,77 @@ for i in range(1):
 
 ### 公开函数
 ```python
+from typing import IO
+
 def encode_len(dlen: int) -> int: ...
 
 def decode_len(dlen: int, offset: int) -> int: ...
 
+ENCBUFSZ: int
+DECBUFSZ: int
+FLAG_NOHEADER: int
+FLAG_SUM_CHECK_ON_REMAIN: int
+FLAG_DO_SUM_CHECK_FORCELY: int
+
+def is_64bits() -> bool: ...
+
+def encode_file(input: IO, output: IO, write_head: bool = ..., buf_rate: int = ...): ...
+
+def encode_file_safe(input: IO, output: IO, write_head: bool = ..., buf_rate: int = ...): ...
+
+def decode_file(input: IO, output: IO, buf_rate: int = ...): ...
+
+def decode_file_safe(input: IO, output: IO, buf_rate: int = ...): ...
+
+def ensure_bytes(inp) -> bytes: ...
+
+def encode_local_file(inp, out) -> None: ...
+
+def decode_local_file(inp, out) -> None: ...
+
+def encode_fd(inp: int, out: int) -> None: ...
+
+def decode_fd(inp: int, out: int) -> None: ...
+
+def encode_local_file_detailed(inp, out, flag: int) -> None: ...
+
+def decode_local_file_detailed(inp, out, flag: int) -> None: ...
+
+def encode_fd_detailed(inp: int, out: int, flag: int) -> None: ...
+
+def decode_fd_detailed(inp: int, out: int, flag: int) -> None: ...
+
 def encode(data: bytes) -> bytes: ...
 
+def encode_safe(data: bytes) -> bytes: ...
+
 def decode(data: bytes) -> bytes: ...
 
-def decode_file(input: BinaryIO, output: BinaryIO, buf_rate: int = 10) -> None: ...
+def decode_safe(data: bytes) -> bytes: ...
 
-def encode_file(input: BinaryIO, output: BinaryIO, boolwrite_head: bool = False, buf_rate: int = 10) -> None: ...
+def encode_from_string(data: str, write_head: bool = ...) -> bytes: ...
 
-def encode_from_string(data: str, write_head: bool = False) -> bytes: ...
+def encode_from_string_safe(data: str, write_head: bool = ...) -> bytes: ...
 
 def encode_to_string(data: bytes) -> str: ...
 
+def encode_to_string_safe(data: bytes) -> str: ...
+
 def encode_string(data: str) -> str: ...
 
+def encode_string_safe(data: str) -> str: ...
+
 def decode_from_bytes(data: bytes) -> str: ...
 
-def decode_from_string(data: str) -> bytes: ...
+def decode_from_bytes_safe(data: bytes) -> str: ...
 
-def decode_string(data: str) -> str: ...
+def decode_from_string(data: str) -> bytes: ...
 
-def encode_local_file(inp: Union[str, bytes, Path], out: Union[str, bytes, Path], encsize: int, decsize: int) -> None: ...
+def decode_from_string_safe(data: str) -> bytes: ...
 
-def decode_local_file(inp: Union[str, bytes, Path], out: Union[str, bytes, Path], encsize: int, decsize: int) -> None: ...
+def decode_string(data: str) -> str: ...
 
-def encode_fd(inp: int, out: int) -> None: ...
-    
-def decode_fd(inp: int, out: int) -> None: ...
+def decode_string_safe(data: str) -> str: ...
 ```
 - write_head将显式指明编码出的文本格式(utf16be)，以便文本编辑器(如记事本)能够正确渲染，一般在写入文件时使用。
 
@@ -124,12 +164,20 @@ def decode_fd(inp: int, out: int) -> None: ...
 ```python
 def _encode(data: BufferProtocol) -> bytes: ...
 
+def _encode_safe(data: BufferProtocol) -> bytes: ...
+
 def _decode(data: BufferProtocol) -> bytes: ...
 
+def _decode_safe(data: BufferProtocol) -> bytes: ...
+
 def _encode_into(data: BufferProtocol, dest: BufferProtocol) -> int: ...
 
+def _encode_into_safe(data: BufferProtocol, dest: BufferProtocol) -> int: ...
+
 def _decode_into(data: BufferProtocol, dest: BufferProtocol) -> int: ...
 
+def _decode_into_safe(data: BufferProtocol, dest: BufferProtocol) -> int: ...
+
 def is_64bits() -> bool: ...
 ```
 - ```_decode```在解码```b'='```开头的数据时***不安全***：***解释器异常***

pybase16384-0.3.7.dist-info/RECORD

@@ -0,0 +1,16 @@
+pybase16384/__init__.py,sha256=I4fq10U7x38tDhMUUp_K_tzArZfRkU_4M8QvaIER5no,4970
+pybase16384/backends/__init__.py,sha256=9aG9WOI42Hcgaj9QGw99OIvKZTG-sYNlLBUctorc4Kg,56
+pybase16384/backends/cffi/__init__.py,sha256=4wLAqQkOhzMU06rHjiP3vsq4tLpA3BSE-ZRWIyXQISk,14451
+pybase16384/backends/cffi/_core.pyd,sha256=0M1oG6fBTzAk91gjWSzbvBIwwgUJQjmdJ5MycRHjt80,41472
+pybase16384/backends/cffi/build.py,sha256=m585-SvsiRrx4stB6C0nrl2NpLOvn-faTir86PSiEdc,4693
+pybase16384/backends/cython/__init__.py,sha256=sNk05eduO-ErnMqUjnES6X4KnWfdpcCQnd_EYAyFFCg,714
+pybase16384/backends/cython/_core.c,sha256=kn3l1f2RQOuSIMx9CnqGIdWrgOqkbs7cAWnAkxoU5Hc,1538911
+pybase16384/backends/cython/_core.pxi,sha256=SPgwG7QKofRYdJDRrhx2TWRvOuBuwTjRGg2WvGUrQw4,542
+pybase16384/backends/cython/_core.pyd,sha256=MkvjdEPK9Z4dYY7KyfBFKI9FBiSoOS277JM8GQCWSqE,214016
+pybase16384/backends/cython/_core.pyx,sha256=p4p59Yqlmo-_2bG0T-f_0yyjUIE9S4XgGF14q2OsF0U,22414
+pybase16384/backends/cython/base16384.pxd,sha256=6KgB5vEipJXw1v1nZPE3JgQapxDtO6yHoGz0FPP7JDE,4941
+pybase16384-0.3.7.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
+pybase16384-0.3.7.dist-info/METADATA,sha256=dUK9Dwj9bE6KH2tZGan1kv5KaaQnAKRztTYzK0UvUJs,6699
+pybase16384-0.3.7.dist-info/WHEEL,sha256=jrOhEbqKwvzRFSJcbYXlJCyVkgVdHg4_7__YHrdTUfw,102
+pybase16384-0.3.7.dist-info/top_level.txt,sha256=kXpl7pWjnjpm74qJP0SJg3JhbiWuwKQApJgkJH0B5Mk,12
+pybase16384-0.3.7.dist-info/RECORD,,

pybase16384-0.3.6.dist-info/RECORD

@@ -1,16 +0,0 @@
-pybase16384/__init__.py,sha256=ORhQHbG_JSqXq78YxjIaWxJpSzv84TVS7rgd2wQKpS0,3062
-pybase16384/backends/__init__.py,sha256=9aG9WOI42Hcgaj9QGw99OIvKZTG-sYNlLBUctorc4Kg,56
-pybase16384/backends/cffi/__init__.py,sha256=5Uk7Il3xmAkj9HxhbB1OdXE2Cslc0rDuIYcfDrLQcug,9774
-pybase16384/backends/cffi/_core.pyd,sha256=ujQz_cbPeV-XuWfXytpSI5LYwoLoIhBWfJ1ytF7qN1o,37888
-pybase16384/backends/cffi/build.py,sha256=DXOVlPcnnjNFt11n3TSeiMd5OUbdcm3bbylDQppy-mo,4539
-pybase16384/backends/cython/__init__.py,sha256=b3qH9k-e72aqwxdZHfR-PipQNzvBFGWq9uiX6v_PfuI,578
-pybase16384/backends/cython/_core.c,sha256=7WXWJg1wJV3E7rMLUsfmSFPdNW7zvMJ6uic7H_zEiTM,1393181
-pybase16384/backends/cython/_core.pxi,sha256=SPgwG7QKofRYdJDRrhx2TWRvOuBuwTjRGg2WvGUrQw4,542
-pybase16384/backends/cython/_core.pyd,sha256=BHSQmY7YllltbcCYFYGKqjHy4NqytsMeyfM2nmSrxXU,190976
-pybase16384/backends/cython/_core.pyx,sha256=mWb4dr-hEjp1QPI37mU_lyJyUohHYxacCPyPbmAjP5U,15765
-pybase16384/backends/cython/base16384.pxd,sha256=ZIOMla80PKuWAIUZIFsJh4b7rzjfHxxaa-VEQ9CQe5E,4749
-pybase16384-0.3.6.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
-pybase16384-0.3.6.dist-info/METADATA,sha256=ASRzCwkCUBoHKlPqlv1GT5P1dNjhILV4Yetdp4oM_w8,5539
-pybase16384-0.3.6.dist-info/WHEEL,sha256=jrOhEbqKwvzRFSJcbYXlJCyVkgVdHg4_7__YHrdTUfw,102
-pybase16384-0.3.6.dist-info/top_level.txt,sha256=kXpl7pWjnjpm74qJP0SJg3JhbiWuwKQApJgkJH0B5Mk,12
-pybase16384-0.3.6.dist-info/RECORD,,