pybase16384 0.3.5__cp310-cp310-win32.whl → 0.3.6__cp310-cp310-win32.whl

pybase16384/__init__.py

@@ -17,38 +17,56 @@ def _should_use_cffi() -> bool:
 
 if not _should_use_cffi():
     from pybase16384.backends.cython import (
+        DECBUFSZ,
+        ENCBUFSZ,
+        FLAG_NOHEADER,
+        FLAG_SUM_CHECK_ON_REMAIN,
+        SIMPLE_SUM_INIT_VALUE,
         _decode,
         _decode_into,
         _encode,
         _encode_into,
         decode_fd,
+        decode_fd_detailed,
         decode_file,
         decode_len,
         decode_local_file,
+        decode_local_file_detailed,
         encode_fd,
+        encode_fd_detailed,
         encode_file,
         encode_len,
         encode_local_file,
+        encode_local_file_detailed,
         is_64bits,
     )
 else:
     from pybase16384.backends.cffi import (
+        DECBUFSZ,
+        ENCBUFSZ,
+        FLAG_NOHEADER,
+        FLAG_SUM_CHECK_ON_REMAIN,
+        SIMPLE_SUM_INIT_VALUE,
         _decode,
         _decode_into,
         _encode,
         _encode_into,
         decode_fd,
+        decode_fd_detailed,
         decode_file,
         decode_len,
         decode_local_file,
+        decode_local_file_detailed,
         encode_fd,
+        encode_fd_detailed,
         encode_file,
         encode_len,
         encode_local_file,
+        encode_local_file_detailed,
         is_64bits,
     )
 
-__version__ = "0.3.5"
+__version__ = "0.3.6"
 
 
 def encode(data: bytes) -> bytes:

pybase16384/backends/cffi/__init__.py

@@ -11,6 +11,12 @@ __version__ = "0.1.0"
 encode_len = lib.base16384_encode_len
 decode_len = lib.base16384_decode_len
 
+ENCBUFSZ = lib.get_encsize()
+DECBUFSZ = lib.get_decsize()
+FLAG_NOHEADER = lib.BASE16384_FLAG_NOHEADER_()
+FLAG_SUM_CHECK_ON_REMAIN = lib.BASE16384_FLAG_SUM_CHECK_ON_REMAIN_()
+SIMPLE_SUM_INIT_VALUE = lib.BASE16384_SIMPLE_SUM_INIT_VALUE_()
+
 
 # -----------------low level api------------------------------
 def _encode(data: bytes) -> bytes:
@@ -24,9 +30,7 @@ def _encode(data: bytes) -> bytes:
 
 
 def _encode_into(data: bytes, out: bytearray) -> int:
-    return lib.base16384_encode(
-        ffi.from_buffer(data), len(data), ffi.from_buffer(out)
-    )
+    return lib.base16384_encode(ffi.from_buffer(data), len(data), ffi.from_buffer(out))
 
 
 def _decode(data: bytes) -> bytes:
@@ -40,9 +44,7 @@ def _decode(data: bytes) -> bytes:
 
 
 def _decode_into(data: bytes, out: bytearray) -> int:
-    return lib.base16384_decode(
-        ffi.from_buffer(data), len(data), ffi.from_buffer(out)
-    )
+    return lib.base16384_decode(ffi.from_buffer(data), len(data), ffi.from_buffer(out))
 
 
 def is_64bits() -> bool:
