pybase16384 0.3.7__cp310-cp310-macosx_10_9_x86_64.whl → 0.3.8__cp310-cp310-macosx_10_9_x86_64.whl

pybase16384/__init__.py

@@ -37,6 +37,7 @@ if not _should_use_cffi():
         decode_len,
         decode_local_file,
         decode_local_file_detailed,
+        decode_stream_detailed,
         encode_fd,
         encode_fd_detailed,
         encode_file,
@@ -44,6 +45,7 @@ if not _should_use_cffi():
         encode_len,
         encode_local_file,
         encode_local_file_detailed,
+        encode_stream_detailed,
         is_64bits,
     )
 else:
@@ -68,6 +70,7 @@ else:
         decode_len,
         decode_local_file,
         decode_local_file_detailed,
+        decode_stream_detailed,
         encode_fd,
         encode_fd_detailed,
         encode_file,
@@ -75,10 +78,11 @@ else:
         encode_len,
         encode_local_file,
         encode_local_file_detailed,
+        encode_stream_detailed,
         is_64bits,
     )
 
-__version__ = "0.3.7"
+__version__ = "0.3.8"
 
 
 def encode(data: bytes) -> bytes:

pybase16384/backends/cffi/__init__.py

@@ -1,6 +1,7 @@
 """
 Copyright (c) 2008-2021 synodriver <synodriver@gmail.com>
 """
+
 from pathlib import Path
 from typing import IO
 
