pybase16384 0.3.7__cp39-cp39-macosx_10_9_universal2.whl → 0.3.8__cp39-cp39-macosx_10_9_universal2.whl

pybase16384/backends/cython/_core.pyx

@@ -1,24 +1,29 @@
 # cython: language_level=3
 # cython: cdivision=True
-from cpython.bytes cimport PyBytes_AS_STRING, PyBytes_Check, PyBytes_Size
+from cpython.bytes cimport (PyBytes_AS_STRING, PyBytes_Check,
+                            PyBytes_FromStringAndSize, PyBytes_GET_SIZE)
 from cpython.mem cimport PyMem_Free, PyMem_Malloc
-from cpython.object cimport PyObject_HasAttrString
+from cpython.object cimport PyObject, PyObject_HasAttrString
 from libc.stdint cimport int32_t, uint8_t
+from libc.string cimport memcpy
 
 from pybase16384.backends.cython.base16384 cimport (
     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_decode_len, b14_decode_safe, b14_decode_stream,
+    b14_decode_stream_detailed, b14_encode, b14_encode_fd,
     b14_encode_fd_detailed, b14_encode_file, b14_encode_file_detailed,
-    b14_encode_len, b14_encode_safe, base16384_err_fopen_input_file,
+    b14_encode_len, b14_encode_safe, b14_encode_stream,
+    b14_encode_stream_detailed, 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,
     base16384_err_map_input_file, base16384_err_ok,
     base16384_err_open_input_file, base16384_err_read_file, base16384_err_t,
-    base16384_err_write_file, pybase16384_64bits)
+    base16384_err_write_file, base16384_io_function_t, base16384_stream_t,
+    pybase16384_64bits)
 
 from pathlib import Path
 
@@ -189,7 +194,7 @@ def encode_file(object input,
                 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)
+            size = PyBytes_GET_SIZE(chunk)
             if <int32_t> size < current_buf_len:  # 数据不够了 要减小一次读取的量
                 if buf_rate > 1:  # 重新设置一次读取的大小 重新设置流的位置 当然要是已经是一次读取7字节了 那就不能再变小了 直接encode吧
                     buf_rate = buf_rate / 2
@@ -236,7 +241,7 @@ def encode_file_safe(object input,
                 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)
+            size = PyBytes_GET_SIZE(chunk)
             if <int32_t> size < current_buf_len:  # 数据不够了 要减小一次读取的量
                 if buf_rate > 1:  # 重新设置一次读取的大小 重新设置流的位置 当然要是已经是一次读取7字节了 那就不能再变小了 直接encode吧
                     buf_rate = buf_rate / 2
