sabctools 8.2.2__tar.gz → 8.2.4__tar.gz

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

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

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

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

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

@@ -104,12 +104,4 @@ src/yencode/encoder_ssse3.cc
 src/yencode/encoder_vbmi2.cc
 src/yencode/hedley.h
 src/yencode/platform.cc
-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
+src/yencode/stdint.h

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

@@ -122,14 +122,15 @@ class SABCToolsBuild(build_ext):
                 log.info("==> C++11 flag not available")
 
             # Verify specific flags for ARM chips
-            # macOS M1 do not need any flags, they support everything
+            # macOS ARM does not need any flags, they support everything
             if IS_ARM and not IS_MACOS:
                 if not autoconf_check(self.compiler, define_check="__aarch64__"):
                     log.info("==> __aarch64__ not available, disabling 64bit extensions")
                     IS_AARCH64 = False
+                if autoconf_check(self.compiler, flag_check="-march=armv8-a+crc+crypto"):
+                    gcc_arm_crc_pmull_flags.append("-march=armv8-a+crc+crypto")
                 if autoconf_check(self.compiler, flag_check="-march=armv8-a+crc"):
                     gcc_arm_crc_flags.append("-march=armv8-a+crc")
-                    gcc_arm_crc_pmull_flags.append("-march=armv8-a+crc+crypto")
                     # Resolve problems on armv7, see issue #56
                     if not IS_AARCH64:
                         gcc_arm_crc_flags.append("-fno-lto")
@@ -313,7 +314,7 @@ class SABCToolsBuild(build_ext):
                     "src/unlocked_ssl.cc",
                 ],
                 "gcc_flags": ["-Wno-unused-parameter", "-Wno-missing-field-initializers"],
-                "msvc_x86_libraries": ["ws2_32"],
+                "msvc_libraries": ["ws2_32"],
             },
             {
                 "sources": [
@@ -344,8 +345,8 @@ class SABCToolsBuild(build_ext):
             if self.compiler.compiler_type == "msvc":
                 if IS_X86 and "msvc_x86_flags" in source_files:
                     args["extra_postargs"] += source_files["msvc_x86_flags"]
-                if IS_X86 and "msvc_x86_libraries" in source_files:
-                    ext.libraries += source_files["msvc_x86_libraries"]
+                if "msvc_libraries" in source_files:
+                    ext.libraries += source_files["msvc_libraries"]
             else:
                 if "gcc_flags" in source_files:
                     args["extra_postargs"] += source_files["gcc_flags"]

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

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

{sabctools-8.2.2 → sabctools-8.2.4}/src/unlocked_ssl.cc

@@ -99,11 +99,13 @@ void openssl_init() {
     if(!SSLWantReadError) goto cleanup;
 
 #if defined(_WIN32) || defined(__CYGWIN__)
+#ifdef _M_ARM64
+    HMODULE windows_openssl_handle = GetModuleHandle(TEXT("libssl-3-arm64.dll"));
+#else
     HMODULE windows_openssl_handle = GetModuleHandle(TEXT("libssl-3.dll"));
-    if(!windows_openssl_handle) {
-        windows_openssl_handle = GetModuleHandle(TEXT("libssl-1_1.dll"));
-        if(!windows_openssl_handle) goto cleanup;
-    }
+    if(!windows_openssl_handle) windows_openssl_handle = GetModuleHandle(TEXT("libssl-1_1.dll"));
+#endif
+    if(!windows_openssl_handle) goto cleanup;
 
     *(void**)&SSL_read_ex = GetProcAddress(windows_openssl_handle, "SSL_read_ex");
     *(void**)&SSL_get_error = GetProcAddress(windows_openssl_handle, "SSL_get_error");

sabctools-8.2.2/tests/test.py

@@ -1,22 +0,0 @@
-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

@@ -1,80 +0,0 @@
-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

@@ -1,115 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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)