sabctools 8.2.0__tar.gz → 8.2.2__tar.gz

{sabctools-8.2.0/sabctools.egg-info → sabctools-8.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sabctools
-Version: 8.2.0
+Version: 8.2.2
 Summary: C implementations of functions for use within SABnzbd
 Home-page: https://github.com/sabnzbd/sabctools/
 Author: Safihre

{sabctools-8.2.0 → sabctools-8.2.2/sabctools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sabctools
-Version: 8.2.0
+Version: 8.2.2
 Summary: C implementations of functions for use within SABnzbd
 Home-page: https://github.com/sabnzbd/sabctools/
 Author: Safihre

{sabctools-8.2.0 → sabctools-8.2.2}/sabctools.egg-info/SOURCES.txt

@@ -104,4 +104,12 @@ src/yencode/encoder_ssse3.cc
 src/yencode/encoder_vbmi2.cc
 src/yencode/hedley.h
 src/yencode/platform.cc
-src/yencode/stdint.h
+src/yencode/stdint.h
+tests/test.py
+tests/test_crc32.py
+tests/test_decoder.py
+tests/test_encoder.py
+tests/test_sparse.py
+tests/test_unlocked_ssl.py
+tests/test_utils.py
+tests/testsupport.py

{sabctools-8.2.0 → sabctools-8.2.2}/setup.py

@@ -124,13 +124,6 @@ class SABCToolsBuild(build_ext):
             # Verify specific flags for ARM chips
             # macOS M1 do not need any flags, they support everything
             if IS_ARM and not IS_MACOS:
-                if not autoconf_check(self.compiler, include_check="sys/auxv.h"):
-                    # We only tested this for GCC, might still be valid on MS-ARM compiler (see #38)
-                    if autoconf_check(self.compiler, define_check="__GNUC__"):
-                        log.info("==> On GGC and sys/auxv.h not available, setting UNSUPPORTED_PLATFORM_ARM=1")
-                        ext.define_macros.append(("UNSUPPORTED_PLATFORM_ARM", "1"))
-                        gcc_macros.append(("UNSUPPORTED_PLATFORM_ARM", "1"))
-                        IS_ARM = False
                 if not autoconf_check(self.compiler, define_check="__aarch64__"):
                     log.info("==> __aarch64__ not available, disabling 64bit extensions")
                     IS_AARCH64 = False
@@ -288,12 +281,12 @@ class SABCToolsBuild(build_ext):
             {
                 "sources": ["src/yencode/encoder_rvv.cc", "src/yencode/decoder_rvv.cc"],
                 "depends": srcdeps_enc_common + srcdeps_dec_common,
-                "gcc_rv_flags": gcc_rvv_flags,
+                "gcc_flags": gcc_rvv_flags,
             },
             {
                 "sources": ["src/yencode/crc_riscv.cc"],
                 "depends": srcdeps_crc_common,
-                "gcc_rv_flags": gcc_rvzbkc_flags,
+                "gcc_flags": gcc_rvzbkc_flags,
             },
             {
                 "sources": [

{sabctools-8.2.0 → sabctools-8.2.2}/src/sabctools.h

@@ -22,6 +22,6 @@
 #include <string.h>
 
 /* Version information */
-#define SABCTOOLS_VERSION "8.2.0"
+#define SABCTOOLS_VERSION "8.2.2"
 
 PyMODINIT_FUNC PyInit_sabctools(void);

{sabctools-8.2.0 → sabctools-8.2.2}/src/yencode/common.h

@@ -34,10 +34,6 @@
 	#define PLATFORM_ARM 1
 #endif
 
-#if defined(UNSUPPORTED_PLATFORM_ARM)
-#undef PLATFORM_ARM
-#endif
-
 #include <stdlib.h>
 #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__)
 	// MSVC doesn't support C11 aligned_alloc: https://stackoverflow.com/a/62963007

{sabctools-8.2.0 → sabctools-8.2.2}/src/yencode/crc.h

@@ -23,7 +23,7 @@ static inline int crc32_isa_level() {
 
 // computes `n % 0xffffffff` (well, almost), using some bit-hacks
 static inline uint32_t crc32_powmod(uint64_t n) {
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ >= 5 || (defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ > 3))))
 	unsigned res;
 	unsigned carry = __builtin_uadd_overflow(n >> 32, n, &res);
 	res += carry;

{sabctools-8.2.0 → sabctools-8.2.2}/src/yencode/crc_arm_pmull.cc

@@ -207,7 +207,7 @@ static uint32_t crc32_shift_pmull(uint32_t crc1, uint32_t n) {
 void RapidYenc::crc_pmull_set_funcs() {
 	_crc32_multiply = &crc32_multiply_pmull;
 	_crc32_shift = &crc32_shift_pmull;
-	_crc32_isa &= ISA_FEATURE_PMULL;
+	_crc32_isa |= ISA_FEATURE_PMULL;
 }
 
 #else

sabctools-8.2.2/tests/test.py

@@ -0,0 +1,22 @@
+import time
+import ssl
+import sabctools
+import socket
+import time
+
+
+hostname = "eunews.frugalusenet.com"
+context = ssl.create_default_context()
+
+print(sabctools.openssl_linked)
+
+buffer = bytearray(100)
+bufferview = memoryview(buffer)
+
+with socket.create_connection((hostname, 563)) as sock:
+    with context.wrap_socket(sock, server_hostname=hostname) as ssock:
+        ssock.setblocking(False)
+        time.sleep(1)
+        print(ssock.version())
+        print(sabctools.unlocked_ssl_recv_into(ssock._sslobj, bufferview[99:]))
+        print(buffer)

sabctools-8.2.2/tests/test_crc32.py

@@ -0,0 +1,80 @@
+import pytest
+import sabctools
+
+
+@pytest.mark.parametrize(
+    "crc1,crc2,len2,expected",
+    [
+        (0, 0, 0, 0),
+        (4294967295, 0, 0, 4294967295),
+        (0, 4294967295, 0, 4294967295),
+        (4294967295, 4294967295, 0, 0),
+        (4, 16, 256, 2385497022),
+        (100, 200, 300, 1009376567),
+        (0, 0, 18446744073709551615, 0),
+        (4294967295, 4294967295, 18446744073709551615, 0),
+        (0, 100, 1234567890123, 100),
+        (100, 0, 1234567890123, 1829446317),
+    ],
+)
+def test_crc32_combine_expected(crc1, crc2, len2, expected):
+    assert sabctools.crc32_combine(crc1, crc2, len2) == expected
+
+
+@pytest.mark.parametrize(
+    "crc1,crc2,expected",
+    [
+        (0, 0, 0),
+        (4294967295, 0, 0),
+        (0, 4294967295, 0),
+        (4294967295, 4294967295, 1048090088),
+        (100, 200, 4155012749),
+    ],
+)
+def test_crc32_multiply_expected(crc1, crc2, expected):
+    assert sabctools.crc32_multiply(crc1, crc2) == expected
+
+
+@pytest.mark.parametrize(
+    "crc1,zeroes,expected",
+    [
+        (0, 0, 0),
+        (4294967295, 0, 4294967295),
+        (4294967295, 4294967295, 4294967295),
+        (100, 200, 1523530880),
+        (0, 18446744073709551615, 0),
+        (4294967295, 18446744073709551615, 4294967295),
+        (100, 1234567890123, 980217485),
+    ],
+)
+def test_crc32_zero_unpad_expected(crc1, zeroes, expected):
+    assert sabctools.crc32_zero_unpad(crc1, zeroes) == expected
+
+
+@pytest.mark.parametrize(
+    "n,expected",
+    [
+        (0, 2147483648),
+        (1, 1073741824),
+        (8, 8388608),
+        (30, 2),
+        (31, 1),
+        (4294967295, 2147483648),
+        (4294967296, 1073741824),  # 1
+    ],
+)
+def test_crc32_xpown_expected(n, expected):
+    assert sabctools.crc32_xpown(n) == expected
+
+
+@pytest.mark.parametrize(
+    "n,expected",
+    [
+        (0, 2147483648),
+        (1, 8388608),
+        (4294967295, 2147483648),
+        (4294967296, 8388608),  # 1
+    ],
+)
+def test_crc32_xpow8n_expected(n, expected):
+    assert sabctools.crc32_xpow8n(n) == expected

sabctools-8.2.2/tests/test_decoder.py

@@ -0,0 +1,115 @@
+import sys
+import pytest
+import glob
+from tests.testsupport import *
+
+
+def test_regular():
+    data_plain = read_plain_yenc_file("test_regular.yenc")
+    assert python_yenc(data_plain) == sabctools_yenc_wrapper(data_plain)
+    data_plain = read_plain_yenc_file("test_regular_2.yenc")
+    assert python_yenc(data_plain) == sabctools_yenc_wrapper(data_plain)
+
+
+def test_bytes_compat():
+    data_plain = read_plain_yenc_file("test_regular.yenc")
+    assert python_yenc(data_plain) == sabctools.yenc_decode(memoryview(bytes(data_plain)))
+
+
+def test_partial():
+    data_plain = read_plain_yenc_file("test_partial.yenc")
+    decoded_data, filename, filesize, begin, size, crc_correct = sabctools_yenc_wrapper(data_plain)
+    assert filename == "90E2Sdvsmds0801dvsmds90E.part06.rar"
+    assert filesize == 49152000
+    assert begin == 15360000
+    assert size == 384000
+    assert crc_correct is None
+    assert len(decoded_data) == 549
+
+
+def test_special_chars():
+    data_plain = read_plain_yenc_file("test_special_chars.yenc")
+    # We only compare the data and the filename
+    assert python_yenc(data_plain) == sabctools_yenc_wrapper(data_plain)
+
+    data_plain = read_plain_yenc_file("test_special_utf8_chars.yenc")
+    # We only compare the data and the filename
+    assert python_yenc(data_plain) == sabctools_yenc_wrapper(data_plain)
+
+
+def test_bad_crc():
+    data_plain = read_plain_yenc_file("test_bad_crc.yenc")
+    # We only compare the data and the filename
+    assert python_yenc(data_plain) == sabctools_yenc_wrapper(data_plain)
+
+
+def test_bad_crc_end():
+    data_plain = read_plain_yenc_file("test_bad_crc_end.yenc")
+    with pytest.raises(ValueError) as excinfo:
+        sabctools_yenc_wrapper(data_plain)
+    assert "Invalid CRC in footer" in str(excinfo.value)
+
+
+def test_no_filename():
+    data_plain = read_plain_yenc_file("test_no_name.yenc")
+    with pytest.raises(ValueError) as excinfo:
+        sabctools_yenc_wrapper(data_plain)
+    assert "Could not find yEnc filename" in str(excinfo.value)
+
+
+def test_padded_crc():
+    data_plain = read_plain_yenc_file("test_padded_crc.yenc")
+    assert python_yenc(data_plain) == sabctools_yenc_wrapper(data_plain)
+
+
+def test_end_after_filename():
+    data_plain = read_plain_yenc_file("test_end_after_filename.yenc")
+    with pytest.raises(ValueError):
+        sabctools_yenc_wrapper(data_plain)
+
+
+def test_empty():
+    with pytest.raises(ValueError) as excinfo:
+        sabctools.yenc_decode(memoryview(bytearray(b"")))
+    assert "Invalid data length" in str(excinfo.value)
+
+
+def test_ref_counts():
+    """Note that sys.getrefcount itself adds another reference!"""
+    # Test regular case
+    data_plain = read_plain_yenc_file("test_regular.yenc")
+    data_out, filename, filesize, begin, end, crc_correct = sabctools_yenc_wrapper(data_plain)
+
+    assert sys.getrefcount(data_plain) == 2
+    assert sys.getrefcount(data_out) == 2
+    assert sys.getrefcount(filename) == 2
+    assert sys.getrefcount(begin) == 2
+    assert sys.getrefcount(end) == 2
+    assert sys.getrefcount(crc_correct) == 2
+
+    # Test simple error case
+    fake_inp = memoryview(bytearray(b"1234"))
+    assert sys.getrefcount(fake_inp) == 2
+    with pytest.raises(ValueError):
+        sabctools.yenc_decode(fake_inp)
+    assert sys.getrefcount(fake_inp) == 2
+
+    # Test further processing
+    data_plain = read_plain_yenc_file("test_bad_crc_end.yenc")
+    with pytest.raises(ValueError):
+        sabctools_yenc_wrapper(data_plain)
+    assert sys.getrefcount(data_plain) == 2
+
+
+def test_crc_pickles():
+    all_crc_fails = glob.glob("tests/yencfiles/crc_*")
+    for fname in all_crc_fails:
+        data_plain = read_pickle(fname)
+        assert python_yenc(data_plain) == sabctools_yenc_wrapper(data_plain)
+
+
+def test_small_file_pickles():
+    all_pickles = glob.glob("tests/yencfiles/small_file*")
+    for fname in all_pickles:
+        data_plain = read_pickle(fname)
+        assert python_yenc(data_plain) == sabctools_yenc_wrapper(data_plain)

sabctools-8.2.2/tests/test_encoder.py

@@ -0,0 +1,7 @@
+from tests.testsupport import *
+
+
+def test_encoder():
+    output, crc = sabctools.yenc_encode(b"Hello world!")
+    assert output == b"r\x8f\x96\x96\x99J\xa1\x99\x9c\x96\x8eK"
+    assert crc == 0x1B851995

sabctools-8.2.2/tests/test_sparse.py

@@ -0,0 +1,45 @@
+import os
+import subprocess
+import sys
+import tempfile
+import pytest
+from typing import IO
+
+from tests.testsupport import *
+
+
+def test_sparse():
+    file = tempfile.NamedTemporaryFile(delete=False)
+    try:
+        sabctools.sparse(file, 100)
+        assert os.path.getsize(file.name) == 100
+        assert is_sparse(file) is True
+    finally:
+        file.close()
+        os.unlink(file.name)
+
+@pytest.mark.parametrize(
+    "length,position",
+    [
+        (1024, 0),
+        (1024, 512),
+        (1024, 4096),
+    ],
+)
+def test_sparse_position_expected(length, position):
+    with tempfile.TemporaryFile() as file:
+        file.seek(position)
+        sabctools.sparse(file, length)
+        assert file.tell() == position
+
+def is_sparse(file: IO) -> bool:
+    """Is the file sparse?
+    On Windows this closes the file"""
+    if sys.platform == "win32":
+        file.close()
+        return b"This file is set as sparse" in subprocess.run(
+            ["fsutil", "sparse", "queryflag", file.name],
+            capture_output=True
+        ).stdout
+
+    return os.stat(file.name).st_blocks * 512 < os.path.getsize(file.name)