@@ -92,9 +94,7 @@ def encode_file(input: IO, output: IO, write_head: bool = False, buf_rate: int =
                 input.seek(-size, 1)
                 continue
 
-        count = lib.base16384_encode(
-            ffi.from_buffer(chunk), size, output_buf
-        )
+        count = lib.base16384_encode(ffi.from_buffer(chunk), size, output_buf)
         output.write(ffi.unpack(output_buf, count))
         if size < 7:
             break
@@ -146,9 +146,7 @@ def decode_file(input: IO, output: IO, buf_rate: int = 10):
             else:
                 input.seek(-2, 1)
 
-        count = lib.base16384_decode(
-            ffi.from_buffer(chunk), size, output_buf
-        )
+        count = lib.base16384_decode(ffi.from_buffer(chunk), size, output_buf)
         output.write(ffi.unpack(output_buf, count))
 
 
@@ -176,13 +174,23 @@ def err_to_str(ret) -> str:
         return "base16384_err_open_input_file"
     elif ret == lib.base16384_err_map_input_file:
         return "base16384_err_map_input_file"
+    elif ret == lib.base16384_err_read_file:
+        return "base16384_err_read_file"
+    elif ret == lib.base16384_err_invalid_file_name:
+        return "base16384_err_invalid_file_name"
+    elif ret == lib.base16384_err_invalid_file_name:
+        return "base16384_err_invalid_file_name"
+    elif ret == lib.base16384_err_invalid_commandline_parameter:
+        return "base16384_err_invalid_commandline_parameter"
+    elif ret == lib.base16384_err_invalid_decoding_checksum:
+        return "base16384_err_invalid_decoding_checksum"
 
 
 def encode_local_file(inp, out) -> None:
     inp_name: bytes = ensure_bytes(inp)
     out_name: bytes = ensure_bytes(out)
-    encbuf = ffi.new(f"char[{lib.get_encsize()}]")
-    decbuf = ffi.new(f"char[{lib.get_decsize()}]")
+    encbuf = ffi.new(f"char[{ENCBUFSZ}]")
+    decbuf = ffi.new(f"char[{DECBUFSZ}]")
     ret = lib.base16384_encode_file(
         ffi.from_buffer(inp_name), ffi.from_buffer(out_name), encbuf, decbuf
     )
@@ -193,8 +201,8 @@ def encode_local_file(inp, out) -> None:
 def decode_local_file(inp, out) -> None:
     inp_name: bytes = ensure_bytes(inp)
     out_name: bytes = ensure_bytes(out)
-    encbuf = ffi.new(f"char[{lib.get_encsize()}]")
-    decbuf = ffi.new(f"char[{lib.get_decsize()}]")
+    encbuf = ffi.new(f"char[{ENCBUFSZ}]")
+    decbuf = ffi.new(f"char[{DECBUFSZ}]")
     ret = lib.base16384_decode_file(
         ffi.from_buffer(inp_name), ffi.from_buffer(out_name), encbuf, decbuf
     )
@@ -203,16 +211,57 @@ def decode_local_file(inp, out) -> None:
 
 
 def encode_fd(inp: int, out: int) -> None:
-    encbuf = ffi.new(f"char[{lib.get_encsize()}]")
-    decbuf = ffi.new(f"char[{lib.get_decsize()}]")
+    encbuf = ffi.new(f"char[{ENCBUFSZ}]")
+    decbuf = ffi.new(f"char[{DECBUFSZ}]")
     ret = lib.base16384_encode_fd(inp, out, encbuf, decbuf)
     if ret != lib.base16384_err_ok:
         raise ValueError(err_to_str(ret))
 
 
 def decode_fd(inp: int, out: int) -> None:
-    encbuf = ffi.new(f"char[{lib.get_encsize()}]")
-    decbuf = ffi.new(f"char[{lib.get_decsize()}]")
+    encbuf = ffi.new(f"char[{ENCBUFSZ}]")
+    decbuf = ffi.new(f"char[{DECBUFSZ}]")
     ret = lib.base16384_decode_fd(inp, out, encbuf, decbuf)
     if ret != lib.base16384_err_ok:
         raise ValueError(err_to_str(ret))
+
+
+# detail
+def encode_local_file_detailed(inp, out, flag: int) -> None:
+    inp_name: bytes = ensure_bytes(inp)
+    out_name: bytes = ensure_bytes(out)
+    encbuf = ffi.new(f"char[{ENCBUFSZ}]")
+    decbuf = ffi.new(f"char[{DECBUFSZ}]")
+    ret = lib.base16384_encode_file_detailed(
+        ffi.from_buffer(inp_name), ffi.from_buffer(out_name), encbuf, decbuf, flag
+    )
+    if ret != lib.base16384_err_ok:
+        raise ValueError(err_to_str(ret))
+
+
+def decode_local_file_detailed(inp, out, flag: int) -> None:
+    inp_name: bytes = ensure_bytes(inp)
+    out_name: bytes = ensure_bytes(out)
+    encbuf = ffi.new(f"char[{ENCBUFSZ}]")
+    decbuf = ffi.new(f"char[{DECBUFSZ}]")
+    ret = lib.base16384_decode_file_detailed(
+        ffi.from_buffer(inp_name), ffi.from_buffer(out_name), encbuf, decbuf, flag
+    )
+    if ret != lib.base16384_err_ok:
+        raise ValueError(err_to_str(ret))
+
+
+def encode_fd_detailed(inp: int, out: int, flag: int) -> None:
+    encbuf = ffi.new(f"char[{ENCBUFSZ}]")
+    decbuf = ffi.new(f"char[{DECBUFSZ}]")
+    ret = lib.base16384_encode_fd_detailed(inp, out, encbuf, decbuf, flag)
+    if ret != lib.base16384_err_ok:
+        raise ValueError(err_to_str(ret))
+
+
+def decode_fd_detailed(inp: int, out: int, flag: int) -> None:
+    encbuf = ffi.new(f"char[{ENCBUFSZ}]")
+    decbuf = ffi.new(f"char[{DECBUFSZ}]")
+    ret = lib.base16384_decode_fd_detailed(inp, out, encbuf, decbuf, flag)
+    if ret != lib.base16384_err_ok:
+        raise ValueError(err_to_str(ret))

pybase16384/backends/cffi/build.py

@@ -26,6 +26,7 @@ if sys.byteorder != "little":
 
 if CPUBIT == 64:
     macro_base.append(("CPUBIT64", None))
+    macro_base.append(("IS_64BIT_PROCESSOR", None))
 else:
     macro_base.append(("CPUBIT32", None))
 
@@ -41,6 +42,10 @@ enum base16384_err_t {
 	base16384_err_write_file,
 	base16384_err_open_input_file,
 	base16384_err_map_input_file,
+	base16384_err_read_file,
+    base16384_err_invalid_file_name,
+    base16384_err_invalid_commandline_parameter,
+    base16384_err_invalid_decoding_checksum
 };
 // base16384_err_t is the return value of base16384_en/decode_file
 typedef enum base16384_err_t base16384_err_t;
@@ -67,11 +72,27 @@ base16384_err_t base16384_decode_fp(FILE* input, FILE* output, char* encbuf, cha
 //    encbuf & decbuf must be no less than BASE16384_ENCBUFSZ & BASE16384_DECBUFSZ
 base16384_err_t base16384_decode_fd(int input, int output, char* encbuf, char* decbuf);
 
+int base16384_encode_unsafe(const char * data, int dlen, char * buf);
+int base16384_decode_unsafe(const char * data, int dlen, char * buf);
+
+base16384_err_t base16384_encode_file_detailed(const char* input, const char* output, char* encbuf, char* decbuf, int flag);
+base16384_err_t base16384_decode_file_detailed(const char* input, const char* output, char* encbuf, char* decbuf, int flag);
+base16384_err_t base16384_encode_fd_detailed(int input, int output, char* encbuf, char* decbuf, int flag);
+base16384_err_t base16384_decode_fd_detailed(int input, int output, char* encbuf, char* decbuf, int flag);
+base16384_err_t base16384_encode_fp_detailed(FILE* input, FILE* output, char* encbuf, char* decbuf, int flag);
+base16384_err_t base16384_decode_fp_detailed(FILE* input, FILE* output, char* encbuf, char* decbuf, int flag);
+
 int32_t pybase16384_64bits();
 
 int get_encsize();
 
 int get_decsize();
+
+int BASE16384_FLAG_NOHEADER_();
+
+int BASE16384_FLAG_SUM_CHECK_ON_REMAIN_();
+
+int BASE16384_SIMPLE_SUM_INIT_VALUE_();
     """
 )
 
@@ -93,6 +114,21 @@ int get_decsize()
 {
     return BASE16384_DECBUFSZ;
 }
+
+int BASE16384_FLAG_NOHEADER_()
+{
+    return BASE16384_FLAG_NOHEADER;
+}
+
+int BASE16384_FLAG_SUM_CHECK_ON_REMAIN_()
+{
+    return BASE16384_FLAG_SUM_CHECK_ON_REMAIN;
+}
+
+int BASE16384_SIMPLE_SUM_INIT_VALUE_()
+{
+    return BASE16384_SIMPLE_SUM_INIT_VALUE;
+}
 """
 
 ffibuilder.set_source(

pybase16384/backends/cython/__init__.py

@@ -2,17 +2,26 @@
 Copyright (c) 2008-2021 synodriver <synodriver@gmail.com>
 """
 from pybase16384.backends.cython._core import (
+    DECBUFSZ,
+    ENCBUFSZ,
+    FLAG_NOHEADER,
+    FLAG_SUM_CHECK_ON_REMAIN,
+    SIMPLE_SUM_INIT_VALUE,
     _decode,
     _decode_into,
     _encode,
     _encode_into,
     decode_fd,
+    decode_fd_detailed,
     decode_file,
     decode_len,
     decode_local_file,
+    decode_local_file_detailed,
     encode_fd,
+    encode_fd_detailed,
     encode_file,
     encode_len,
     encode_local_file,
+    encode_local_file_detailed,
     is_64bits,
 )