@@ -281,7 +286,7 @@ def decode_file(object input,
     try:
         while True:
             chunk = input.read(current_buf_len)  # 8的倍数
-            size = PyBytes_Size(chunk)
+            size = PyBytes_GET_SIZE(chunk)
             if size == 0:
                 break
             if <int32_t> size < current_buf_len:  # 长度不够了
@@ -291,7 +296,7 @@ def decode_file(object input,
                     input.seek(-size, 1)
                     continue
             tmp = input.read(2)  # type: bytes
-            if PyBytes_Size(tmp) == 2:
+            if PyBytes_GET_SIZE(tmp) == 2:
                 if tmp[0] == 61:  # = stream完了   一次解码8n+2个字节
                     chunk += tmp
                     size += 2
@@ -333,7 +338,7 @@ def decode_file_safe(object input,
     try:
         while True:
             chunk = input.read(current_buf_len)  # 8的倍数
-            size = PyBytes_Size(chunk)
+            size = PyBytes_GET_SIZE(chunk)
             if size == 0:
                 break
             if <int32_t> size < current_buf_len:  # 长度不够了
@@ -343,7 +348,7 @@ def decode_file_safe(object input,
                     input.seek(-size, 1)
                     continue
             tmp = input.read(2)  # type: bytes
-            if PyBytes_Size(tmp) == 2:
+            if PyBytes_GET_SIZE(tmp) == 2:
                 if tmp[0] == 61:  # = stream完了   一次解码8n+2个字节
                     chunk += tmp
                     size += 2
@@ -541,3 +546,74 @@ cpdef inline decode_fd_detailed(int inp, int out, int flag):
     finally:
         PyMem_Free(encbuf)
         PyMem_Free(decbuf)
+
+# stream
+cdef ssize_t b14_readcallback(const void *client_data, void *buffer, size_t count) except -100  with gil:
+    cdef object file = <object>client_data
+    cdef bytes data = file.read(count)
+    cdef char* data_ptr = PyBytes_AS_STRING(data)
+    cdef ssize_t data_size = <ssize_t>PyBytes_GET_SIZE(data)
+    memcpy(buffer, data_ptr, <size_t>data_size)
+    return data_size
+
+cdef ssize_t b14_writecallback(const void *client_data, const void *buffer, size_t count) except -100 with gil:
+    cdef object file = <object>client_data
+    cdef bytes data = PyBytes_FromStringAndSize(<char*>buffer, <Py_ssize_t>count)
+    cdef ssize_t ret = <ssize_t>file.write(data)
+    return ret
+
+cpdef inline encode_stream_detailed(object inp, object out, int flag):
+    cdef char * encbuf = <char *> PyMem_Malloc(<size_t> BASE16384_ENCBUFSZ)
+    if encbuf == NULL:
+        raise MemoryError
+    cdef char * decbuf = <char *> PyMem_Malloc(<size_t> BASE16384_DECBUFSZ)
+    if decbuf == NULL:
+        PyMem_Free(encbuf)
+        raise MemoryError
+
+    cdef base16384_err_t ret
+
+    cdef base16384_stream_t inpstream = base16384_stream_t(f=base16384_io_function_t(reader=b14_readcallback),
+                                                           client_data=<void *> inp)
+    # inpstream.f.reader = b14_readcallback
+    # inpstream.client_data = <const void*>inp
+
+    cdef base16384_stream_t outstream = base16384_stream_t(f=base16384_io_function_t(writer=b14_writecallback),
+                                                           client_data=<void *> out)
+    # outstream.f.writer = b14_writecallback
+    # outstream.client_data = <const void*>out
+    try:
+        with nogil:
+            ret = b14_encode_stream_detailed(&inpstream, &outstream, encbuf, decbuf, flag)
+        if ret != base16384_err_ok:
+            raise ValueError(err_to_str(ret))
+    finally:
+        PyMem_Free(encbuf)
+        PyMem_Free(decbuf)
+
+cpdef inline decode_stream_detailed(object inp, object out, int flag):
+    cdef char * encbuf = <char *> PyMem_Malloc(<size_t> BASE16384_ENCBUFSZ)
+    if encbuf == NULL:
+        raise MemoryError
+    cdef char * decbuf = <char *> PyMem_Malloc(<size_t> BASE16384_DECBUFSZ)
+    if decbuf == NULL:
+        PyMem_Free(encbuf)
+        raise MemoryError
+
+    cdef base16384_err_t ret
+
+    cdef base16384_stream_t inpstream = base16384_stream_t(f=base16384_io_function_t(reader=b14_readcallback),client_data= <void*>inp)
+    # inpstream.f.reader = b14_readcallback
+    # inpstream.client_data = <const void*>inp
+
+    cdef base16384_stream_t outstream = base16384_stream_t(f=base16384_io_function_t(writer=b14_writecallback),client_data= <void*>out)
+    # outstream.f.writer = b14_writecallback
+    # outstream.client_data = <const void*>out
+    try:
+        with nogil:
+            ret = b14_decode_stream_detailed(&inpstream, &outstream, encbuf, decbuf, flag)
+        if ret != base16384_err_ok:
+            raise ValueError(err_to_str(ret))
+    finally:
+        PyMem_Free(encbuf)
+        PyMem_Free(decbuf)

pybase16384/backends/cython/base16384.pxd

@@ -85,7 +85,22 @@ cdef extern from "base16384.h" nogil:
     # base16384_decode_fd_detailed decodes input fd to output fd.
     #    encbuf & decbuf must be no less than BASE16384_ENCBUFSZ & BASE16384_DECBUFSZ
     base16384_err_t b14_decode_fd_detailed "base16384_decode_fd_detailed" (int input, int output, char* encbuf, char* decbuf, int flag)
-
+    # stream
+    ctypedef ssize_t (*base16384_reader_t) (const void *client_data, void *buffer, size_t count) except -100
+    ctypedef ssize_t (*base16384_writer_t) (const void *client_data, const void *buffer, size_t count) except -100
+
+    ctypedef union base16384_io_function_t:
+        base16384_reader_t reader
+        base16384_writer_t writer
+
+    ctypedef struct base16384_stream_t:
+        base16384_io_function_t f
+        void* client_data
+
+    base16384_err_t b14_encode_stream "base16384_encode_stream"(base16384_stream_t* input, base16384_stream_t*  output, char* encbuf, char* decbuf)
+    base16384_err_t b14_encode_stream_detailed "base16384_encode_stream_detailed"(base16384_stream_t* input, base16384_stream_t*  output, char* encbuf, char* decbuf, int flag)
+    base16384_err_t b14_decode_stream "base16384_decode_stream"(base16384_stream_t* input, base16384_stream_t*  output, char* encbuf, char* decbuf)
+    base16384_err_t b14_decode_stream_detailed "base16384_decode_stream_detailed"(base16384_stream_t* input, base16384_stream_t*  output, char* encbuf, char* decbuf, int flag)
 
 cdef extern from * nogil:
     """

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pybase16384
-Version: 0.3.7
+Version: 0.3.8
 Summary: fast base16384 encode and decode
 Home-page: https://github.com/synodriver/pybase16384
 Author: synodriver
@@ -24,7 +24,18 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cffi (>=1.0.0)
+Requires-Dist: cffi>=1.0.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <h1 align="center"><i>✨ pybase16384 ✨ </i></h1>
 
@@ -149,6 +160,10 @@ def decode_from_string_safe(data: str) -> bytes: ...
 def decode_string(data: str) -> str: ...
 
 def decode_string_safe(data: str) -> str: ...
+
+def encode_stream_detailed(inp, out, flag: int): ...
+
+def decode_stream_detailed(inp, out, flag: int): ...
 ```
 - write_head将显式指明编码出的文本格式(utf16be)，以便文本编辑器(如记事本)能够正确渲染，一般在写入文件时使用。
 

pybase16384-0.3.8.dist-info/RECORD

@@ -0,0 +1,16 @@
+pybase16384/__init__.py,sha256=xDOQ59rGsfkEhlODtzpqltiJmvTOMYT0puEhW6w8DBo,4897
+pybase16384/backends/__init__.py,sha256=vdW_t1O2WNfdRmxDlEXRvTpyJj5ufKWAUsD2fbtku5g,55
+pybase16384/backends/cffi/build.py,sha256=NyTK_W4JKJbqtdAS0yZ0sxkQvLDE8npjOskWN1-YOqk,5824
+pybase16384/backends/cffi/__init__.py,sha256=oGen7JI3AMlvsCjM8xF4k6zBK2v_QqQ5UsrdMVtD_Zo,15970
+pybase16384/backends/cffi/_core.abi3.so,sha256=t5zvjFeo68fo2WMTMI2F9leH9WR8zITIx-rfkV3cimM,188768
+pybase16384/backends/cython/_core.c,sha256=Co0qxbDmNKtX39tTxGMB2Sh5zYdExvPFvUeGVq3X5C8,1558557
+pybase16384/backends/cython/__init__.py,sha256=iqaf2DeavB1x_LnQi949Qqkrn00KAwG9xJMPVUdnIB8,738
+pybase16384/backends/cython/base16384.pxd,sha256=HFGuEe2rXBWYw1vx74uaI7YATtkRGpcUAjANMRxPRFA,5942
+pybase16384/backends/cython/_core.abi3.so,sha256=lm3uGCv_VxT8zgg8FzO_gEnVkJ--gd_OxnY2HWQokzI,527840
+pybase16384/backends/cython/_core.pyx,sha256=OcY07Gk5n-9snqRCFrVTU-WhI8k1yiD6zcutRD5G1Dk,25159
+pybase16384/backends/cython/_core.pxi,sha256=2fXuRiumLqxO0bnmZVEz0lr_GX-grJGBfhGIVedfyt8,530
+pybase16384-0.3.8.dist-info/RECORD,,
+pybase16384-0.3.8.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+pybase16384-0.3.8.dist-info/WHEEL,sha256=WwXsMctN3PTYNjsKqwUSvPchw2tnl4FqfTsIm7Wfyp8,112
+pybase16384-0.3.8.dist-info/top_level.txt,sha256=kXpl7pWjnjpm74qJP0SJg3JhbiWuwKQApJgkJH0B5Mk,12
+pybase16384-0.3.8.dist-info/METADATA,sha256=HKwiEO0_m8J4u1QmjLLz1c2j2ymgAgh4eNZJ58t_frA,6836

{pybase16384-0.3.7.dist-info → pybase16384-0.3.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: false
 Tag: cp39-cp39-macosx_10_9_universal2
 

pybase16384-0.3.7.dist-info/RECORD

@@ -1,16 +0,0 @@
-pybase16384-0.3.7.dist-info/RECORD,,
-pybase16384-0.3.7.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-pybase16384-0.3.7.dist-info/WHEEL,sha256=1a9Ko9a-gG650SIesHUh7EtH5_pEhiq-7Cid2T8u5h0,113
-pybase16384-0.3.7.dist-info/top_level.txt,sha256=kXpl7pWjnjpm74qJP0SJg3JhbiWuwKQApJgkJH0B5Mk,12
-pybase16384-0.3.7.dist-info/METADATA,sha256=t825ZkNAE5A1iDixOyZMIslruzLo4skUHaS7VcFauwY,6499
-pybase16384/__init__.py,sha256=iPZOUFmVvcd6syd2zK7MHEcw8c4OksXMEnZX3m8dXrw,4769
-pybase16384/backends/__init__.py,sha256=vdW_t1O2WNfdRmxDlEXRvTpyJj5ufKWAUsD2fbtku5g,55
-pybase16384/backends/cffi/build.py,sha256=uoF5uBdRbIsWw6TxBcdpvDy9HxgfrG7KukLuLb44tXk,4548
-pybase16384/backends/cffi/__init__.py,sha256=AJbC3SW14ojHLtrkyCSaVVQ-ScfRxOiCFVQSVgQi2F8,14058
-pybase16384/backends/cffi/_core.abi3.so,sha256=oxs2xO0kqtkukA-ZuMVAyWc9Tmk1SHVTKFN8JDKs6iM,154848
-pybase16384/backends/cython/_core.c,sha256=6m0GPP27bApdrFuE9szniYP9ezBGOH7pwYISlLv7hTw,1538902
-pybase16384/backends/cython/__init__.py,sha256=4I6QVQclKorVEe4BlSx_9HfgDf9yTdHMU7w9-g-t6tU,681
-pybase16384/backends/cython/base16384.pxd,sha256=zZDthlWUJY_7hq4Fs2X3JcWJ_lcsh0Gce4nZ-ejG8dY,4843
-pybase16384/backends/cython/_core.abi3.so,sha256=Tlf7D-z1iOi4wxNXmbOOTAGnYqelSCy-EItYcvIac2A,558704
-pybase16384/backends/cython/_core.pyx,sha256=4zCEfDCLww4_0UvTkTbiQ0CyXqm91CnlTFdo1SOeu9M,21871
-pybase16384/backends/cython/_core.pxi,sha256=2fXuRiumLqxO0bnmZVEz0lr_GX-grJGBfhGIVedfyt8,530