@@ -105,11 +106,15 @@ def encode_file(input: IO, output: IO, write_head: bool = False, buf_rate: int =
         output.write(b"\xfe\xff")
 
     current_buf_len: int = buf_rate * 7  # 一次读取这么多字节
-    output_size: int = encode_len(current_buf_len) + 16  # 因为encode_len不是单调的 这16备用
+    output_size: int = (
+        encode_len(current_buf_len) + 16
+    )  # 因为encode_len不是单调的 这16备用
     output_buf = ffi.new(f"char[{output_size}]")
     if output_buf == ffi.NULL:
         raise MemoryError
-    first_check: int = 1  # 检查一次就行了 怎么可能出现第一次读出来是bytes 以后又变卦了的对象呢 不会吧不会吧
+    first_check: int = (
+        1  # 检查一次就行了 怎么可能出现第一次读出来是bytes 以后又变卦了的对象呢 不会吧不会吧
+    )
     while True:
         chunk = input.read(current_buf_len)
         if first_check:
@@ -120,7 +125,9 @@ def encode_file(input: IO, output: IO, write_head: bool = False, buf_rate: int =
                 )
         size = len(chunk)
         if size < current_buf_len:  # 数据不够了 要减小一次读取的量
-            if buf_rate > 1:  # 重新设置一次读取的大小 重新设置流的位置 当然要是已经是一次读取7字节了 那就不能再变小了 直接encode吧
+            if (
+                buf_rate > 1
+            ):  # 重新设置一次读取的大小 重新设置流的位置 当然要是已经是一次读取7字节了 那就不能再变小了 直接encode吧
                 buf_rate = buf_rate // 2
                 current_buf_len = buf_rate * 7
                 input.seek(-size, 1)
@@ -149,11 +156,15 @@ def encode_file_safe(
         output.write(b"\xfe\xff")
 
     current_buf_len: int = buf_rate * 7  # 一次读取这么多字节
-    output_size: int = encode_len(current_buf_len)  # 因为encode_len不是单调的 safe不用加16
+    output_size: int = encode_len(
+        current_buf_len
+    )  # 因为encode_len不是单调的 safe不用加16
     output_buf = ffi.new(f"char[{output_size}]")
     if output_buf == ffi.NULL:
         raise MemoryError
-    first_check: int = 1  # 检查一次就行了 怎么可能出现第一次读出来是bytes 以后又变卦了的对象呢 不会吧不会吧
+    first_check: int = (
+        1  # 检查一次就行了 怎么可能出现第一次读出来是bytes 以后又变卦了的对象呢 不会吧不会吧
+    )
     while True:
         chunk = input.read(current_buf_len)
         if first_check:
@@ -164,7 +175,9 @@ def encode_file_safe(
                 )
         size = len(chunk)
         if size < current_buf_len:  # 数据不够了 要减小一次读取的量
-            if buf_rate > 1:  # 重新设置一次读取的大小 重新设置流的位置 当然要是已经是一次读取7字节了 那就不能再变小了 直接encode吧
+            if (
+                buf_rate > 1
+            ):  # 重新设置一次读取的大小 重新设置流的位置 当然要是已经是一次读取7字节了 那就不能再变小了 直接encode吧
                 buf_rate = buf_rate // 2
                 current_buf_len = buf_rate * 7
                 input.seek(-size, 1)
@@ -391,3 +404,60 @@ def decode_fd_detailed(inp: int, out: int, flag: int) -> None:
     ret = lib.base16384_decode_fd_detailed(inp, out, encbuf, decbuf, flag)
     if ret != lib.base16384_err_ok:
         raise ValueError(err_to_str(ret))
+
+
+# stream
+@ffi.def_extern()
+def b14_readcallback(client_data, buffer, count: int):
+    file = ffi.from_handle(client_data)
+    data: bytes = file.read(count)
+    data_size: int = len(data)
+    ffi.memmove(buffer, data, data_size)
+    return data_size
+
+
+@ffi.def_extern()
+def b14_writecallback(client_data, buffer, count: int):
+    file = ffi.from_handle(client_data)
+    data: bytes = ffi.unpack(ffi.cast("char*", buffer), count)
+    return file.write(data)
+
+
+def encode_stream_detailed(inp, out, flag: int):
+    encbuf = ffi.new(f"char[{ENCBUFSZ}]")
+    decbuf = ffi.new(f"char[{DECBUFSZ}]")
+
+    inpstream = ffi.new(f"base16384_stream_t *")
+    inpstream.f.reader = lib.b14_readcallback
+    handle_inp = ffi.new_handle(inp)
+    inpstream.client_data = handle_inp
+
+    outstream = ffi.new(f"base16384_stream_t *")
+    outstream.f.writer = lib.b14_writecallback
+    handle_out = ffi.new_handle(out)
+    outstream.client_data = handle_out
+    ret = lib.base16384_encode_stream_detailed(
+        inpstream, outstream, encbuf, decbuf, flag
+    )
+    if ret != lib.base16384_err_ok:
+        raise ValueError(err_to_str(ret))
+
+
+def decode_stream_detailed(inp, out, flag: int):
+    encbuf = ffi.new(f"char[{ENCBUFSZ}]")
+    decbuf = ffi.new(f"char[{DECBUFSZ}]")
+
+    inpstream = ffi.new(f"base16384_stream_t *")
+    inpstream.f.reader = lib.b14_readcallback
+    handle_inp = ffi.new_handle(inp)
+    inpstream.client_data = handle_inp
+
+    outstream = ffi.new(f"base16384_stream_t *")
+    outstream.f.writer = lib.b14_writecallback
+    handle_out = ffi.new_handle(out)
+    outstream.client_data = handle_out
+    ret = lib.base16384_decode_stream_detailed(
+        inpstream, outstream, encbuf, decbuf, flag
+    )
+    if ret != lib.base16384_err_ok:
+        raise ValueError(err_to_str(ret))

pybase16384/backends/cffi/build.py

@@ -1,6 +1,7 @@
 """
 Copyright (c) 2008-2021 synodriver <synodriver@gmail.com>
 """
+
 import platform
 import sys
 
@@ -95,6 +96,39 @@ int BASE16384_FLAG_NOHEADER_();
 int BASE16384_FLAG_SUM_CHECK_ON_REMAIN_();
 
 int BASE16384_FLAG_DO_SUM_CHECK_FORCELY_();
+
+typedef ssize_t (*base16384_reader_t)(const void *client_data, void *buffer, size_t count);
+
+/**
+ * @brief custom writer function interface
+ * @param client_data the data pointer defined by the client
+ * @param buffer from where read data
+ * @param count write bytes count
+ * @return the size written
+*/
+typedef ssize_t (*base16384_writer_t)(const void *client_data, const void *buffer, size_t count);
+
+union base16384_io_function_t {
+	base16384_reader_t reader;
+	base16384_writer_t writer;
+};
+typedef union base16384_io_function_t base16384_io_function_t;
+
+struct base16384_stream_t {
+	base16384_io_function_t f;
+	void *client_data;
+};
+/**
+ * @brief for stream encode/decode
+*/
+typedef struct base16384_stream_t base16384_stream_t;
+
+base16384_err_t base16384_encode_stream_detailed(base16384_stream_t* input, base16384_stream_t*  output, char* encbuf, char* decbuf, int flag);
+base16384_err_t base16384_decode_stream_detailed(base16384_stream_t* input, base16384_stream_t*  output, char* encbuf, char* decbuf, int flag);
+
+extern "Python" ssize_t b14_readcallback(const void *client_data, void *buffer, size_t count);
+
+extern "Python" ssize_t b14_writecallback(const void *client_data, const void *buffer, size_t count);
     """
 )
 
@@ -136,7 +170,11 @@ int BASE16384_FLAG_DO_SUM_CHECK_FORCELY_()
 ffibuilder.set_source(
     "pybase16384.backends.cffi._core",
     source,
-    sources=[f"./base16384/base14{CPUBIT}.c", "./base16384/file.c"],
+    sources=[
+        f"./base16384/base14{CPUBIT}.c",
+        "./base16384/file.c",
+        "./base16384/wrap.c",
+    ],
     include_dirs=["./base16384"],
     define_macros=macro_base,
 )

pybase16384/backends/cython/__init__.py

@@ -1,6 +1,7 @@
 """
 Copyright (c) 2008-2021 synodriver <synodriver@gmail.com>
 """
+
 from pybase16384.backends.cython._core import (
     DECBUFSZ,
     ENCBUFSZ,
@@ -22,6 +23,7 @@ from pybase16384.backends.cython._core import (
     decode_len,
     decode_local_file,
     decode_local_file_detailed,
+    decode_stream_detailed,
     encode_fd,
     encode_fd_detailed,
     encode_file,
@@ -29,5 +31,6 @@ from pybase16384.backends.cython._core import (
     encode_len,
     encode_local_file,
     encode_local_file_detailed,
+    encode_stream_detailed,
     is_64bits,
 )