PyCatFile 0.24.6__py3-none-any.whl → 0.25.2__py3-none-any.whl

pycatfile.py

@@ -14,7 +14,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: pycatfile.py - Last Update: 11/3/2025 Ver. 0.24.6 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 11/6/2025 Ver. 0.25.2 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -73,6 +73,17 @@ except ImportError:
     except ImportError:
         import json
 
+testyaml = False
+try:
+    import oyaml as yaml
+    testyaml = True
+except ImportError:
+    try:
+        import yaml
+        testyaml = True
+    except ImportError:
+        testyaml = False
+
 try:
     import configparser
 except ImportError:
@@ -115,6 +126,16 @@ else:
     bytes_type = bytes
     text_type = str
 
+# Text streams (as provided by Python)
+PY_STDIN_TEXT  = sys.stdin
+PY_STDOUT_TEXT = sys.stdout
+PY_STDERR_TEXT = sys.stderr
+
+# Binary-friendly streams (use .buffer on Py3, fall back on Py2)
+PY_STDIN_BUF  = getattr(sys.stdin,  "buffer", sys.stdin)
+PY_STDOUT_BUF = getattr(sys.stdout, "buffer", sys.stdout)
+PY_STDERR_BUF = getattr(sys.stderr, "buffer", sys.stderr)
+
 # Text vs bytes tuples you can use with isinstance()
 TEXT_TYPES   = (basestring,)                  # "str or unicode" on Py2, "str" on Py3
 BINARY_TYPES = (bytes,) if not PY2 else (str,)  # bytes on Py3, str on Py2
@@ -211,12 +232,6 @@ if sys.version_info[0] == 2:
     except (NameError, AttributeError):
         pass
 
-# CRC32 import
-try:
-    from zlib import crc32
-except ImportError:
-    from binascii import crc32
-
 # Define FileNotFoundError for Python 2
 try:
     FileNotFoundError
@@ -251,9 +266,7 @@ py7zr_support = False
 try:
     import py7zr
     py7zr_support = True
-except ImportError:
-    pass
-except OSError:
+except (ImportError, OSError):
     pass
 
 # TAR file checking
@@ -279,9 +292,7 @@ haveparamiko = False
 try:
     import paramiko
     haveparamiko = True
-except ImportError:
-    pass
-except OSError:
+except (ImportError, OSError):
     pass
 
 # PySFTP support
@@ -289,9 +300,7 @@ havepysftp = False
 try:
     import pysftp
     havepysftp = True
-except ImportError:
-    pass
-except OSError:
+except (ImportError, OSError):
     pass
 
 # Add the mechanize import check
@@ -299,9 +308,7 @@ havemechanize = False
 try:
     import mechanize
     havemechanize = True
-except ImportError:
-    pass
-except OSError:
+except (ImportError, OSError):
     pass
 
 # Requests support
@@ -311,9 +318,7 @@ try:
     haverequests = True
     import urllib3
     logging.getLogger("urllib3").setLevel(logging.WARNING)
-except ImportError:
-    pass
-except OSError:
+except (ImportError, OSError):
     pass
 
 # HTTPX support
@@ -323,9 +328,7 @@ try:
     havehttpx = True
     logging.getLogger("httpx").setLevel(logging.WARNING)
     logging.getLogger("httpcore").setLevel(logging.WARNING)
-except ImportError:
-    pass
-except OSError:
+except (ImportError, OSError):
     pass
 
 # HTTP and URL parsing
@@ -416,9 +419,14 @@ __include_defaults__ = True
 __use_inmemfile__ = True
 __use_spoolfile__ = False
 __use_spooldir__ = tempfile.gettempdir()
-BYTES_PER_MiB = 1024 * 1024
-DEFAULT_SPOOL_MAX = 8 * BYTES_PER_MiB
+BYTES_PER_KiB = 1024
+BYTES_PER_MiB = 1024 * BYTES_PER_KiB
+# Spool: not tiny, but won’t blow up RAM if many are in use
+DEFAULT_SPOOL_MAX = 4 * BYTES_PER_MiB      # 4 MiB per spooled temp file
 __spoolfile_size__ = DEFAULT_SPOOL_MAX
+# Buffer: bigger than stdlib default (16 KiB), but still modest
+DEFAULT_BUFFER_MAX = 256 * BYTES_PER_KiB   # 256 KiB copy buffer
+__filebuff_size__ = DEFAULT_BUFFER_MAX
 __program_name__ = "Py"+__file_format_default__
 __use_env_file__ = True
 __use_ini_file__ = True
@@ -641,12 +649,12 @@ __project__ = __program_name__
 __program_alt_name__ = __program_name__
 __project_url__ = "https://github.com/GameMaker2k/PyCatFile"
 __project_release_url__ = __project_url__+"/releases/latest"
-__version_info__ = (0, 24, 6, "RC 1", 1)
-__version_date_info__ = (2025, 11, 3, "RC 1", 1)
+__version_info__ = (0, 25, 2, "RC 1", 1)
+__version_date_info__ = (2025, 11, 6, "RC 1", 1)
 __version_date__ = str(__version_date_info__[0]) + "." + str(
     __version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
 __revision__ = __version_info__[3]
-__revision_id__ = "$Id: d68fe3665e19a576beefb4e2c06db1bf32d5f94a $"
+__revision_id__ = "$Id: d2f5e2d130062be70121a9e3633ff5962335321c $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -797,7 +805,7 @@ geturls_ua_pyfile_python = "Mozilla/5.0 (compatible; {proname}/{prover}; +{prour
 if(platform.python_implementation() != ""):
     py_implementation = platform.python_implementation()
 if(platform.python_implementation() == ""):
-    py_implementation = "Python"
+    py_implementation = "CPython"
 geturls_ua_pyfile_python_alt = "Mozilla/5.0 ({osver}; {archtype}; +{prourl}) {pyimp}/{pyver} (KHTML, like Gecko) {proname}/{prover}".format(osver=platform.system(
 )+" "+platform.release(), archtype=platform.machine(), prourl=__project_url__, pyimp=py_implementation, pyver=platform.python_version(), proname=__project__, prover=__version__)
 geturls_ua_googlebot_google = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
@@ -2385,7 +2393,7 @@ def GetTotalSize(file_list):
             try:
                 total_size += os.path.getsize(item)
             except OSError:
-                sys.stderr.write("Error accessing file {}: {}\n".format(item, e))
+                PY_STDERR_TEXT.write("Error accessing file {}: {}\n".format(item, e))
     return total_size
 
 
@@ -2622,7 +2630,7 @@ class ZlibFile(object):
         scanned_leading = 0  # for tolerant header scan
 
         while True:
-            data = self.file.read(1 << 20)  # 1 MiB blocks
+            data = self.file.read(__filebuff_size__)  # 1 MiB blocks
             if not data:
                 if d is not None:
                     self._spool.write(d.flush())
@@ -2780,7 +2788,7 @@ class ZlibFile(object):
 
         # Buffer and compress in chunks to limit memory
         self._write_buf += data
-        if len(self._write_buf) >= (1 << 20):  # 1 MiB threshold
+        if len(self._write_buf) >= (__filebuff_size__):  # 1 MiB threshold
             chunk = self._compressor.compress(bytes(self._write_buf))
             if chunk:
                 self.file.write(chunk)
@@ -2890,7 +2898,7 @@ class ZlibFile(object):
         """
         if not isinstance(data, (bytes, bytearray, memoryview)):
             raise TypeError("from_bytes() expects a bytes-like object")
-        bio = io.BytesIO(bytes(data) if not isinstance(data, bytes) else data)
+        bio = MkTempFile(bytes(data) if not isinstance(data, bytes) else data)
         return cls(fileobj=bio, mode=mode, **kw)
 
     # compatibility aliases for unwrapping utilities
@@ -2926,7 +2934,7 @@ def compress_bytes(payload, level=6, wbits=15, text=False, **kw):
         out = compress_bytes(b"hello")
         out = compress_bytes(u"hello\n", text=True, encoding="utf-8", newline="\n")
     """
-    bio = io.BytesIO()
+    bio = MkTempFile()
     mode = 'wt' if text else 'wb'
     f = ZlibFile(fileobj=bio, mode=mode, level=level, wbits=wbits, **kw)
     try:
@@ -3085,7 +3093,7 @@ class GzipFile(object):
 
         self._spool = tempfile.SpooledTemporaryFile(max_size=self.spool_threshold)
 
-        CHUNK = 1 << 20
+        CHUNK = __filebuff_size__
         pending = b""
         d = None
         absolute_offset = 0
@@ -3248,7 +3256,7 @@ class GzipFile(object):
 
         # Stage and compress in chunks
         self._write_buf += data
-        if len(self._write_buf) >= (1 << 20):  # 1 MiB threshold
+        if len(self._write_buf) >= (__filebuff_size__):  # 1 MiB threshold
             out = self._compressor.compress(bytes(self._write_buf))
             if out:
                 self.file.write(out)
@@ -3348,7 +3356,7 @@ class GzipFile(object):
         """
         if not isinstance(data, (bytes, bytearray, memoryview)):
             raise TypeError("from_bytes() expects a bytes-like object")
-        bio = io.BytesIO(bytes(data) if not isinstance(data, bytes) else data)
+        bio = MkTempFile(bytes(data) if not isinstance(data, bytes) else data)
         return cls(fileobj=bio, mode=mode, **kw)
 
     # compatibility aliases for unwrapping utilities
@@ -3390,7 +3398,7 @@ def gzip_compress_bytes(payload, level=6, text=False, **kw):
     - text=False: 'payload' must be bytes-like; written via GzipFile('wb')
     You can pass newline/encoding/errors to control text encoding.
     """
-    bio = io.BytesIO()
+    bio = MkTempFile()
     mode = 'wt' if text else 'wb'
     gf = GzipFile(fileobj=bio, mode=mode, level=level, **kw)
     try:
@@ -3622,280 +3630,6 @@ def crc_generic(msg, width, poly, init, xorout, refin, refout):
         crc = _reflect(crc, width)
     return (crc ^ xorout) & mask
 
-# =========================
-#       Named CRCs
-# =========================
-# CRC-16/ANSI (ARC/MODBUS family with init=0xFFFF by default)
-def crc16_ansi(msg, initial_value=0xFFFF):
-    return crc_generic(msg, 16, 0x8005, initial_value & 0xFFFF, 0x0000, True, True)
-
-def crc16_ibm(msg, initial_value=0xFFFF):
-    return crc16_ansi(msg, initial_value)
-
-def crc16(msg):
-    return crc16_ansi(msg, 0xFFFF)
-
-def crc16_ccitt(msg, initial_value=0xFFFF):
-    # CCITT-FALSE
-    return crc_generic(msg, 16, 0x1021, initial_value & 0xFFFF, 0x0000, False, False)
-
-def crc16_x25(msg):
-    return crc_generic(msg, 16, 0x1021, 0xFFFF, 0xFFFF, True, True)
-
-def crc16_kermit(msg):
-    return crc_generic(msg, 16, 0x1021, 0x0000, 0x0000, True, True)
-
-def crc64_ecma(msg, initial_value=0x0000000000000000):
-    return crc_generic(msg, 64, 0x42F0E1EBA9EA3693,
-                       initial_value & 0xFFFFFFFFFFFFFFFF,
-                       0x0000000000000000, False, False)
-
-def crc64_iso(msg, initial_value=0xFFFFFFFFFFFFFFFF):
-    return crc_generic(msg, 64, 0x000000000000001B,
-                       initial_value & 0xFFFFFFFFFFFFFFFF,
-                       0xFFFFFFFFFFFFFFFF, True, True)
-
-# =========================
-#  Incremental CRC context
-# =========================
-CRCSpec = namedtuple("CRCSpec", "width poly init xorout refin refout")
-
-_CRC_SPECS = {
-    "crc16_ansi":  CRCSpec(16, 0x8005, 0xFFFF, 0x0000, True,  True),
-    "crc16_ccitt": CRCSpec(16, 0x1021, 0xFFFF, 0x0000, False, False),
-    "crc16_x25":   CRCSpec(16, 0x1021, 0xFFFF, 0xFFFF, True,  True),
-    "crc16_kermit":CRCSpec(16, 0x1021, 0x0000, 0x0000, True,  True),
-    "crc64_ecma":  CRCSpec(64, 0x42F0E1EBA9EA3693, 0x0000000000000000, 0x0000000000000000, False, False),
-    "crc64_iso":   CRCSpec(64, 0x000000000000001B, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, True,  True),
-}
-
-class CRCContext(object):
-    __slots__ = ("spec", "table", "mask", "shift", "crc")
-
-    def __init__(self, spec):
-        self.spec  = spec
-        self.table = _build_table(spec.width, spec.poly, spec.refin)
-        self.mask  = (1 << spec.width) - 1
-        self.shift = spec.width - 8
-        self.crc   = spec.init & self.mask
-
-    def update(self, data):
-        if not isinstance(data, (bytes, bytearray, memoryview)):
-            data = bytes(bytearray(data))
-        buf = _mv_tobytes(memoryview(data))
-        if self.spec.refin:
-            c = self.crc
-            tbl = self.table
-            for b in buf:
-                if not isinstance(b, int):  # Py2
-                    b = ord(b)
-                c = tbl[(c ^ b) & 0xFF] ^ (c >> 8)
-            self.crc = c & self.mask
-        else:
-            c = self.crc
-            tbl = self.table
-            sh  = self.shift
-            msk = self.mask
-            for b in buf:
-                if not isinstance(b, int):
-                    b = ord(b)
-                c = tbl[((c >> sh) ^ b) & 0xFF] ^ ((c << 8) & msk)
-            self.crc = c & msk
-        return self
-
-    def digest_int(self):
-        c = self.crc
-        if self.spec.refout ^ self.spec.refin:
-            c = _reflect(c, self.spec.width)
-        return (c ^ self.spec.xorout) & self.mask
-
-    def hexdigest(self):
-        width_hex = (self.spec.width + 3) // 4
-        return format(self.digest_int(), "0{}x".format(width_hex)).lower()
-
-def crc_context_from_name(name_norm):
-    spec = _CRC_SPECS.get(name_norm)
-    if spec is None:
-        raise KeyError("Unknown CRC spec: {}".format(name_norm))
-    return CRCContext(spec)
-
-# =========================
-#     Dispatch helpers
-# =========================
-_CRC_ALIASES = {
-    # keep your historical behaviors
-    "crc16": "crc16_ansi",
-    "crc16_ibm": "crc16_ansi",
-    "crc16_ansi": "crc16_ansi",
-    "crc16_modbus": "crc16_ansi",
-    "crc16_ccitt": "crc16_ccitt",
-    "crc16_ccitt_false": "crc16_ccitt",
-    "crc16_x25": "crc16_x25",
-    "crc16_kermit": "crc16_kermit",
-    "crc64": "crc64_iso",
-    "crc64_iso": "crc64_iso",
-    "crc64_ecma": "crc64_ecma",
-    "adler32": "adler32",
-    "crc32": "crc32",
-}
-
-_CRC_WIDTH = {
-    "crc16_ansi": 16,
-    "crc16_ccitt": 16,
-    "crc16_x25": 16,
-    "crc16_kermit": 16,
-    "crc64_iso": 64,
-    "crc64_ecma": 64,
-    "adler32": 32,
-    "crc32": 32,
-}
-
-def _crc_compute(algo_key, data_bytes):
-    if algo_key == "crc16_ansi":
-        return crc16_ansi(data_bytes) & 0xFFFF
-    if algo_key == "crc16_ccitt":
-        return crc16_ccitt(data_bytes) & 0xFFFF
-    if algo_key == "crc16_x25":
-        return crc16_x25(data_bytes) & 0xFFFF
-    if algo_key == "crc16_kermit":
-        return crc16_kermit(data_bytes) & 0xFFFF
-    if algo_key == "crc64_iso":
-        return crc64_iso(data_bytes) & 0xFFFFFFFFFFFFFFFF
-    if algo_key == "crc64_ecma":
-        return crc64_ecma(data_bytes) & 0xFFFFFFFFFFFFFFFF
-    if algo_key == "adler32":
-        return zlib.adler32(data_bytes) & 0xFFFFFFFF
-    if algo_key == "crc32":
-        return zlib.crc32(data_bytes) & 0xFFFFFFFF
-    raise KeyError(algo_key)
-
-try:
-    hashlib_guaranteed
-except NameError:
-    hashlib_guaranteed = set(a.lower() for a in hashlib.algorithms_available)
-
-def CheckSumSupportAlt(name, guaranteed):
-    try:
-        return name.lower() in guaranteed
-    except Exception:
-        return False
-
-# =========================
-#     Public checksum API
-# =========================
-def GetHeaderChecksum(inlist=None, checksumtype="crc32", encodedata=True, formatspecs=__file_format_dict__):
-    """
-    Serialize header fields (list/tuple => joined with delimiter + trailing delimiter;
-    or a single field) and compute the requested checksum. Returns lowercase hex.
-    """
-    checksumtype_norm = (checksumtype or "crc32").lower()
-    algo_key = _CRC_ALIASES.get(checksumtype_norm, checksumtype_norm)
-
-    delim = formatspecs.get('format_delimiter', u"\0")
-    hdr_bytes = _serialize_header_fields(inlist or [], delim)
-    if encodedata and not isinstance(hdr_bytes, (bytes, bytearray, memoryview)):
-        hdr_bytes = _to_bytes(hdr_bytes)
-    hdr_bytes = bytes(hdr_bytes)
-
-    if algo_key in _CRC_WIDTH:
-        n = _crc_compute(algo_key, hdr_bytes)
-        return _hex_pad(n, _CRC_WIDTH[algo_key])
-
-    if CheckSumSupportAlt(algo_key, hashlib_guaranteed):
-        h = hashlib.new(algo_key)
-        h.update(hdr_bytes)
-        return h.hexdigest().lower()
-
-    return "0"
-
-def GetFileChecksum(instr, checksumtype="crc32", encodedata=True, formatspecs=__file_format_dict__):
-    """
-    Accepts bytes/str/file-like.
-      - Hashlib algos: streamed in 1 MiB chunks.
-      - CRC algos (crc16_ansi/ccitt/x25/kermit, crc64_iso/ecma): streamed via CRCContext for file-like.
-      - Falls back to one-shot for non-file-like inputs.
-    """
-    checksumtype_norm = (checksumtype or "crc32").lower()
-    algo_key = _CRC_ALIASES.get(checksumtype_norm, checksumtype_norm)
-
-    # file-like streaming
-    if hasattr(instr, "read"):
-        # hashlib
-        if algo_key not in _CRC_SPECS and CheckSumSupportAlt(algo_key, hashlib_guaranteed):
-            h = hashlib.new(algo_key)
-            while True:
-                chunk = instr.read(1 << 20)
-                if not chunk:
-                    break
-                if not isinstance(chunk, (bytes, bytearray, memoryview)):
-                    chunk = bytes(bytearray(chunk))
-                h.update(chunk)
-            return h.hexdigest().lower()
-
-        # CRC streaming via context
-        if algo_key in _CRC_SPECS:
-            ctx = crc_context_from_name(algo_key)
-            while True:
-                chunk = instr.read(1 << 20)
-                if not chunk:
-                    break
-                if not isinstance(chunk, (bytes, bytearray, memoryview)):
-                    chunk = bytes(bytearray(chunk))
-                ctx.update(chunk)
-            return ctx.hexdigest()
-
-        # not known streaming algo: fallback to one-shot bytes
-        data = instr.read()
-        if not isinstance(data, (bytes, bytearray, memoryview)):
-            data = bytes(bytearray(data))
-    else:
-        data = _to_bytes(instr) if (encodedata or not isinstance(instr, (bytes, bytearray, memoryview))) else instr
-        data = bytes(data)
-
-    # one-shot
-    if algo_key in _CRC_SPECS:
-        return crc_context_from_name(algo_key).update(data).hexdigest()
-
-    if algo_key in _CRC_WIDTH:
-        n = _crc_compute(algo_key, data)
-        return _hex_pad(n, _CRC_WIDTH[algo_key])
-
-    if CheckSumSupportAlt(algo_key, hashlib_guaranteed):
-        h = hashlib.new(algo_key)
-        h.update(data)
-        return h.hexdigest().lower()
-
-    return "0"
-
-def ValidateHeaderChecksum(inlist=None, checksumtype="crc32", inchecksum="0", formatspecs=__file_format_dict__):
-    calc = GetHeaderChecksum(inlist, checksumtype, True, formatspecs)
-    want = (inchecksum or "0").strip().lower()
-    if want.startswith("0x"):
-        want = want[2:]
-    return hmac.compare_digest(want, calc)
-
-def ValidateFileChecksum(infile, checksumtype="crc32", inchecksum="0", formatspecs=__file_format_dict__):
-    calc = GetFileChecksum(infile, checksumtype, True, formatspecs)
-    want = (inchecksum or "0").strip().lower()
-    if want.startswith("0x"):
-        want = want[2:]
-    return hmac.compare_digest(want, calc)
-
-
-# =========================
-#  Incremental CRC context
-# =========================
-CRCSpec = namedtuple("CRCSpec", "width poly init xorout refin refout")
-
-_CRC_SPECS = {
-    "crc16_ansi":  CRCSpec(16, 0x8005, 0xFFFF, 0x0000, True,  True),
-    "crc16_ccitt": CRCSpec(16, 0x1021, 0xFFFF, 0x0000, False, False),
-    "crc16_x25":   CRCSpec(16, 0x1021, 0xFFFF, 0xFFFF, True,  True),
-    "crc16_kermit":CRCSpec(16, 0x1021, 0x0000, 0x0000, True,  True),
-    "crc64_ecma":  CRCSpec(64, 0x42F0E1EBA9EA3693, 0x0000000000000000, 0x0000000000000000, False, False),
-    "crc64_iso":   CRCSpec(64, 0x000000000000001B, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, True,  True),
-}
-
 # --- helpers --------------------------------------------------------------
 
 try:
@@ -3936,206 +3670,15 @@ def _bytes_to_int(b):
         value = (value << 8) | ch
     return value
 
-
-# --- your existing CRCContext (unchanged) ---------------------------------
-
-class CRCContext(object):
-    __slots__ = ("spec", "table", "mask", "shift", "crc")
-
-    def __init__(self, spec):
-        self.spec  = spec
-        self.table = _build_table(spec.width, spec.poly, spec.refin)
-        self.mask  = (1 << spec.width) - 1
-        self.shift = spec.width - 8
-        self.crc   = spec.init & self.mask
-
-    def update(self, data):
-        if not isinstance(data, (bytes, bytearray, memoryview)):
-            data = bytes(bytearray(data))
-        buf = _mv_tobytes(memoryview(data))
-        if self.spec.refin:
-            c = self.crc
-            tbl = self.table
-            for b in buf:
-                if not isinstance(b, int):  # Py2
-                    b = ord(b)
-                c = tbl[(c ^ b) & 0xFF] ^ (c >> 8)
-            self.crc = c & self.mask
-        else:
-            c = self.crc
-            tbl = self.table
-            sh  = self.shift
-            msk = self.mask
-            for b in buf:
-                if not isinstance(b, int):
-                    b = ord(b)
-                c = tbl[((c >> sh) ^ b) & 0xFF] ^ ((c << 8) & msk)
-            self.crc = c & msk
-        return self
-
-    def digest_int(self):
-        c = self.crc
-        if self.spec.refout ^ self.spec.refin:
-            c = _reflect(c, self.spec.width)
-        return (c ^ self.spec.xorout) & self.mask
-
-    def hexdigest(self):
-        width_hex = (self.spec.width + 3) // 4
-        return format(self.digest_int(), "0{}x".format(width_hex)).lower()
-
-
-# --- hashlib-backed implementation ---------------------------------------
-
-class _HashlibCRCWrapper(object):
-    """
-    Wrap a hashlib object to present the same interface as CRCContext
-    (update, digest_int, hexdigest).
-
-    Assumes the hashlib algorithm already implements the exact CRC
-    specification (refin/refout/xorout/etc.).
-    """
-    __slots__ = ("_h", "spec", "mask", "width_hex")
-
-    def __init__(self, algo_name, spec):
-        self._h = hashlib.new(algo_name)
-        self.spec = spec
-        self.mask = (1 << spec.width) - 1
-        self.width_hex = (spec.width + 3) // 4
-
-    def update(self, data):
-        self._h.update(_coerce_bytes(data))
-        return self
-
-    def digest_int(self):
-        # Convert final digest bytes to an integer and mask to width
-        value = _bytes_to_int(self._h.digest())
-        return value & self.mask
-
-    def hexdigest(self):
-        h = self._h.hexdigest().lower()
-        # Normalize to the same number of hex digits as CRCContext
-        if len(h) < self.width_hex:
-            h = ("0" * (self.width_hex - len(h))) + h
-        elif len(h) > self.width_hex:
-            h = h[-self.width_hex:]
-        return h
-
-
-# --- public class: choose hashlib or fallback -----------------------------
-
-class CRC(object):
-    """
-    CRC wrapper that uses hashlib if available, otherwise falls back to
-    the pure-Python CRCContext.
-
-    spec.hashlib_name (preferred) or spec.name is used as the hashlib
-    algorithm name, e.g. 'crc32', 'crc32c', etc.
-    """
-
-    __slots__ = ("spec", "_impl")
-
-    def __init__(self, spec):
-        self.spec = spec
-
-        algo_name = getattr(spec, "hashlib_name", None) or getattr(spec, "name", None)
-        impl = None
-
-        if algo_name and algo_name in _ALGORITHMS_AVAILABLE:
-            # Use hashlib-backed implementation
-            impl = _HashlibCRCWrapper(algo_name, spec)
-        else:
-            # Fallback to your pure-Python implementation
-            impl = CRCContext(spec)
-
-        self._impl = impl
-
-    def update(self, data):
-        self._impl.update(data)
-        return self
-
-    def digest_int(self):
-        return self._impl.digest_int()
-
-    def hexdigest(self):
-        return self._impl.hexdigest()
-
-def crc_context_from_name(name_norm):
-    spec = _CRC_SPECS.get(name_norm)
-    if spec is None:
-        raise KeyError("Unknown CRC spec: {}".format(name_norm))
-    return CRCContext(spec)
-
-# =========================
-#     Dispatch helpers
-# =========================
-_CRC_ALIASES = {
-    # keep your historical behaviors
-    "crc16": "crc16_ansi",
-    "crc16_ibm": "crc16_ansi",
-    "crc16_ansi": "crc16_ansi",
-    "crc16_modbus": "crc16_ansi",
-    "crc16_ccitt": "crc16_ccitt",
-    "crc16_ccitt_false": "crc16_ccitt",
-    "crc16_x25": "crc16_x25",
-    "crc16_kermit": "crc16_kermit",
-    "crc64": "crc64_iso",
-    "crc64_iso": "crc64_iso",
-    "crc64_ecma": "crc64_ecma",
-    "adler32": "adler32",
-    "crc32": "crc32",
-}
-
-_CRC_WIDTH = {
-    "crc16_ansi": 16,
-    "crc16_ccitt": 16,
-    "crc16_x25": 16,
-    "crc16_kermit": 16,
-    "crc64_iso": 64,
-    "crc64_ecma": 64,
-    "adler32": 32,
-    "crc32": 32,
-}
-
-def _crc_compute(algo_key, data_bytes):
-    if algo_key == "crc16_ansi":
-        return crc16_ansi(data_bytes) & 0xFFFF
-    if algo_key == "crc16_ccitt":
-        return crc16_ccitt(data_bytes) & 0xFFFF
-    if algo_key == "crc16_x25":
-        return crc16_x25(data_bytes) & 0xFFFF
-    if algo_key == "crc16_kermit":
-        return crc16_kermit(data_bytes) & 0xFFFF
-    if algo_key == "crc64_iso":
-        return crc64_iso(data_bytes) & 0xFFFFFFFFFFFFFFFF
-    if algo_key == "crc64_ecma":
-        return crc64_ecma(data_bytes) & 0xFFFFFFFFFFFFFFFF
-    if algo_key == "adler32":
-        return zlib.adler32(data_bytes) & 0xFFFFFFFF
-    if algo_key == "crc32":
-        return zlib.crc32(data_bytes) & 0xFFFFFFFF
-    raise KeyError(algo_key)
-
-try:
-    hashlib_guaranteed
-except NameError:
-    hashlib_guaranteed = set(a.lower() for a in hashlib.algorithms_available)
-
-def CheckSumSupportAlt(name, guaranteed):
-    try:
-        return name.lower() in guaranteed
-    except Exception:
-        return False
-
 # =========================
 #     Public checksum API
 # =========================
-def GetHeaderChecksum(inlist=None, checksumtype="crc32", encodedata=True, formatspecs=__file_format_dict__):
+def GetHeaderChecksum(inlist=None, checksumtype="md5", encodedata=True, formatspecs=__file_format_dict__):
     """
     Serialize header fields (list/tuple => joined with delimiter + trailing delimiter;
     or a single field) and compute the requested checksum. Returns lowercase hex.
     """
-    checksumtype_norm = (checksumtype or "crc32").lower()
-    algo_key = _CRC_ALIASES.get(checksumtype_norm, checksumtype_norm)
+    algo_key = (checksumtype or "md5").lower()
 
     delim = formatspecs.get('format_delimiter', u"\0")
     hdr_bytes = _serialize_header_fields(inlist or [], delim)
@@ -4143,34 +3686,30 @@ def GetHeaderChecksum(inlist=None, checksumtype="crc32", encodedata=True, format
         hdr_bytes = _to_bytes(hdr_bytes)
     hdr_bytes = bytes(hdr_bytes)
 
-    if algo_key in _CRC_WIDTH:
-        n = _crc_compute(algo_key, hdr_bytes)
-        return _hex_pad(n, _CRC_WIDTH[algo_key])
-
-    if CheckSumSupportAlt(algo_key, hashlib_guaranteed):
-        h = hashlib.new(algo_key)
-        h.update(hdr_bytes)
-        return h.hexdigest().lower()
+    if CheckSumSupport(algo_key, hashlib_guaranteed):
+         h = hashlib.new(algo_key)
+         h.update(hdr_bytes)
+         return h.hexdigest().lower()
 
     return "0"
 
-def GetFileChecksum(instr, checksumtype="crc32", encodedata=True, formatspecs=__file_format_dict__):
+def GetFileChecksum(inbytes, checksumtype="md5", encodedata=True, formatspecs=__file_format_dict__):
     """
     Accepts bytes/str/file-like.
       - Hashlib algos: streamed in 1 MiB chunks.
       - CRC algos (crc16_ansi/ccitt/x25/kermit, crc64_iso/ecma): streamed via CRCContext for file-like.
       - Falls back to one-shot for non-file-like inputs.
     """
-    checksumtype_norm = (checksumtype or "crc32").lower()
-    algo_key = _CRC_ALIASES.get(checksumtype_norm, checksumtype_norm)
+    algo_key = (checksumtype or "md5").lower()
 
     # file-like streaming
-    if hasattr(instr, "read"):
+    if hasattr(inbytes, "read"):
         # hashlib
-        if algo_key not in _CRC_SPECS and CheckSumSupportAlt(algo_key, hashlib_guaranteed):
+
+        if CheckSumSupport(algo_key, hashlib_guaranteed):
             h = hashlib.new(algo_key)
             while True:
-                chunk = instr.read(1 << 20)
+                chunk = inbytes.read(__filebuff_size__)
                 if not chunk:
                     break
                 if not isinstance(chunk, (bytes, bytearray, memoryview)):
@@ -4178,49 +3717,31 @@ def GetFileChecksum(instr, checksumtype="crc32", encodedata=True, formatspecs=__
                 h.update(chunk)
             return h.hexdigest().lower()
 
-        # CRC streaming via context
-        if algo_key in _CRC_SPECS:
-            ctx = crc_context_from_name(algo_key)
-            while True:
-                chunk = instr.read(1 << 20)
-                if not chunk:
-                    break
-                if not isinstance(chunk, (bytes, bytearray, memoryview)):
-                    chunk = bytes(bytearray(chunk))
-                ctx.update(chunk)
-            return ctx.hexdigest()
-
         # not known streaming algo: fallback to one-shot bytes
-        data = instr.read()
+        data = inbytes.read()
         if not isinstance(data, (bytes, bytearray, memoryview)):
             data = bytes(bytearray(data))
     else:
-        data = _to_bytes(instr) if (encodedata or not isinstance(instr, (bytes, bytearray, memoryview))) else instr
+        data = _to_bytes(inbytes) if (encodedata or not isinstance(inbytes, (bytes, bytearray, memoryview))) else inbytes
         data = bytes(data)
 
     # one-shot
-    if algo_key in _CRC_SPECS:
-        return crc_context_from_name(algo_key).update(data).hexdigest()
 
-    if algo_key in _CRC_WIDTH:
-        n = _crc_compute(algo_key, data)
-        return _hex_pad(n, _CRC_WIDTH[algo_key])
-
-    if CheckSumSupportAlt(algo_key, hashlib_guaranteed):
+    if CheckSumSupport(algo_key, hashlib_guaranteed):
         h = hashlib.new(algo_key)
         h.update(data)
         return h.hexdigest().lower()
 
     return "0"
 
-def ValidateHeaderChecksum(inlist=None, checksumtype="crc32", inchecksum="0", formatspecs=__file_format_dict__):
+def ValidateHeaderChecksum(inlist=None, checksumtype="md5", inchecksum="0", formatspecs=__file_format_dict__):
     calc = GetHeaderChecksum(inlist, checksumtype, True, formatspecs)
     want = (inchecksum or "0").strip().lower()
     if want.startswith("0x"):
         want = want[2:]
     return hmac.compare_digest(want, calc)
 
-def ValidateFileChecksum(infile, checksumtype="crc32", inchecksum="0", formatspecs=__file_format_dict__):
+def ValidateFileChecksum(infile, checksumtype="md5", inchecksum="0", formatspecs=__file_format_dict__):
     calc = GetFileChecksum(infile, checksumtype, True, formatspecs)
     want = (inchecksum or "0").strip().lower()
     if want.startswith("0x"):
@@ -4267,66 +3788,6 @@ def GetDataFromArrayAlt(structure, path, default=None):
     return element
 
 
-def GetHeaderChecksum(inlist=[], checksumtype="crc32", encodedata=True, formatspecs=__file_format_dict__):
-    fileheader = AppendNullBytes(inlist, formatspecs['format_delimiter']) if isinstance(
-        inlist, list) else AppendNullByte(inlist, formatspecs['format_delimiter'])
-    if encodedata and hasattr(fileheader, "encode"):
-        fileheader = fileheader.encode('UTF-8')
-    checksum_methods = {
-        "crc16": lambda data: format(crc16(data) & 0xffff, '04x').lower(),
-        "crc16_ansi": lambda data: format(crc16(data) & 0xffff, '04x').lower(),
-        "crc16_ibm": lambda data: format(crc16(data) & 0xffff, '04x').lower(),
-        "crc16_ccitt": lambda data: format(crc16_ccitt(data) & 0xffff, '04x').lower(),
-        "adler32": lambda data: format(zlib.adler32(data) & 0xffffffff, '08x').lower(),
-        "crc32": lambda data: format(crc32(data) & 0xffffffff, '08x').lower(),
-        "crc64_ecma": lambda data: format(crc64_ecma(data) & 0xffffffffffffffff, '016x').lower(),
-        "crc64": lambda data: format(crc64_iso(data) & 0xffffffffffffffff, '016x').lower(),
-        "crc64_iso": lambda data: format(crc64_iso(data) & 0xffffffffffffffff, '016x').lower(),
-    }
-    if checksumtype in checksum_methods:
-        return checksum_methods[checksumtype](fileheader)
-    elif CheckSumSupportAlt(checksumtype, hashlib_guaranteed):
-        checksumoutstr = hashlib.new(checksumtype)
-        checksumoutstr.update(fileheader)
-        return checksumoutstr.hexdigest().lower()
-    return format(0, 'x').lower()
-
-
-def GetFileChecksum(instr, checksumtype="crc32", encodedata=True, formatspecs=__file_format_dict__):
-    if encodedata and hasattr(instr, "encode"):
-        instr = instr.encode('UTF-8')
-    checksum_methods = {
-        "crc16": lambda data: format(crc16(data) & 0xffff, '04x').lower(),
-        "crc16_ansi": lambda data: format(crc16(data) & 0xffff, '04x').lower(),
-        "crc16_ibm": lambda data: format(crc16(data) & 0xffff, '04x').lower(),
-        "crc16_ccitt": lambda data: format(crc16_ccitt(data) & 0xffff, '04x').lower(),
-        "adler32": lambda data: format(zlib.adler32(data) & 0xffffffff, '08x').lower(),
-        "crc32": lambda data: format(crc32(data) & 0xffffffff, '08x').lower(),
-        "crc64_ecma": lambda data: format(crc64_ecma(data) & 0xffffffffffffffff, '016x').lower(),
-        "crc64": lambda data: format(crc64_iso(data) & 0xffffffffffffffff, '016x').lower(),
-        "crc64_iso": lambda data: format(crc64_iso(data) & 0xffffffffffffffff, '016x').lower(),
-    }
-    if checksumtype in checksum_methods:
-        return checksum_methods[checksumtype](instr)
-    elif CheckSumSupportAlt(checksumtype, hashlib_guaranteed):
-        checksumoutstr = hashlib.new(checksumtype)
-        checksumoutstr.update(instr)
-        return checksumoutstr.hexdigest().lower()
-    return format(0, 'x').lower()
-
-
-def ValidateHeaderChecksum(inlist=[], checksumtype="crc32", inchecksum="0", formatspecs=__file_format_dict__):
-    infileheadercshex = GetHeaderChecksum(
-        inlist, checksumtype, True, formatspecs).lower()
-    return inchecksum.lower() == infileheadercshex
-
-
-def ValidateFileChecksum(infile, checksumtype="crc32", inchecksum="0", formatspecs=__file_format_dict__):
-    catinfilecshex = GetFileChecksum(
-        infile, checksumtype, True, formatspecs).lower()
-    return inchecksum.lower() == catinfilecshex
-
-
 # ========= pushback-aware delimiter reader =========
 class _DelimiterReader(object):
     """
@@ -4659,7 +4120,6 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
     if(not hasattr(fp, "read")):
         return False
     delimiter = formatspecs['format_delimiter']
-    fheaderstart = fp.tell()
     if(formatspecs['new_style']):
         HeaderOut = ReadFileHeaderDataBySize(fp, delimiter)
     else:
@@ -4682,22 +4142,74 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
     fjsonchecksumtype = HeaderOut[30]
     fjsonchecksum = HeaderOut[31]
     fjsoncontent = {}
-    fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
-    if(fjsonsize > 0):
-        try:
-            fjsoncontent = json.loads(base64.b64decode(fprejsoncontent.encode("UTF-8")).decode("UTF-8"))
-        except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+    if(fjsontype=="json"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        if(fjsonsize > 0):
             try:
-                fjsoncontent = json.loads(fprejsoncontent)
+                fjsonrawcontent = base64.b64decode(fprejsoncontent.encode("UTF-8")).decode("UTF-8")
+                fjsoncontent = json.loads(base64.b64decode(fprejsoncontent.encode("UTF-8")).decode("UTF-8"))
             except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-                fprejsoncontent = ""
-                fjsoncontent = {}
-    else:
-        fprejsoncontent = ""
+                try:
+                    fjsonrawcontent = fprejsoncontent
+                    fjsoncontent = json.loads(fprejsoncontent)
+                except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                    fprejsoncontent = ""
+                    fjsonrawcontent = fprejsoncontent 
+                    fjsoncontent = {}
+        else:
+            fprejsoncontent = ""
+            fjsonrawcontent = fprejsoncontent 
+            fjsoncontent = {}
+    elif(testyaml and fjsontype == "yaml"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        if (fjsonsize > 0):
+            try:
+                # try base64 → utf-8 → YAML
+                fjsonrawcontent = base64.b64decode(fprejsoncontent.encode("UTF-8")).decode("UTF-8")
+                fjsoncontent = yaml.safe_load(fjsonrawcontent) or {}
+            except (binascii.Error, UnicodeDecodeError, yaml.YAMLError):
+                try:
+                    # fall back to treating the bytes as plain text YAML
+                    fjsonrawcontent = fprejsoncontent
+                    fjsoncontent = yaml.safe_load(fjsonrawcontent) or {}
+                except (UnicodeDecodeError, yaml.YAMLError):
+                    # final fallback: empty
+                    fprejsoncontent = ""
+                    fjsonrawcontent = fprejsoncontent
+                    fjsoncontent = {}
+        else:
+            fprejsoncontent = ""
+            fjsonrawcontent = fprejsoncontent
+            fjsoncontent = {}
+    elif(not testyaml and fjsontype == "yaml"):
         fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        fprejsoncontent = ""
+        fjsonrawcontent = fprejsoncontent
+    elif(fjsontype=="list"):
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        flisttmp = MkTempFile()
+        flisttmp.write(fprejsoncontent.encode())
+        flisttmp.seek(0)
+        fjsoncontent = ReadFileHeaderData(flisttmp, fjsonlen, delimiter)
+        flisttmp.close()
+        fjsonrawcontent = fjsoncontent
+        if(fjsonlen==1):
+            try:
+                fjsonrawcontent = base64.b64decode(fjsoncontent[0]).decode("UTF-8")
+                fjsoncontent = json.loads(base64.b64decode(fjsoncontent[0]).decode("UTF-8"))
+                fjsonlen = len(fjsoncontent)
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                try:
+                    fjsonrawcontent = fjsoncontent[0]
+                    fjsoncontent = json.loads(fjsoncontent[0])
+                except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                    pass
     fp.seek(len(delimiter), 1)
     jsonfcs = GetFileChecksum(fprejsoncontent, fjsonchecksumtype, True, formatspecs)
-    if(jsonfcs != fjsonchecksum and not skipchecksum):
+    if(not hmac.compare_digest(fjsonchecksum, jsonfcs) and not skipchecksum):
         VerbosePrintOut("File JSON Data Checksum Error with file " +
                         fname + " at offset " + str(fheaderstart))
         VerbosePrintOut("'" + fjsonchecksum + "' != " + "'" + jsonfcs + "'")
@@ -4711,8 +4223,6 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
                         fname + " at offset " + str(fheaderstart))
         VerbosePrintOut("'" + fcs + "' != " + "'" + newfcs + "'")
         return False
-    fhend = fp.tell() - 1
-    fcontentstart = fp.tell()
     fcontents = MkTempFile()
     if(fsize > 0 and not listonly):
         if(fcompression == "none" or fcompression == "" or fcompression == "auto"):
@@ -4726,9 +4236,9 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
             fp.seek(fcsize, 1)
     fcontents.seek(0, 0)
     newfccs = GetFileChecksum(
-        fcontents.read(), HeaderOut[-3].lower(), False, formatspecs)
+        fcontents, HeaderOut[-3].lower(), False, formatspecs)
     fcontents.seek(0, 0)
-    if(fccs != newfccs and not skipchecksum and not listonly):
+    if(not hmac.compare_digest(fccs, newfccs) and not skipchecksum and not listonly):
         VerbosePrintOut("File Content Checksum Error with file " +
                         fname + " at offset " + str(fcontentstart))
         VerbosePrintOut("'" + fccs + "' != " + "'" + newfccs + "'")
@@ -4741,10 +4251,9 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
             cfcontents = UncompressFileAlt(fcontents, formatspecs)
             cfcontents.seek(0, 0)
             fcontents = MkTempFile()
-            shutil.copyfileobj(cfcontents, fcontents)
+            shutil.copyfileobj(cfcontents, fcontents, length=__filebuff_size__)
             cfcontents.close()
             fcontents.seek(0, 0)
-    fcontentend = fp.tell()
     if(re.findall("^\\+([0-9]+)", fseeknextfile)):
         fseeknextasnum = int(fseeknextfile.replace("+", ""))
         if(abs(fseeknextasnum) == 0):
@@ -4852,6 +4361,33 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
             fprejsoncontent = ""
             fjsonrawcontent = fprejsoncontent 
             fjsoncontent = {}
+    elif(testyaml and fjsontype == "yaml"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        if (fjsonsize > 0):
+            try:
+                # try base64 → utf-8 → YAML
+                fjsonrawcontent = base64.b64decode(fprejsoncontent.encode("UTF-8")).decode("UTF-8")
+                fjsoncontent = yaml.safe_load(fjsonrawcontent) or {}
+            except (binascii.Error, UnicodeDecodeError, yaml.YAMLError):
+                try:
+                    # fall back to treating the bytes as plain text YAML
+                    fjsonrawcontent = fprejsoncontent
+                    fjsoncontent = yaml.safe_load(fjsonrawcontent) or {}
+                except (UnicodeDecodeError, yaml.YAMLError):
+                    # final fallback: empty
+                    fprejsoncontent = ""
+                    fjsonrawcontent = fprejsoncontent
+                    fjsoncontent = {}
+        else:
+            fprejsoncontent = ""
+            fjsonrawcontent = fprejsoncontent
+            fjsoncontent = {}
+    elif(not testyaml and fjsontype == "yaml"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        fprejsoncontent = ""
+        fjsonrawcontent = fprejsoncontent
     elif(fjsontype=="list"):
         fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
         flisttmp = MkTempFile()
@@ -4874,7 +4410,7 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
     fp.seek(len(delimiter), 1)
     fjend = fp.tell() - 1
     jsonfcs = GetFileChecksum(fprejsoncontent, fjsonchecksumtype, True, formatspecs)
-    if(jsonfcs != fjsonchecksum and not skipchecksum):
+    if(not hmac.compare_digest(fjsonchecksum, jsonfcs) and not skipchecksum):
         VerbosePrintOut("File JSON Data Checksum Error with file " +
                         fname + " at offset " + str(fheaderstart))
         VerbosePrintOut("'" + fjsonchecksum + "' != " + "'" + jsonfcs + "'")
@@ -4906,9 +4442,9 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
         pyhascontents = False
     fcontents.seek(0, 0)
     newfccs = GetFileChecksum(
-        version = "0.24.6" HeaderOut[-3].lower(), False, formatspecs)
+        fcontents, HeaderOut[-3].lower(), False, formatspecs)
     fcontents.seek(0, 0)
-    if(fccs != newfccs and not skipchecksum and not listonly):
+    if(not hmac.compare_digest(fccs, newfccs) and not skipchecksum and not listonly):
         VerbosePrintOut("File Content Checksum Error with file " +
                         fname + " at offset " + str(fcontentstart))
         VerbosePrintOut("'" + fccs + "' != " + "'" + newfccs + "'")
@@ -4922,11 +4458,11 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
                 fcontents, formatspecs)
             cfcontents.seek(0, 0)
             fcontents = MkTempFile()
-            shutil.copyfileobj(cfcontents, fcontents)
+            shutil.copyfileobj(cfcontents, fcontents, length=__filebuff_size__)
             cfcontents.close()
             fcontents.seek(0, 0)
             fccs = GetFileChecksum(
-                fcontents.read(), HeaderOut[-3].lower(), False, formatspecs)
+                fcontents, HeaderOut[-3].lower(), False, formatspecs)
     fcontentend = fp.tell()
     if(re.findall("^\\+([0-9]+)", fseeknextfile)):
         fseeknextasnum = int(fseeknextfile.replace("+", ""))
@@ -5038,6 +4574,33 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
             fprejsoncontent = ""
             fjsonrawcontent = fprejsoncontent 
             fjsoncontent = {}
+    elif(testyaml and fjsontype == "yaml"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        if (fjsonsize > 0):
+            try:
+                # try base64 → utf-8 → YAML
+                fjsonrawcontent = base64.b64decode(fprejsoncontent.encode("UTF-8")).decode("UTF-8")
+                fjsoncontent = yaml.safe_load(fjsonrawcontent) or {}
+            except (binascii.Error, UnicodeDecodeError, yaml.YAMLError):
+                try:
+                    # fall back to treating the bytes as plain text YAML
+                    fjsonrawcontent = fprejsoncontent
+                    fjsoncontent = yaml.safe_load(fjsonrawcontent) or {}
+                except (UnicodeDecodeError, yaml.YAMLError):
+                    # final fallback: empty
+                    fprejsoncontent = ""
+                    fjsonrawcontent = fprejsoncontent
+                    fjsoncontent = {}
+        else:
+            fprejsoncontent = ""
+            fjsonrawcontent = fprejsoncontent
+            fjsoncontent = {}
+    elif(not testyaml and fjsontype == "yaml"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        fprejsoncontent = ""
+        fjsonrawcontent = fprejsoncontent
     elif(fjsontype=="list"):
         fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
         flisttmp = MkTempFile()
@@ -5059,7 +4622,7 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
                     pass
     fp.seek(len(delimiter), 1)
     jsonfcs = GetFileChecksum(fprejsoncontent, fjsonchecksumtype, True, formatspecs)
-    if(jsonfcs != fjsonchecksum and not skipchecksum):
+    if(not hmac.compare_digest(fjsonchecksum, jsonfcs) and not skipchecksum):
         VerbosePrintOut("File JSON Data Checksum Error with file " +
                         fname + " at offset " + str(fheaderstart))
         VerbosePrintOut("'" + fjsonchecksum + "' != " + "'" + jsonfcs + "'")
@@ -5091,8 +4654,8 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
         pyhascontents = False
     fcontents.seek(0, 0)
     newfccs = GetFileChecksum(
-        fcontents.read(), HeaderOut[-3].lower(), False, formatspecs)
-    if(fccs != newfccs and not skipchecksum and not listonly):
+        fcontents, HeaderOut[-3].lower(), False, formatspecs)
+    if(not hmac.compare_digest(fccs, newfccs) and not skipchecksum and not listonly):
         VerbosePrintOut("File Content Checksum Error with file " +
                         fname + " at offset " + str(fcontentstart))
         VerbosePrintOut("'" + fccs + "' != " + "'" + newfccs + "'")
@@ -5106,11 +4669,11 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
                 fcontents, formatspecs)
             cfcontents.seek(0, 0)
             fcontents = MkTempFile()
-            shutil.copyfileobj(cfcontents, fcontents)
+            shutil.copyfileobj(cfcontents, fcontents, length=__filebuff_size__)
             cfcontents.close()
             fcontents.seek(0, 0)
             fccs = GetFileChecksum(
-                fcontents.read(), HeaderOut[-3].lower(), False, formatspecs)
+                fcontents, HeaderOut[-3].lower(), False, formatspecs)
     fcontentend = fp.tell()
     if(re.findall("^\\+([0-9]+)", fseeknextfile)):
         fseeknextasnum = int(fseeknextfile.replace("+", ""))
@@ -5144,9 +4707,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
     curloc = filestart
     try:
         fp.seek(0, 2)
-    except OSError:
-        SeekToEndOfFile(fp)
-    except ValueError:
+    except (OSError, ValueError):
         SeekToEndOfFile(fp)
     CatSize = fp.tell()
     CatSizeEnd = CatSize
@@ -5175,7 +4736,30 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
         VerbosePrintOut("'" + fprechecksum + "' != " +
                         "'" + newfcs + "'")
         return False
-    fnumfiles = int(inheader[4], 16)
+    fnumfiles = int(inheader[6], 16)
+    outfseeknextfile = inheaderdata[7]
+    fjsonsize = int(inheaderdata[10], 16)
+    fjsonchecksumtype = inheader[11]
+    fjsonchecksum = inheader[12]
+    fp.read(fjsonsize)
+    # Next seek directive
+    if(re.findall(r"^\+([0-9]+)", outfseeknextfile)):
+        fseeknextasnum = int(outfseeknextfile.replace("+", ""))
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 1)
+    elif(re.findall(r"^\-([0-9]+)", outfseeknextfile)):
+        fseeknextasnum = int(outfseeknextfile)
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 1)
+    elif(re.findall(r"^([0-9]+)", outfseeknextfile)):
+        fseeknextasnum = int(outfseeknextfile)
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 0)
+    else:
+        return False
     countnum = 0
     flist = []
     while(countnum < fnumfiles):
@@ -5195,9 +4779,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
     curloc = filestart
     try:
         fp.seek(0, 2)
-    except OSError:
-        SeekToEndOfFile(fp)
-    except ValueError:
+    except (OSError, ValueError):
         SeekToEndOfFile(fp)
     CatSize = fp.tell()
     CatSizeEnd = CatSize
@@ -5216,10 +4798,10 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
     else:
         inheader = ReadFileHeaderDataWoSize(
             fp, formatspecs['format_delimiter'])
-    fnumextrafieldsize = int(inheader[5], 16)
-    fnumextrafields = int(inheader[6], 16)
+    fnumextrafieldsize = int(inheader[13], 16)
+    fnumextrafields = int(inheader[14], 16)
     fextrafieldslist = []
-    extrastart = 7
+    extrastart = 15
     extraend = extrastart + fnumextrafields
     while(extrastart < extraend):
         fextrafieldslist.append(inheader[extrastart])
@@ -5238,7 +4820,106 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
     fnumfields = int(inheader[1], 16)
     fhencoding = inheader[2]
     fostype = inheader[3]
-    fnumfiles = int(inheader[4], 16)
+    fpythontype = inheader[4]
+    fprojectname = inheader[4]
+    fnumfiles = int(inheader[6], 16)
+    fseeknextfile = inheader[7]
+    fjsontype = inheader[8]
+    fjsonlen = int(inheader[9], 16)
+    fjsonsize = int(inheader[10], 16)
+    fjsonchecksumtype = inheader[11]
+    fjsonchecksum = inheader[12]
+    fjsoncontent = {}
+    fjstart = fp.tell()
+    if(fjsontype=="json"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        if(fjsonsize > 0):
+            try:
+                fjsonrawcontent = base64.b64decode(fprejsoncontent.encode("UTF-8")).decode("UTF-8")
+                fjsoncontent = json.loads(base64.b64decode(fprejsoncontent.encode("UTF-8")).decode("UTF-8"))
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                try:
+                    fjsonrawcontent = fprejsoncontent
+                    fjsoncontent = json.loads(fprejsoncontent)
+                except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                    fprejsoncontent = ""
+                    fjsonrawcontent = fprejsoncontent 
+                    fjsoncontent = {}
+        else:
+            fprejsoncontent = ""
+            fjsonrawcontent = fprejsoncontent 
+            fjsoncontent = {}
+    elif(testyaml and fjsontype == "yaml"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        if (fjsonsize > 0):
+            try:
+                # try base64 → utf-8 → YAML
+                fjsonrawcontent = base64.b64decode(fprejsoncontent.encode("UTF-8")).decode("UTF-8")
+                fjsoncontent = yaml.safe_load(fjsonrawcontent) or {}
+            except (binascii.Error, UnicodeDecodeError, yaml.YAMLError):
+                try:
+                    # fall back to treating the bytes as plain text YAML
+                    fjsonrawcontent = fprejsoncontent
+                    fjsoncontent = yaml.safe_load(fjsonrawcontent) or {}
+                except (UnicodeDecodeError, yaml.YAMLError):
+                    # final fallback: empty
+                    fprejsoncontent = ""
+                    fjsonrawcontent = fprejsoncontent
+                    fjsoncontent = {}
+        else:
+            fprejsoncontent = ""
+            fjsonrawcontent = fprejsoncontent
+            fjsoncontent = {}
+    elif(not testyaml and fjsontype == "yaml"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        fprejsoncontent = ""
+        fjsonrawcontent = fprejsoncontent
+    elif(fjsontype=="list"):
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        flisttmp = MkTempFile()
+        flisttmp.write(fprejsoncontent.encode())
+        flisttmp.seek(0)
+        fjsoncontent = ReadFileHeaderData(flisttmp, fjsonlen, delimiter)
+        flisttmp.close()
+        fjsonrawcontent = fjsoncontent
+        if(fjsonlen==1):
+            try:
+                fjsonrawcontent = base64.b64decode(fjsoncontent[0]).decode("UTF-8")
+                fjsoncontent = json.loads(base64.b64decode(fjsoncontent[0]).decode("UTF-8"))
+                fjsonlen = len(fjsoncontent)
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                try:
+                    fjsonrawcontent = fjsoncontent[0]
+                    fjsoncontent = json.loads(fjsoncontent[0])
+                except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                    pass
+    fjend = fp.tell()
+    if(re.findall("^\\+([0-9]+)", fseeknextfile)):
+        fseeknextasnum = int(fseeknextfile.replace("+", ""))
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 1)
+    elif(re.findall("^\\-([0-9]+)", fseeknextfile)):
+        fseeknextasnum = int(fseeknextfile)
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 1)
+    elif(re.findall("^([0-9]+)", fseeknextfile)):
+        fseeknextasnum = int(fseeknextfile)
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 0)
+    else:
+        return False
+    jsonfcs = GetFileChecksum(fprejsoncontent, fjsonchecksumtype, True, formatspecs)
+    if(not hmac.compare_digest(fjsonchecksum, jsonfcs) and not skipchecksum):
+        VerbosePrintOut("File JSON Data Checksum Error with file " +
+                        fname + " at offset " + str(fheaderstart))
+        VerbosePrintOut("'" + fjsonchecksum + "' != " + "'" + jsonfcs + "'")
+        return False
     fprechecksumtype = inheader[-2]
     fprechecksum = inheader[-1]
     headercheck = ValidateHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, fprechecksum, formatspecs)
@@ -5251,7 +4932,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
         return False
     formversions = re.search('(.*?)(\\d+)', formstring).groups()
     fcompresstype = ""
-    outlist = {'fnumfiles': fnumfiles, 'ffilestart': filestart, 'fformat': formversions[0], 'fcompression': fcompresstype, 'fencoding': fhencoding, 'fversion': formversions[1], 'fostype': fostype, 'fheadersize': fheadsize, 'fsize': CatSizeEnd, 'fnumfields': fnumfields + 2, 'fformatspecs': formatspecs, 'fchecksumtype': fprechecksumtype, 'fheaderchecksum': fprechecksum, 'frawheader': [formstring] + inheader, 'fextrafields': fnumextrafields, 'fextrafieldsize': fnumextrafieldsize, 'fextradata': fextrafieldslist, 'ffilelist': []}
+    outlist = {'fnumfiles': fnumfiles, 'ffilestart': filestart, 'fformat': formversions[0], 'fcompression': fcompresstype, 'fencoding': fhencoding, 'fversion': formversions[1], 'fostype': fostype, 'fprojectname': fprojectname, 'fimptype': fpythontype, 'fheadersize': fheadsize, 'fsize': CatSizeEnd, 'fnumfields': fnumfields + 2, 'fformatspecs': formatspecs, 'fseeknextfile': fseeknextfile, 'fchecksumtype': fprechecksumtype, 'fheaderchecksum': fprechecksum, 'fjsonchecksumtype': fjsonchecksumtype, 'fjsontype': fjsontype, 'fjsonlen': fjsonlen, 'fjsonsize': fjsonsize, 'fjsonrawdata': fjsonrawcontent, 'fjsondata': fjsoncontent, 'fjstart': fjstart, 'fjend': fjend, 'fjsonchecksum': fjsonchecksum, 'frawheader': [formstring] + inheader, 'fextrafields': fnumextrafields, 'fextrafieldsize': fnumextrafieldsize, 'fextradata': fextrafieldslist, 'ffilelist': []}
     if (seekstart < 0) or (seekstart > fnumfiles):
         seekstart = 0
     if (seekend == 0) or (seekend > fnumfiles) or (seekend < seekstart):
@@ -5279,7 +4960,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
             prejsoncontent = fp.read(prefjsonsize).decode("UTF-8")
             fp.seek(len(delimiter), 1)
             prejsonfcs = GetFileChecksum(prejsoncontent, prefjsonchecksumtype, True, formatspecs)
-            if(prejsonfcs != prefjsonchecksum and not skipchecksum):
+            if(not hmac.compare_digest(prefjsonchecksum, prejsonfcs) and not skipchecksum):
                 VerbosePrintOut("File JSON Data Checksum Error with file " +
                                 prefname + " at offset " + str(prefhstart))
                 VerbosePrintOut("'" + prefjsonchecksum + "' != " + "'" + prejsonfcs + "'")
@@ -5287,7 +4968,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
             prenewfcs = GetHeaderChecksum(
                 preheaderdata[:-2], preheaderdata[-4].lower(), True, formatspecs)
             prefcs = preheaderdata[-2]
-            if(prefcs != prenewfcs and not skipchecksum):
+            if(not hmac.compare_digest(prefcs, prenewfcs) and not skipchecksum):
                 VerbosePrintOut("File Header Checksum Error with file " +
                                  prefname + " at offset " + str(prefhstart))
                 VerbosePrintOut("'" + prefcs + "' != " +
@@ -5303,10 +4984,10 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
                 prefcontents.write(fp.read(prefsize))
                 prefcontents.seek(0, 0)
                 prenewfccs = GetFileChecksum(
-                    prefcontents.read(), preheaderdata[-3].lower(), False, formatspecs)
+                    prefcontents, preheaderdata[-3].lower(), False, formatspecs)
                 prefccs = preheaderdata[-1]
                 pyhascontents = True
-                if(prefccs != prenewfccs and not skipchecksum):
+                if(not hmac.compare_digest(prefccs, prenewfccs) and not skipchecksum):
                     VerbosePrintOut("File Content Checksum Error with file " +
                                     prefname + " at offset " + str(prefcontentstart))
                     VerbosePrintOut("'" + prefccs +
@@ -5352,9 +5033,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
     curloc = filestart
     try:
         fp.seek(0, 2)
-    except OSError:
-        SeekToEndOfFile(fp)
-    except ValueError:
+    except (OSError, ValueError):
         SeekToEndOfFile(fp)
     CatSize = fp.tell()
     CatSizeEnd = CatSize
@@ -5373,10 +5052,10 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
     else:
         inheader = ReadFileHeaderDataWoSize(
             fp, formatspecs['format_delimiter'])
-    fnumextrafieldsize = int(inheader[5], 16)
-    fnumextrafields = int(inheader[6], 16)
+    fnumextrafieldsize = int(inheader[13], 16)
+    fnumextrafields = int(inheader[14], 16)
     fextrafieldslist = []
-    extrastart = 7
+    extrastart = 15
     extraend = extrastart + fnumextrafields
     while(extrastart < extraend):
         fextrafieldslist.append(inheader[extrastart])
@@ -5393,9 +5072,40 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
     formversion = re.findall("([\\d]+)", formstring)
     fheadsize = int(inheader[0], 16)
     fnumfields = int(inheader[1], 16)
-    fhencoding = inheader[2]
-    fostype = inheader[3]
-    fnumfiles = int(inheader[4], 16)
+    fnumfiles = int(inheader[6], 16)
+    fseeknextfile = inheaderdata[7]
+    fjsontype = int(inheader[8], 16)
+    fjsonlen = int(inheader[9], 16)
+    fjsonsize = int(inheader[10], 16)
+    fjsonchecksumtype = inheader[11]
+    fjsonchecksum = inheader[12]
+    fjsoncontent = {}
+    fjstart = fp.tell()
+    fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+    fjend = fp.tell()
+    if(re.findall("^\\+([0-9]+)", fseeknextfile)):
+        fseeknextasnum = int(fseeknextfile.replace("+", ""))
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 1)
+    elif(re.findall("^\\-([0-9]+)", fseeknextfile)):
+        fseeknextasnum = int(fseeknextfile)
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 1)
+    elif(re.findall("^([0-9]+)", fseeknextfile)):
+        fseeknextasnum = int(fseeknextfile)
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 0)
+    else:
+        return False
+    jsonfcs = GetFileChecksum(fprejsoncontent, fjsonchecksumtype, True, formatspecs)
+    if(not hmac.compare_digest(fjsonchecksum, jsonfcs) and not skipchecksum):
+        VerbosePrintOut("File JSON Data Checksum Error with file " +
+                        fname + " at offset " + str(fheaderstart))
+        VerbosePrintOut("'" + fjsonchecksum + "' != " + "'" + jsonfcs + "'")
+        return False
     fprechecksumtype = inheader[-2]
     fprechecksum = inheader[-1]
     headercheck = ValidateHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, fprechecksum, formatspecs)
@@ -5441,7 +5151,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
             prefprejsoncontent = fp.read(prefjsonsize).decode("UTF-8")
             fp.seek(len(delimiter), 1)
             prejsonfcs = GetFileChecksum(prefprejsoncontent, prefjsonchecksumtype, True, formatspecs)
-            if(prejsonfcs != prefjsonchecksum and not skipchecksum):
+            if(not hmac.compare_digest(prefjsonchecksum, prejsonfcs) and not skipchecksum):
                 VerbosePrintOut("File JSON Data Checksum Error with file " +
                                 prefname + " at offset " + str(prefhstart))
                 VerbosePrintOut("'" + prefjsonchecksum + "' != " + "'" + prejsonfcs + "'")
@@ -5449,7 +5159,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
             prenewfcs = GetHeaderChecksum(
                 preheaderdata[:-2], preheaderdata[-4].lower(), True, formatspecs)
             prefcs = preheaderdata[-2]
-            if(prefcs != prenewfcs and not skipchecksum):
+            if(not hmac.compare_digest(prefcs, prenewfcs) and not skipchecksum):
                 VerbosePrintOut("File Header Checksum Error with file " +
                                 prefname + " at offset " + str(prefhstart))
                 VerbosePrintOut("'" + prefcs + "' != " +
@@ -5470,7 +5180,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
                     prefcontents, preheaderdata[-3].lower(), False, formatspecs)
                 prefccs = preheaderdata[-1]
                 pyhascontents = True
-                if(prefccs != prenewfccs and not skipchecksum):
+                if(not hmac.compare_digest(prefccs, prenewfccs) and not skipchecksum):
                     VerbosePrintOut("File Content Checksum Error with file " +
                                     prefname + " at offset " + str(prefcontentstart))
                     VerbosePrintOut("'" + prefccs +
@@ -5511,24 +5221,17 @@ def ReadInFileWithContentToArray(infile, fmttype="auto", filestart=0, seekstart=
         fp = infile
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
         currentfilepos = fp.tell()
     elif(infile == "-"):
         fp = MkTempFile()
-        if(hasattr(sys.stdin, "buffer")):
-            shutil.copyfileobj(sys.stdin.buffer, fp)
-        else:
-            shutil.copyfileobj(sys.stdin, fp)
+        shutil.copyfileobj(PY_STDIN_BUF, fp, length=__filebuff_size__)
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
@@ -5538,9 +5241,7 @@ def ReadInFileWithContentToArray(infile, fmttype="auto", filestart=0, seekstart=
         fp.write(infile)
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
@@ -5549,9 +5250,7 @@ def ReadInFileWithContentToArray(infile, fmttype="auto", filestart=0, seekstart=
         fp = download_file_from_internet_file(infile)
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
@@ -5559,9 +5258,7 @@ def ReadInFileWithContentToArray(infile, fmttype="auto", filestart=0, seekstart=
     elif(isinstance(infile, FileLikeAdapter)):
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
@@ -5571,9 +5268,7 @@ def ReadInFileWithContentToArray(infile, fmttype="auto", filestart=0, seekstart=
         fp = open(infile, "rb")
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
@@ -5624,9 +5319,7 @@ def ReadInFileWithContentToArray(infile, fmttype="auto", filestart=0, seekstart=
             currentinfilepos = infp.tell()
             try:
                 infp.seek(0, 2)
-            except OSError:
-                SeekToEndOfFile(infp)
-            except ValueError:
+            except (OSError, ValueError):
                 SeekToEndOfFile(infp)
             outinfsize = infp.tell()
             infp.seek(currentinfilepos, 0)
@@ -5665,24 +5358,17 @@ def ReadInFileWithContentToList(infile, fmttype="auto", filestart=0, seekstart=0
         fp = infile
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
         currentfilepos = fp.tell()
     elif(infile == "-"):
         fp = MkTempFile()
-        if(hasattr(sys.stdin, "buffer")):
-            shutil.copyfileobj(sys.stdin.buffer, fp)
-        else:
-            shutil.copyfileobj(sys.stdin, fp)
+        shutil.copyfileobj(PY_STDIN_BUF, fp, length=__filebuff_size__)
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
@@ -5692,9 +5378,7 @@ def ReadInFileWithContentToList(infile, fmttype="auto", filestart=0, seekstart=0
         fp.write(infile)
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
@@ -5703,9 +5387,7 @@ def ReadInFileWithContentToList(infile, fmttype="auto", filestart=0, seekstart=0
         fp = download_file_from_internet_file(infile)
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
@@ -5713,9 +5395,7 @@ def ReadInFileWithContentToList(infile, fmttype="auto", filestart=0, seekstart=0
     elif(isinstance(infile, FileLikeAdapter)):
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
@@ -5725,9 +5405,7 @@ def ReadInFileWithContentToList(infile, fmttype="auto", filestart=0, seekstart=0
         fp = open(infile, "rb")
         try:
             fp.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(fp)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(fp)
         outfsize = fp.tell()
         fp.seek(filestart, 0)
@@ -5778,9 +5456,7 @@ def ReadInFileWithContentToList(infile, fmttype="auto", filestart=0, seekstart=0
             currentinfilepos = infp.tell()
             try:
                 infp.seek(0, 2)
-            except OSError:
-                SeekToEndOfFile(infp)
-            except ValueError:
+            except (OSError, ValueError):
                 SeekToEndOfFile(infp)
             outinfsize = infp.tell()
             infp.seek(currentinfilepos, 0)
@@ -5865,12 +5541,7 @@ def AppendNullBytes(indata=None, delimiter=__file_format_dict__['format_delimite
 def _hex_lower(n):
     return format(int(n), 'x').lower()
 
-def AppendFileHeader(fp,
-                     numfiles,
-                     fencoding,
-                     extradata=None,
-                     checksumtype="crc32",
-                     formatspecs=__file_format_dict__):
+def AppendFileHeader(fp, numfiles, fencoding, extradata=[], jsondata={}, checksumtype=["md5", "md5"], formatspecs=__file_format_dict__):
     """
     Build and write the archive file header.
     Returns the same file-like 'fp' on success, or False on failure.
@@ -5918,24 +5589,44 @@ def AppendFileHeader(fp,
     # 4) core header fields before checksum:
     #    tmpoutlenhex, fencoding, platform.system(), fnumfiles
     fnumfiles_hex = _hex_lower(numfiles)
-
+    fjsontype = "json"
+    if(len(jsondata) > 0):
+        try:
+            fjsoncontent = json.dumps(jsondata, separators=(',', ':')).encode("UTF-8")
+        except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+            fjsoncontent = "".encode("UTF-8")
+    else:
+        fjsoncontent = "".encode("UTF-8")
+    fjsonsize = format(len(fjsoncontent), 'x').lower()
+    fjsonlen = format(len(jsondata), 'x').lower()
+    tmpoutlist = []
+    tmpoutlist.append(fjsontype)
+    tmpoutlist.append(fjsonlen)
+    tmpoutlist.append(fjsonsize)
+    if(len(jsondata) > 0):
+        tmpoutlist.append(checksumtype[1])
+        tmpoutlist.append(GetFileChecksum(fjsoncontent, checksumtype[1], True, formatspecs))
+    else:
+        tmpoutlist.append("none")
+        tmpoutlist.append(GetFileChecksum(fjsoncontent, "none", True, formatspecs))
     # Preserve your original "tmpoutlen" computation exactly
-    tmpoutlist = [extrasizelen, extrafields]   # you used this as a separate list
-    tmpoutlen = 3 + len(tmpoutlist) + len(xlist) + 2
+    tmpoutlist.append(extrasizelen)
+    tmpoutlist.append(extrafields)
+    tmpoutlen = 8 + len(tmpoutlist) + len(xlist)
     tmpoutlenhex = _hex_lower(tmpoutlen)
 
     # Serialize the first group
-    fnumfilesa = AppendNullBytes([tmpoutlenhex, fencoding, platform.system(), fnumfiles_hex], delimiter)
+    fnumfilesa = AppendNullBytes([tmpoutlenhex, fencoding, platform.system(), py_implementation, __program_name__, fnumfiles_hex, "+"+str(len(formatspecs['format_delimiter']))], delimiter)
     # Append tmpoutlist
     fnumfilesa += AppendNullBytes(tmpoutlist, delimiter)
     # Append extradata items if any
     if xlist:
         fnumfilesa += AppendNullBytes(xlist, delimiter)
     # Append checksum type
-    fnumfilesa += AppendNullByte(checksumtype, delimiter)
+    fnumfilesa += AppendNullByte(checksumtype[0], delimiter)
 
     # 5) inner checksum over fnumfilesa
-    outfileheadercshex = GetFileChecksum(fnumfilesa, checksumtype, True, formatspecs)
+    outfileheadercshex = GetFileChecksum(fnumfilesa, checksumtype[0], True, formatspecs)
     tmpfileoutstr = fnumfilesa + AppendNullByte(outfileheadercshex, delimiter)
 
     # 6) size of (tmpfileoutstr) excluding one delimiter, per your original math
@@ -5948,7 +5639,7 @@ def AppendFileHeader(fp,
         + fnumfilesa
     )
 
-    outfileheadercshex = GetFileChecksum(fnumfilesa, checksumtype, True, formatspecs)
+    outfileheadercshex = GetFileChecksum(fnumfilesa, checksumtype[0], True, formatspecs)
     fnumfilesa += AppendNullByte(outfileheadercshex, delimiter)
 
     # 8) final total size field (again per your original logic)
@@ -5956,10 +5647,11 @@ def AppendFileHeader(fp,
     formheaersizestr = AppendNullByte(formheaersize, delimiter)  # computed but not appended in original
     # Note: you computed 'formheaersizestr' but didn’t append it afterward in the original either.
     # Keeping that behavior for compatibility.
-
+    nullstrecd = formatspecs['format_delimiter'].encode('UTF-8')
+    outfileout = fnumfilesa + fjsoncontent + nullstrecd
     # 9) write and try to sync
     try:
-        fp.write(fnumfilesa)
+        fp.write(outfileout)
     except (OSError, io.UnsupportedOperation):
         return False
 
@@ -5980,21 +5672,21 @@ def AppendFileHeader(fp,
     return fp
 
 
-def MakeEmptyFilePointer(fp, fmttype=__file_format_default__, checksumtype="crc32", formatspecs=__file_format_multi_dict__):
+def MakeEmptyFilePointer(fp, fmttype=__file_format_default__, checksumtype=["md5", "md5"], formatspecs=__file_format_multi_dict__):
     if(IsNestedDict(formatspecs) and fmttype in formatspecs):
         formatspecs = formatspecs[fmttype]
     elif(IsNestedDict(formatspecs) and fmttype not in formatspecs):
         fmttype = __file_format_default__
         formatspecs = formatspecs[fmttype]
-    AppendFileHeader(fp, 0, "UTF-8", [], checksumtype, formatspecs)
+    AppendFileHeader(fp, 0, "UTF-8", [], {}, checksumtype, formatspecs)
     return fp
 
 
-def MakeEmptyCatFilePointer(fp, fmttype=__file_format_default__, checksumtype="crc32", formatspecs=__file_format_multi_dict__):
+def MakeEmptyCatFilePointer(fp, fmttype=__file_format_default__, checksumtype=["md5", "md5"], formatspecs=__file_format_multi_dict__):
     return MakeEmptyFilePointer(fp, fmttype, checksumtype, formatspecs)
 
 
-def MakeEmptyFile(outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype="crc32", formatspecs=__file_format_multi_dict__, returnfp=False):
+def MakeEmptyFile(outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5"], formatspecs=__file_format_multi_dict__, returnfp=False):
     if(IsNestedDict(formatspecs) and fmttype=="auto" and 
         (outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write"))):
         get_in_ext = os.path.splitext(outfile)
@@ -6035,7 +5727,7 @@ def MakeEmptyFile(outfile, fmttype="auto", compression="auto", compresswholefile
             fp = CompressOpenFile(outfile, compresswholefile, compressionlevel)
         except PermissionError:
             return False
-    AppendFileHeader(fp, 0, "UTF-8", [], checksumtype, formatspecs)
+    AppendFileHeader(fp, 0, "UTF-8", [], {}, checksumtype, formatspecs)
     if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
         fp = CompressOpenFileAlt(
             fp, compression, compressionlevel, compressionuselist, formatspecs)
@@ -6043,18 +5735,11 @@ def MakeEmptyFile(outfile, fmttype="auto", compression="auto", compresswholefile
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
     if(outfile == "-"):
         fp.seek(0, 0)
-        if(hasattr(sys.stdout, "buffer")):
-            shutil.copyfileobj(fp, sys.stdout.buffer)
-        else:
-            shutil.copyfileobj(fp, sys.stdout)
+        shutil.copyfileobj(fp, PY_STDOUT_BUF, length=__filebuff_size__)
     elif(outfile is None):
         fp.seek(0, 0)
         outvar = fp.read()
@@ -6073,11 +5758,11 @@ def MakeEmptyFile(outfile, fmttype="auto", compression="auto", compresswholefile
         return True
 
 
-def MakeEmptyCatFile(outfile, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype="crc32", formatspecs=__file_format_dict__, returnfp=False):
+def MakeEmptyCatFile(outfile, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5"], formatspecs=__file_format_dict__, returnfp=False):
     return MakeEmptyFile(outfile, "auto", compression, compresswholefile, compressionlevel, compressionuselist, checksumtype, formatspecs, returnfp)
 
 
-def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, filecontent="", checksumtype=["crc32", "crc32", "crc32"], formatspecs=__file_format_dict__):
+def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, filecontent="", checksumtype=["md5", "md5", "md5"], formatspecs=__file_format_dict__):
     if(not hasattr(fp, "write")):
         return False
     if (isinstance(extradata, dict) or IsNestedDictAlt(extradata)) and len(extradata) > 0:
@@ -6156,26 +5841,21 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
         fp.flush()
         if(hasattr(os, "sync")):
             os.fsync(fp.fileno())
-    except io.UnsupportedOperation:
-        pass
-    except AttributeError:
-        pass
-    except OSError:
+    except (io.UnsupportedOperation, AttributeError, OSError):
         pass
     return fp
 
-
-def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False):
+def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False):
     if(not hasattr(fp, "write")):
         return False
     advancedlist = formatspecs['use_advanced_list']
     altinode = formatspecs['use_alt_inode']
     if(verbose):
         logging.basicConfig(format="%(message)s",
-                            stream=sys.stdout, level=logging.DEBUG)
+                            stream=PY_STDOUT_TEXT, level=logging.DEBUG)
     infilelist = []
     if(infiles == "-"):
-        for line in sys.stdin:
+        for line in PY_STDIN_TEXT:
             infilelist.append(line.strip())
         infilelist = list(filter(None, infilelist))
     elif(infiles != "-" and dirlistfromtxt and os.path.exists(infiles) and (os.path.isfile(infiles) or infiles == os.devnull)):
@@ -6214,16 +5894,12 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
     inodetoforminode = {}
     numfiles = int(len(GetDirList))
     fnumfiles = format(numfiles, 'x').lower()
-    AppendFileHeader(fp, numfiles, "UTF-8", [], checksumtype[0], formatspecs)
+    AppendFileHeader(fp, numfiles, "UTF-8", [], {}, [checksumtype[0], checksumtype[1]], formatspecs)
     try:
         fp.flush()
         if(hasattr(os, "sync")):
             os.fsync(fp.fileno())
-    except io.UnsupportedOperation:
-        pass
-    except AttributeError:
-        pass
-    except OSError:
+    except (io.UnsupportedOperation, AttributeError, OSError):
         pass
     FullSizeFilesAlt = 0
     for curfname in GetDirList:
@@ -6373,7 +6049,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
         curcompression = "none"
         if not followlink and ftype in data_types:
             with open(fname, "rb") as fpc:
-                copy_opaque(fpc, fcontents, bufsize=1 << 20)  # 1 MiB chunks, opaque copy
+                shutil.copyfileobj(fpc, fcontents, length=__filebuff_size__)
                 typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
                 fcontents.seek(0, 0)
                 if(typechecktest is not False):
@@ -6391,7 +6067,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
                         while(ilmin < ilsize):
                             cfcontents = MkTempFile()
                             fcontents.seek(0, 0)
-                            shutil.copyfileobj(fcontents, cfcontents)
+                            shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                             fcontents.seek(0, 0)
                             cfcontents.seek(0, 0)
                             cfcontents = CompressOpenFileAlt(
@@ -6407,7 +6083,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
                         curcompression = compressionuselist[ilcmin]
                     fcontents.seek(0, 0)
                     cfcontents = MkTempFile()
-                    shutil.copyfileobj(fcontents, cfcontents)
+                    shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                     cfcontents.seek(0, 0)
                     cfcontents = CompressOpenFileAlt(
                         cfcontents, curcompression, compressionlevel, compressionuselist, formatspecs)
@@ -6423,7 +6099,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
                 return False
             flstatinfo = os.stat(flinkname)
             with open(flinkname, "rb") as fpc:
-                copy_opaque(fpc, fcontents, bufsize=1 << 20)  # 1 MiB chunks, opaque copy
+                shutil.copyfileobj(fpc, fcontents, length=__filebuff_size__)
                 typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
                 fcontents.seek(0, 0)
                 if(typechecktest is not False):
@@ -6441,7 +6117,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
                         while(ilmin < ilsize):
                             cfcontents = MkTempFile()
                             fcontents.seek(0, 0)
-                            shutil.copyfileobj(fcontents, cfcontents)
+                            shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                             fcontents.seek(0, 0)
                             cfcontents.seek(0, 0)
                             cfcontents = CompressOpenFileAlt(
@@ -6457,7 +6133,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
                         curcompression = compressionuselist[ilcmin]
                     fcontents.seek(0, 0)
                     cfcontents = MkTempFile()
-                    shutil.copyfileobj(fcontents, cfcontents)
+                    shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                     cfcontents.seek(0, 0)
                     cfcontents = CompressOpenFileAlt(
                         cfcontents, curcompression, compressionlevel, compressionuselist, formatspecs)
@@ -6475,25 +6151,21 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
         tmpoutlist = [ftypehex, fencoding, fcencoding, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
                       fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
         AppendFileHeaderWithContent(
-            fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[1], checksumtype[2], checksumtype[3]], formatspecs)
+            fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[2], checksumtype[3], checksumtype[4]], formatspecs)
         try:
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
     return fp
 
-def AppendFilesWithContentFromTarFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False):
+def AppendFilesWithContentFromTarFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False):
     if(not hasattr(fp, "write")):
         return False
     if(verbose):
         logging.basicConfig(format="%(message)s",
-                            stream=sys.stdout, level=logging.DEBUG)
+                            stream=PY_STDOUT_TEXT, level=logging.DEBUG)
     curinode = 0
     curfid = 0
     inodelist = []
@@ -6502,10 +6174,7 @@ def AppendFilesWithContentFromTarFile(infile, fp, extradata=[], jsondata={}, com
     inodetoforminode = {}
     if(infile == "-"):
         infile = MkTempFile()
-        if(hasattr(sys.stdin, "buffer")):
-            shutil.copyfileobj(sys.stdin.buffer, infile)
-        else:
-            shutil.copyfileobj(sys.stdin, infile)
+        shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
         if(not infile):
             return False
@@ -6560,16 +6229,12 @@ def AppendFilesWithContentFromTarFile(infile, fp, extradata=[], jsondata={}, com
     except FileNotFoundError:
         return False
     numfiles = int(len(tarfp.getmembers()))
-    AppendFileHeader(fp, numfiles, "UTF-8", [], checksumtype[0], formatspecs)
+    AppendFileHeader(fp, numfiles, "UTF-8", [], {}, [checksumtype[0], checksumtype[1]], formatspecs)
     try:
         fp.flush()
         if(hasattr(os, "sync")):
             os.fsync(fp.fileno())
-    except io.UnsupportedOperation:
-        pass
-    except AttributeError:
-        pass
-    except OSError:
+    except (io.UnsupportedOperation, AttributeError, OSError):
         pass
     for member in sorted(tarfp.getmembers(), key=lambda x: x.name):
         fencoding = "UTF-8"
@@ -6655,7 +6320,7 @@ def AppendFilesWithContentFromTarFile(infile, fp, extradata=[], jsondata={}, com
         curcompression = "none"
         if ftype in data_types:
             fpc = tarfp.extractfile(member)
-            copy_opaque(fpc, fcontents, bufsize=1 << 20)  # 1 MiB chunks, opaque copy
+            shutil.copyfileobj(fpc, fcontents, length=__filebuff_size__)
             fpc.close()
             typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
             fcontents.seek(0, 0)
@@ -6674,7 +6339,7 @@ def AppendFilesWithContentFromTarFile(infile, fp, extradata=[], jsondata={}, com
                     while(ilmin < ilsize):
                         cfcontents = MkTempFile()
                         fcontents.seek(0, 0)
-                        shutil.copyfileobj(fcontents, cfcontents)
+                        shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                         fcontents.seek(0, 0)
                         cfcontents.seek(0, 0)
                         cfcontents = CompressOpenFileAlt(
@@ -6690,7 +6355,7 @@ def AppendFilesWithContentFromTarFile(infile, fp, extradata=[], jsondata={}, com
                     curcompression = compressionuselist[ilcmin]
                 fcontents.seek(0, 0)
                 cfcontents = MkTempFile()
-                shutil.copyfileobj(fcontents, cfcontents)
+                shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                 cfcontents.seek(0, 0)
                 cfcontents = CompressOpenFileAlt(
                     cfcontents, curcompression, compressionlevel, compressionuselist, formatspecs)
@@ -6708,26 +6373,22 @@ def AppendFilesWithContentFromTarFile(infile, fp, extradata=[], jsondata={}, com
         tmpoutlist = [ftypehex, fencoding, fcencoding, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
                       fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
         AppendFileHeaderWithContent(
-            fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[1], checksumtype[2], checksumtype[3]], formatspecs)
+            fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[2], checksumtype[3], checksumtype[4]], formatspecs)
         try:
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
         fcontents.close()
     return fp
 
-def AppendFilesWithContentFromZipFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False):
+def AppendFilesWithContentFromZipFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False):
     if(not hasattr(fp, "write")):
         return False
     if(verbose):
         logging.basicConfig(format="%(message)s",
-                            stream=sys.stdout, level=logging.DEBUG)
+                            stream=PY_STDOUT_TEXT, level=logging.DEBUG)
     curinode = 0
     curfid = 0
     inodelist = []
@@ -6736,10 +6397,7 @@ def AppendFilesWithContentFromZipFile(infile, fp, extradata=[], jsondata={}, com
     inodetoforminode = {}
     if(infile == "-"):
         infile = MkTempFile()
-        if(hasattr(sys.stdin, "buffer")):
-            shutil.copyfileobj(sys.stdin.buffer, infile)
-        else:
-            shutil.copyfileobj(sys.stdin, infile)
+        shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
         if(not infile):
             return False
@@ -6764,16 +6422,12 @@ def AppendFilesWithContentFromZipFile(infile, fp, extradata=[], jsondata={}, com
     if(ziptest):
         VerbosePrintOut("Bad file found!")
     numfiles = int(len(zipfp.infolist()))
-    AppendFileHeader(fp, numfiles, "UTF-8", [], checksumtype[0], formatspecs)
+    AppendFileHeader(fp, numfiles, "UTF-8", [], {}, [checksumtype[0], checksumtype[1]], formatspecs)
     try:
         fp.flush()
         if(hasattr(os, "sync")):
             os.fsync(fp.fileno())
-    except io.UnsupportedOperation:
-        pass
-    except AttributeError:
-        pass
-    except OSError:
+    except (io.UnsupportedOperation, AttributeError, OSError):
         pass
     for member in sorted(zipfp.infolist(), key=lambda x: x.filename):
         fencoding = "UTF-8"
@@ -6858,24 +6512,18 @@ def AppendFilesWithContentFromZipFile(infile, fp, extradata=[], jsondata={}, com
         fcsize = format(int(0), 'x').lower()
         try:
             fuid = format(int(os.getuid()), 'x').lower()
-        except AttributeError:
-            fuid = format(int(0), 'x').lower()
-        except KeyError:
+        except (KeyError, AttributeError):
             fuid = format(int(0), 'x').lower()
         try:
             fgid = format(int(os.getgid()), 'x').lower()
-        except AttributeError:
-            fgid = format(int(0), 'x').lower()
-        except KeyError:
+        except (KeyError, AttributeError):
             fgid = format(int(0), 'x').lower()
         try:
             import pwd
             try:
                 userinfo = pwd.getpwuid(os.getuid())
                 funame = userinfo.pw_name
-            except KeyError:
-                funame = ""
-            except AttributeError:
+            except (KeyError, AttributeError):
                 funame = ""
         except ImportError:
             funame = ""
@@ -6885,9 +6533,7 @@ def AppendFilesWithContentFromZipFile(infile, fp, extradata=[], jsondata={}, com
             try:
                 groupinfo = grp.getgrgid(os.getgid())
                 fgname = groupinfo.gr_name
-            except KeyError:
-                fgname = ""
-            except AttributeError:
+            except (KeyError, AttributeError):
                 fgname = ""
         except ImportError:
             fgname = ""
@@ -6910,7 +6556,7 @@ def AppendFilesWithContentFromZipFile(infile, fp, extradata=[], jsondata={}, com
                     while(ilmin < ilsize):
                         cfcontents = MkTempFile()
                         fcontents.seek(0, 0)
-                        shutil.copyfileobj(fcontents, cfcontents)
+                        shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                         fcontents.seek(0, 0)
                         cfcontents.seek(0, 0)
                         cfcontents = CompressOpenFileAlt(
@@ -6923,7 +6569,7 @@ def AppendFilesWithContentFromZipFile(infile, fp, extradata=[], jsondata={}, com
                     curcompression = compressionuselist[ilcmin]
                 fcontents.seek(0, 0)
                 cfcontents = MkTempFile()
-                shutil.copyfileobj(fcontents, cfcontents)
+                shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                 cfcontents.seek(0, 0)
                 cfcontents = CompressOpenFileAlt(
                     cfcontents, curcompression, compressionlevel, compressionuselist, formatspecs)
@@ -6941,31 +6587,26 @@ def AppendFilesWithContentFromZipFile(infile, fp, extradata=[], jsondata={}, com
         tmpoutlist = [ftypehex, fencoding, fcencoding, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
                       fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
         AppendFileHeaderWithContent(
-            fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[1], checksumtype[2], checksumtype[3]], formatspecs)
+            fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[2], checksumtype[3], checksumtype[4]], formatspecs)
         try:
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
         fcontents.close()
     return fp
 
 if(not rarfile_support):
-    def AppendFilesWithContentFromRarFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False):
+    def AppendFilesWithContentFromRarFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False):
         return False
-
-if(rarfile_support):
-    def AppendFilesWithContentFromRarFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False):
+else:       
+    def AppendFilesWithContentFromRarFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False):
         if(not hasattr(fp, "write")):
             return False
         if(verbose):
             logging.basicConfig(format="%(message)s",
-                                stream=sys.stdout, level=logging.DEBUG)
+                                stream=PY_STDOUT_TEXT, level=logging.DEBUG)
         curinode = 0
         curfid = 0
         inodelist = []
@@ -6981,26 +6622,18 @@ if(rarfile_support):
         if(rartest):
             VerbosePrintOut("Bad file found!")
         numfiles = int(len(rarfp.infolist()))
-        AppendFileHeader(fp, numfiles, "UTF-8", [], checksumtype[0], formatspecs)
+        AppendFileHeader(fp, numfiles, "UTF-8", [], {}, [checksumtype[0], checksumtype[1]], formatspecs)
         try:
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
         try:
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
         for member in sorted(rarfp.infolist(), key=lambda x: x.filename):
             is_unix = False
@@ -7109,24 +6742,18 @@ if(rarfile_support):
                     int(stat.S_IFMT(int(stat.S_IFDIR | 0x1ff))), 'x').lower()
             try:
                 fuid = format(int(os.getuid()), 'x').lower()
-            except AttributeError:
-                fuid = format(int(0), 'x').lower()
-            except KeyError:
+            except (KeyError, AttributeError):
                 fuid = format(int(0), 'x').lower()
             try:
                 fgid = format(int(os.getgid()), 'x').lower()
-            except AttributeError:
-                fgid = format(int(0), 'x').lower()
-            except KeyError:
+            except (KeyError, AttributeError):
                 fgid = format(int(0), 'x').lower()
             try:
                 import pwd
                 try:
                     userinfo = pwd.getpwuid(os.getuid())
                     funame = userinfo.pw_name
-                except KeyError:
-                    funame = ""
-                except AttributeError:
+                except (KeyError, AttributeError):
                     funame = ""
             except ImportError:
                 funame = ""
@@ -7136,9 +6763,7 @@ if(rarfile_support):
                 try:
                     groupinfo = grp.getgrgid(os.getgid())
                     fgname = groupinfo.gr_name
-                except KeyError:
-                    fgname = ""
-                except AttributeError:
+                except (KeyError, AttributeError):
                     fgname = ""
             except ImportError:
                 fgname = ""
@@ -7161,7 +6786,7 @@ if(rarfile_support):
                         while(ilmin < ilsize):
                             cfcontents = MkTempFile()
                             fcontents.seek(0, 0)
-                            shutil.copyfileobj(fcontents, cfcontents)
+                            shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                             fcontents.seek(0, 0)
                             cfcontents.seek(0, 0)
                             cfcontents = CompressOpenFileAlt(
@@ -7177,7 +6802,7 @@ if(rarfile_support):
                         curcompression = compressionuselist[ilcmin]
                     fcontents.seek(0, 0)
                     cfcontents = MkTempFile()
-                    shutil.copyfileobj(fcontents, cfcontents)
+                    shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                     cfcontents.seek(0, 0)
                     cfcontents = CompressOpenFileAlt(
                         cfcontents, curcompression, compressionlevel, compressionuselist, formatspecs)
@@ -7195,31 +6820,26 @@ if(rarfile_support):
             tmpoutlist = [ftypehex, fencoding, fcencoding, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
                           fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
             AppendFileHeaderWithContent(
-                fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[1], checksumtype[2], checksumtype[3]], formatspecs)
+                fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[2], checksumtype[3], checksumtype[4]], formatspecs)
             try:
                 fp.flush()
                 if(hasattr(os, "sync")):
                     os.fsync(fp.fileno())
-            except io.UnsupportedOperation:
-                pass
-            except AttributeError:
-                pass
-            except OSError:
+            except (io.UnsupportedOperation, AttributeError, OSError):
                 pass
             fcontents.close()
         return fp
 
 if(not py7zr_support):
-    def AppendFilesWithContentFromSevenZipFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False):
+    def AppendFilesWithContentFromSevenZipFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False):
         return False
-
-if(py7zr_support):
-    def AppendFilesWithContentFromSevenZipFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False):
+else:
+    def AppendFilesWithContentFromSevenZipFile(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False):
         if(not hasattr(fp, "write")):
             return False
         if(verbose):
             logging.basicConfig(format="%(message)s",
-                                stream=sys.stdout, level=logging.DEBUG)
+                                stream=PY_STDOUT_TEXT, level=logging.DEBUG)
         formver = formatspecs['format_ver']
         fileheaderver = str(int(formver.replace(".", "")))
         curinode = 0
@@ -7237,16 +6857,12 @@ if(py7zr_support):
         if(sztestalt):
             VerbosePrintOut("Bad file found!")
         numfiles = int(len(szpfp.list()))
-        AppendFileHeader(fp, numfiles, "UTF-8", [], checksumtype[0], formatspecs)
+        AppendFileHeader(fp, numfiles, "UTF-8", [], {}, [checksumtype[0], checksumtype[1]], formatspecs)
         try:
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
         for member in sorted(szpfp.list(), key=lambda x: x.filename):
             fencoding = "UTF-8"
@@ -7296,24 +6912,18 @@ if(py7zr_support):
                     int(stat.S_IFMT(int(stat.S_IFREG | 0x1b6))), 'x').lower()
             try:
                 fuid = format(int(os.getuid()), 'x').lower()
-            except AttributeError:
-                fuid = format(int(0), 'x').lower()
-            except KeyError:
+            except (KeyError, AttributeError):
                 fuid = format(int(0), 'x').lower()
             try:
                 fgid = format(int(os.getgid()), 'x').lower()
-            except AttributeError:
-                fgid = format(int(0), 'x').lower()
-            except KeyError:
+            except (KeyError, AttributeError):
                 fgid = format(int(0), 'x').lower()
             try:
                 import pwd
                 try:
                     userinfo = pwd.getpwuid(os.getuid())
                     funame = userinfo.pw_name
-                except KeyError:
-                    funame = ""
-                except AttributeError:
+                except (KeyError, AttributeError):
                     funame = ""
             except ImportError:
                 funame = ""
@@ -7323,9 +6933,7 @@ if(py7zr_support):
                 try:
                     groupinfo = grp.getgrgid(os.getgid())
                     fgname = groupinfo.gr_name
-                except KeyError:
-                    fgname = ""
-                except AttributeError:
+                except (KeyError, AttributeError):
                     fgname = ""
             except ImportError:
                 fgname = ""
@@ -7351,7 +6959,7 @@ if(py7zr_support):
                         while(ilmin < ilsize):
                             cfcontents = MkTempFile()
                             fcontents.seek(0, 0)
-                            shutil.copyfileobj(fcontents, cfcontents)
+                            shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                             fcontents.seek(0, 0)
                             cfcontents.seek(0, 0)
                             cfcontents = CompressOpenFileAlt(
@@ -7367,7 +6975,7 @@ if(py7zr_support):
                         curcompression = compressionuselist[ilcmin]
                     fcontents.seek(0, 0)
                     cfcontents = MkTempFile()
-                    shutil.copyfileobj(fcontents, cfcontents)
+                    shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                     cfcontents.seek(0, 0)
                     cfcontents = CompressOpenFileAlt(
                         cfcontents, curcompression, compressionlevel, compressionuselist, formatspecs)
@@ -7385,25 +6993,21 @@ if(py7zr_support):
             tmpoutlist = [ftypehex, fencoding, fcencoding, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
                           fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
             AppendFileHeaderWithContent(
-                fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[1], checksumtype[2], checksumtype[3]], formatspecs)
+                fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[2], checksumtype[3], checksumtype[4]], formatspecs)
             try:
                 fp.flush()
                 if(hasattr(os, "sync")):
                     os.fsync(fp.fileno())
-            except io.UnsupportedOperation:
-                pass
-            except AttributeError:
-                pass
-            except OSError:
+            except (io.UnsupportedOperation, AttributeError, OSError):
                 pass
             fcontents.close()
         return fp
 
-def AppendListsWithContent(inlist, fp, dirlistfromtxt=False, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False):
+def AppendListsWithContent(inlist, fp, dirlistfromtxt=False, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False):
     if(not hasattr(fp, "write")):
         return False
     if(verbose):
-        logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+        logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
     GetDirList = inlist
     if(not GetDirList):
         return False
@@ -7415,7 +7019,7 @@ def AppendListsWithContent(inlist, fp, dirlistfromtxt=False, extradata=[], jsond
     inodetoforminode = {}
     numfiles = int(len(GetDirList))
     fnumfiles = format(numfiles, 'x').lower()
-    AppendFileHeader(fp, numfiles, "UTF-8", [], checksumtype[0], formatspecs)
+    AppendFileHeader(fp, numfiles, "UTF-8", [], [checksumtype[0], checksumtype[1]], formatspecs)
     for curfname in GetDirList:
         ftype = format(curfname[0], 'x').lower()
         fencoding = curfname[1]
@@ -7457,16 +7061,16 @@ def AppendListsWithContent(inlist, fp, dirlistfromtxt=False, extradata=[], jsond
                       fuid, funame, fgid, fgname, fid, finode, flinkcount, fdev, fdev_minor, fdev_major, fseeknextfile]
         fcontents.seek(0, 0)
         AppendFileHeaderWithContent(
-            fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[1], checksumtype[2], checksumtype[3]], formatspecs)
+            fp, tmpoutlist, extradata, jsondata, fcontents.read(), [checksumtype[2], checksumtype[3], checksumtype[4]], formatspecs)
     return fp
 
 
-def AppendInFileWithContent(infile, fp, dirlistfromtxt=False, extradata=[], jsondata={}, followlink=False, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False):
+def AppendInFileWithContent(infile, fp, dirlistfromtxt=False, extradata=[], jsondata={}, followlink=False, checksumtype=["md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False):
     inlist = ReadInFileWithContentToList(infile, "auto", 0, 0, False, False, True, False, formatspecs)
     return AppendListsWithContent(inlist, fp, dirlistfromtxt, extradata, jsondata, followlink, checksumtype, formatspecs, verbose)
 
 
-def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, followlink=False, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, followlink=False, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
     if(IsNestedDict(formatspecs) and fmttype=="auto" and 
         (outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write"))):
         get_in_ext = os.path.splitext(outfile)
@@ -7519,18 +7123,11 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, fmtt
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
     if(outfile == "-"):
         fp.seek(0, 0)
-        if(hasattr(sys.stdout, "buffer")):
-            shutil.copyfileobj(fp, sys.stdout.buffer)
-        else:
-            shutil.copyfileobj(fp, sys.stdout)
+        shutil.copyfileobj(fp, PY_STDOUT_BUF, length=__filebuff_size__)
     elif(outfile is None):
         fp.seek(0, 0)
         outvar = fp.read()
@@ -7547,7 +7144,7 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, fmtt
         fp.close()
         return True
 
-def AppendFilesWithContentToStackedOutFile(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, followlink=False, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+def AppendFilesWithContentToStackedOutFile(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, followlink=False, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
     if not isinstance(infiles, list):
         infiles = [infiles]
     returnout = False
@@ -7562,7 +7159,7 @@ def AppendFilesWithContentToStackedOutFile(infiles, outfile, dirlistfromtxt=Fals
         return True
     return returnout
 
-def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, extradata=[], jsondata={}, followlink=False, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
+def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, extradata=[], jsondata={}, followlink=False, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
     if(IsNestedDict(formatspecs) and fmttype=="auto" and 
         (outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write"))):
         get_in_ext = os.path.splitext(outfile)
@@ -7612,18 +7209,11 @@ def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, fmtty
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
     if(outfile == "-"):
         fp.seek(0, 0)
-        if(hasattr(sys.stdout, "buffer")):
-            shutil.copyfileobj(fp, sys.stdout.buffer)
-        else:
-            shutil.copyfileobj(fp, sys.stdout)
+        shutil.copyfileobj(fp, PY_STDOUT_BUF, length=__filebuff_size__)
     elif(outfile is None):
         fp.seek(0, 0)
         outvar = fp.read()
@@ -7641,7 +7231,7 @@ def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, fmtty
         fp.close()
         return True
 
-def AppendFilesWithContentFromTarFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+def AppendFilesWithContentFromTarFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
     if(IsNestedDict(formatspecs) and fmttype=="auto" and 
         (outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write"))):
         get_in_ext = os.path.splitext(outfile)
@@ -7692,18 +7282,11 @@ def AppendFilesWithContentFromTarFileToOutFile(infiles, outfile, fmttype="auto",
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
     if(outfile == "-"):
         fp.seek(0, 0)
-        if(hasattr(sys.stdout, "buffer")):
-            shutil.copyfileobj(fp, sys.stdout.buffer)
-        else:
-            shutil.copyfileobj(fp, sys.stdout)
+        shutil.copyfileobj(fp, PY_STDOUT_BUF, length=__filebuff_size__)
     elif(outfile is None):
         fp.seek(0, 0)
         outvar = fp.read()
@@ -7721,7 +7304,7 @@ def AppendFilesWithContentFromTarFileToOutFile(infiles, outfile, fmttype="auto",
         fp.close()
         return True
 
-def AppendFilesWithContentFromTarFileToStackedOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+def AppendFilesWithContentFromTarFileToStackedOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
     if not isinstance(infiles, list):
         infiles = [infiles]
     returnout = False
@@ -7736,7 +7319,7 @@ def AppendFilesWithContentFromTarFileToStackedOutFile(infiles, outfile, fmttype=
         return True
     return returnout
 
-def AppendFilesWithContentFromZipFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+def AppendFilesWithContentFromZipFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
     if(IsNestedDict(formatspecs) and fmttype=="auto" and 
         (outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write"))):
         get_in_ext = os.path.splitext(outfile)
@@ -7787,18 +7370,11 @@ def AppendFilesWithContentFromZipFileToOutFile(infiles, outfile, fmttype="auto",
             fp.flush()
             if(hasattr(os, "sync")):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            pass
-        except AttributeError:
-            pass
-        except OSError:
+        except (io.UnsupportedOperation, AttributeError, OSError):
             pass
     if(outfile == "-"):
         fp.seek(0, 0)
-        if(hasattr(sys.stdout, "buffer")):
-            shutil.copyfileobj(fp, sys.stdout.buffer)
-        else:
-            shutil.copyfileobj(fp, sys.stdout)
+        shutil.copyfileobj(fp, PY_STDOUT_BUF, length=__filebuff_size__)
     elif(outfile is None):
         fp.seek(0, 0)
         outvar = fp.read()
@@ -7816,7 +7392,7 @@ def AppendFilesWithContentFromZipFileToOutFile(infiles, outfile, fmttype="auto",
         fp.close()
         return True
 
-def AppendFilesWithContentFromZipFileToStackedOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+def AppendFilesWithContentFromZipFileToStackedOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
     if not isinstance(infiles, list):
         infiles = [infiles]
     returnout = False
@@ -7832,11 +7408,10 @@ def AppendFilesWithContentFromZipFileToStackedOutFile(infiles, outfile, fmttype=
     return returnout
 
 if(not rarfile_support):
-    def AppendFilesWithContentFromRarFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+    def AppendFilesWithContentFromRarFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
         return False
-
-if(rarfile_support):
-    def AppendFilesWithContentFromRarFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+else:
+    def AppendFilesWithContentFromRarFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
         if(IsNestedDict(formatspecs) and fmttype=="auto" and 
             (outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write"))):
             get_in_ext = os.path.splitext(outfile)
@@ -7887,18 +7462,11 @@ if(rarfile_support):
                 fp.flush()
                 if(hasattr(os, "sync")):
                     os.fsync(fp.fileno())
-            except io.UnsupportedOperation:
-                pass
-            except AttributeError:
-                pass
-            except OSError:
+            except (io.UnsupportedOperation, AttributeError, OSError):
                 pass
         if(outfile == "-"):
             fp.seek(0, 0)
-            if(hasattr(sys.stdout, "buffer")):
-                shutil.copyfileobj(fp, sys.stdout.buffer)
-            else:
-                shutil.copyfileobj(fp, sys.stdout)
+            shutil.copyfileobj(fp, PY_STDOUT_BUF, length=__filebuff_size__)
         elif(outfile is None):
             fp.seek(0, 0)
             outvar = fp.read()
@@ -7916,7 +7484,7 @@ if(rarfile_support):
             fp.close()
             return True
 
-def AppendFilesWithContentFromRarFileToStackedOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+def AppendFilesWithContentFromRarFileToStackedOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
     if not isinstance(infiles, list):
         infiles = [infiles]
     returnout = False
@@ -7932,11 +7500,10 @@ def AppendFilesWithContentFromRarFileToStackedOutFile(infiles, outfile, fmttype=
     return returnout
 
 if(not py7zr_support):
-    def AppendFilesWithContentFromSevenZipFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+    def AppendFilesWithContentFromSevenZipFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
         return False
-
-if(py7zr_support):
-    def AppendFilesWithContentFromSevenZipFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+else:
+    def AppendFilesWithContentFromSevenZipFileToOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
         if(IsNestedDict(formatspecs) and fmttype=="auto" and 
             (outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write"))):
             get_in_ext = os.path.splitext(outfile)
@@ -7987,18 +7554,11 @@ if(py7zr_support):
                 fp.flush()
                 if(hasattr(os, "sync")):
                     os.fsync(fp.fileno())
-            except io.UnsupportedOperation:
-                pass
-            except AttributeError:
-                pass
-            except OSError:
+            except (io.UnsupportedOperation, AttributeError, OSError):
                 pass
         if(outfile == "-"):
             fp.seek(0, 0)
-            if(hasattr(sys.stdout, "buffer")):
-                shutil.copyfileobj(fp, sys.stdout.buffer)
-            else:
-                shutil.copyfileobj(fp, sys.stdout)
+            shutil.copyfileobj(fp, PY_STDOUT_BUF, length=__filebuff_size__)
         elif(outfile is None):
             fp.seek(0, 0)
             outvar = fp.read()
@@ -8016,7 +7576,7 @@ if(py7zr_support):
             fp.close()
             return True
 
-def AppendFilesWithContentFromSevenZipFileToStackedOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+def AppendFilesWithContentFromSevenZipFileToStackedOutFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
     if not isinstance(infiles, list):
         infiles = [infiles]
     returnout = False
@@ -8031,7 +7591,7 @@ def AppendFilesWithContentFromSevenZipFileToStackedOutFile(infiles, outfile, fmt
         return True
     return returnout
 
-def AppendInFileWithContentToOutFile(infile, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, extradata=[], jsondata={}, followlink=False, checksumtype=["crc32", "crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
+def AppendInFileWithContentToOutFile(infile, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, extradata=[], jsondata={}, followlink=False, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
     inlist = ReadInFileWithContentToList(infile, "auto", 0, 0, False, False, True, False, formatspecs)
     return AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt, fmttype, compression, compresswholefile, compressionlevel, extradata, jsondata, followlink, checksumtype, formatspecs, verbose, returnfp)
 
@@ -8065,9 +7625,7 @@ def PrintPermissionString(fchmode, ftype):
         permissionstr = "w" + permissionstr
     try:
         permissionoutstr = stat.filemode(fchmode)
-    except AttributeError:
-        permissionoutstr = permissionstr
-    except KeyError:
+    except (KeyError, AttributeError):
         permissionoutstr = permissionstr
     return permissionoutstr
 
@@ -8983,7 +8541,7 @@ def UncompressString(infile, formatspecs=__file_format_multi_dict__, filestart=0
 
 
 def UncompressStringAlt(instring, formatspecs=__file_format_multi_dict__, filestart=0):
-    filefp = StringIO()
+    filefp = MkTempFile("", isbytes=False)
     outstring = UncompressString(instring, formatspecs, filestart)
     filefp.write(outstring)
     filefp.seek(0, 0)
@@ -8998,7 +8556,7 @@ def UncompressStringAltFP(fp, formatspecs=__file_format_multi_dict__, filestart=
     fp.seek(filestart, 0)
     if(prechck!="zstd"):
         return UncompressFileAlt(fp, formatspecs, filestart)
-    filefp = StringIO()
+    filefp = MkTempFile("", isbytes=False)
     fp.seek(filestart, 0)
     outstring = UncompressString(fp.read(), formatspecs, 0)
     filefp.write(outstring)
@@ -9070,9 +8628,7 @@ def _extract_base_fp(obj):
             try:
                 f()  # probe fileno()
                 return cur
-            except UnsupportedOperation:
-                pass
-            except Exception:
+            except (Exception, UnsupportedOperation):
                 pass
         for attr in ("fileobj", "fp", "_fp", "buffer", "raw"):
             nxt = getattr(cur, attr, None)
@@ -9464,7 +9020,7 @@ def ensure_filelike(infile, mode="rb", use_mmap=False, **adapter_kw):
 
 # ========= copy helpers =========
 
-def fast_copy(infp, outfp, bufsize=1 << 20):
+def fast_copy(infp, outfp, bufsize=__filebuff_size__):
     """
     Efficient copy from any readable file-like to any writable file-like.
     Uses readinto() when available to avoid extra allocations.
@@ -9508,7 +9064,7 @@ def copy_file_to_mmap_dest(src_path, outfp, chunk_size=__spoolfile_size__):
             shutil.copyfileobj(fp, outfp, length=chunk_size)
 
 
-def copy_opaque(src, dst, bufsize=1 << 20, grow_step=64 << 20):
+def copy_opaque(src, dst, bufsize=__filebuff_size__, grow_step=64 << 20):
     """
     Copy opaque bytes from 'src' (any readable file-like) to 'dst'
     (your mmap-backed FileLikeAdapter or any writable file-like).
@@ -9570,11 +9126,7 @@ def CompressOpenFileAlt(fp, compression="auto", compressionlevel=None,
 
     try:
         fp.seek(0, 0)
-    except io.UnsupportedOperation:
-        pass
-    except AttributeError:
-        pass
-    except OSError:
+    except (io.UnsupportedOperation, AttributeError, OSError):
         pass
 
     if (not compression or compression == formatspecs['format_magic']
@@ -9633,11 +9185,7 @@ def CompressOpenFileAlt(fp, compression="auto", compressionlevel=None,
 
     try:
         bytesfp.seek(0, 0)
-    except io.UnsupportedOperation:
-        pass
-    except AttributeError:
-        pass
-    except OSError:
+    except (io.UnsupportedOperation, AttributeError, OSError):
         pass
     out = FileLikeAdapter(bytesfp, mode="rb")  # read interface for the caller
     try:
@@ -9767,31 +9315,18 @@ def CheckSumSupport(checkfor, guaranteed=True):
         try:
             hash_list = sorted(list(hashlib.algorithms_guaranteed))
         except AttributeError:
-            hash_list = sorted(list(hashlib.algorithms))
-    else:
-        try:
-            hash_list = sorted(list(hashlib.algorithms_available))
-        except AttributeError:
-            hash_list = sorted(list(hashlib.algorithms))
-    checklistout = sorted(hash_list + ['adler32', 'crc16', 'crc16_ansi', 'crc16_ibm',
-                          'crc16_ccitt', 'crc32', 'crc64', 'crc64_ecma', 'crc64_iso', 'none'])
-    if(checkfor in checklistout):
-        return True
-    else:
-        return False
-
-
-def CheckSumSupportAlt(checkfor, guaranteed=True):
-    if(guaranteed):
-        try:
-            hash_list = sorted(list(hashlib.algorithms_guaranteed))
-        except AttributeError:
-            hash_list = sorted(list(hashlib.algorithms))
+            try:
+                hash_list = sorted(list(hashlib.algorithms))
+            except AttributeError:
+                hash_list = sorted(list(a.lower() for a in hashlib.algorithms_available))
     else:
         try:
             hash_list = sorted(list(hashlib.algorithms_available))
         except AttributeError:
-            hash_list = sorted(list(hashlib.algorithms))
+            try:
+                hash_list = sorted(list(hashlib.algorithms))
+            except AttributeError:
+                hash_list = sorted(list(a.lower() for a in hashlib.algorithms_available))
     checklistout = hash_list
     if(checkfor in checklistout):
         return True
@@ -9799,48 +9334,46 @@ def CheckSumSupportAlt(checkfor, guaranteed=True):
         return False
 
 
-def PackCatFile(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, checksumtype=["crc32", "crc32", "crc32", "crc32"], extradata=[], jsondata={}, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+def PackCatFile(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, checksumtype=["md5", "md5", "md5", "md5", "md5"], extradata=[], jsondata={}, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
         return AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, extradata, jsondata, followlink, checksumtype, formatspecs, verbose, returnfp)
 
-def PackStackedCatFile(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, checksumtype=["crc32", "crc32", "crc32", "crc32"], extradata=[], jsondata={}, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+def PackStackedCatFile(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, checksumtype=["md5", "md5", "md5", "md5", "md5"], extradata=[], jsondata={}, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
         return AppendFilesWithContentToStackedOutFile(infiles, outfile, dirlistfromtxt, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, extradata, jsondata, followlink, checksumtype, formatspecs, verbose, returnfp)
 
-def PackCatFileFromDirList(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, checksumtype=["crc32", "crc32", "crc32"], extradata=[], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
+def PackCatFileFromDirList(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, checksumtype=["md5", "md5", "md5", "md5", "md5"], extradata=[], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
     return PackCatFile(infiles, outfile, dirlistfromtxt, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, followlink, checksumtype, extradata, formatspecs, verbose, returnfp)
 
 
-def PackCatFileFromTarFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32", "crc32"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
+def PackCatFileFromTarFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
     return AppendFilesWithContentFromTarFileToOutFile(infile, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, extradata, jsondata, checksumtype, formatspecs, verbose, returnfp)
 
 
-def PackCatFileFromZipFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32", "crc32"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
+def PackCatFileFromZipFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
     return AppendFilesWithContentFromZipFileToOutFile(infile, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, extradata, jsondata, checksumtype, formatspecs, verbose, returnfp)
 
 
 if(not rarfile_support):
-    def PackCatFileFromRarFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
+    def PackCatFileFromRarFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
         return False
-
-if(rarfile_support):
-    def PackCatFileFromRarFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32", "crc32"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
+else:
+    def PackCatFileFromRarFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
         return AppendFilesWithContentFromRarFileToOutFile(infile, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, extradata, jsondata, checksumtype, formatspecs, verbose, returnfp)
 
 
 if(not py7zr_support):
-    def PackCatFileFromSevenZipFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32"], extradata=[], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
+    def PackCatFileFromSevenZipFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], extradata=[], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
         return False
-
-if(py7zr_support):
-    def PackCatFileFromSevenZipFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32", "crc32"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
+else:
+    def PackCatFileFromSevenZipFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
         return AppendFilesWithContentFromSevenZipFileToOutFile(infile, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, extradata, jsondata, checksumtype, formatspecs, verbose, returnfp)
 
 
-def PackCatFileFromInFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["crc32", "crc32", "crc32"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
+def PackCatFileFromInFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], extradata=[], jsondata={}, formatspecs=__file_format_dict__, verbose=False, returnfp=False):
     checkcompressfile = CheckCompressionSubType(infile, formatspecs, 0, True)
     if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
         formatspecs = formatspecs[checkcompressfile]
     if(verbose):
-        logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+        logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
     if(checkcompressfile == "tarfile" and TarFileCheck(infile)):
         return PackCatFileFromTarFile(infile, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, checksumtype, extradata, jsondata, formatspecs, verbose, returnfp)
     elif(checkcompressfile == "zipfile" and zipfile.is_zipfile(infile)):
@@ -9923,7 +9456,7 @@ def CatFileValidate(infile, fmttype="auto", filestart=0,
                         formatspecs=__file_format_multi_dict__,  # keep default like original
                         seektoend=False, verbose=False, returnfp=False):
     if(verbose):
-        logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+        logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
 
     if(IsNestedDict(formatspecs) and fmttype!="auto" and fmttype in formatspecs):
         formatspecs = formatspecs[fmttype]
@@ -9950,10 +9483,7 @@ def CatFileValidate(infile, fmttype="auto", filestart=0,
 
     elif(infile == "-"):
         fp = MkTempFile()
-        if(hasattr(sys.stdin, "buffer")):
-            shutil.copyfileobj(sys.stdin.buffer, fp)
-        else:
-            shutil.copyfileobj(sys.stdin, fp)
+        shutil.copyfileobj(PY_STDIN_BUF, fp, length=__filebuff_size__)
         fp.seek(filestart, 0)
         fp = UncompressFileAlt(fp, formatspecs, filestart)
         checkcompressfile = CheckCompressionSubType(fp, formatspecs, filestart, True)
@@ -10030,9 +9560,7 @@ def CatFileValidate(infile, fmttype="auto", filestart=0,
 
     try:
         fp.seek(0, 2)
-    except OSError:
-        SeekToEndOfFile(fp)
-    except ValueError:
+    except (OSError, ValueError):
         SeekToEndOfFile(fp)
 
     CatSize = fp.tell()
@@ -10062,18 +9590,56 @@ def CatFileValidate(infile, fmttype="auto", filestart=0,
     else:
         inheader = ReadFileHeaderDataWoSize(fp, formatspecs['format_delimiter'])
 
-    fnumextrafieldsize = int(inheader[5], 16)
-    fnumextrafields = int(inheader[6], 16)
-    extrastart = 7
+    fnumextrafieldsize = int(inheader[13], 16)
+    fnumextrafields = int(inheader[14], 16)
+    extrastart = 15
     extraend = extrastart + fnumextrafields
     formversion = re.findall("([\\d]+)", formstring)
     fheadsize = int(inheader[0], 16)
     fnumfields = int(inheader[1], 16)
-    fhencoding = inheader[2]
-    fostype = inheader[3]
-    fnumfiles = int(inheader[4], 16)
+    fnumfiles = int(inheader[6], 16)
     fprechecksumtype = inheader[-2]
     fprechecksum = inheader[-1]
+    outfseeknextfile = inheader[7]
+    fjsonsize = int(inheader[10], 16)
+    fjsonchecksumtype = inheader[11]
+    fjsonchecksum = inheader[12]
+    fprejsoncontent = fp.read(fjsonsize)
+    jsonfcs = GetFileChecksum(fprejsoncontent, fjsonchecksumtype, True, formatspecs)
+    if(fjsonsize > 0):
+        if(hmac.compare_digest(jsonfcs, fjsonchecksum)):
+            if(verbose):
+                VerbosePrintOut("File JSON Data Checksum Passed at offset " + str(outfjstart))
+                VerbosePrintOut("'" + outfjsonchecksum + "' == " + "'" + injsonfcs + "'")
+        else:
+            valid_archive = False
+            invalid_archive = True
+            if(verbose):
+                VerbosePrintOut("File JSON Data Checksum Error at offset " + str(outfjstart))
+                VerbosePrintOut("'" + outfjsonchecksum + "' != " + "'" + injsonfcs + "'")
+    if(not hmac.compare_digest(fjsonchecksum, jsonfcs) and not skipchecksum):
+        VerbosePrintOut("File JSON Data Checksum Error with file " +
+                        fname + " at offset " + str(fheaderstart))
+        VerbosePrintOut("'" + fjsonchecksum + "' != " + "'" + jsonfcs + "'")
+        return False
+    # Next seek directive
+    if(re.findall(r"^\+([0-9]+)", outfseeknextfile)):
+        fseeknextasnum = int(outfseeknextfile.replace("+", ""))
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 1)
+    elif(re.findall(r"^\-([0-9]+)", outfseeknextfile)):
+        fseeknextasnum = int(outfseeknextfile)
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 1)
+    elif(re.findall(r"^([0-9]+)", outfseeknextfile)):
+        fseeknextasnum = int(outfseeknextfile)
+        if(abs(fseeknextasnum) == 0):
+            pass
+        fp.seek(fseeknextasnum, 0)
+    else:
+        return False
 
     il = 0
     headercheck = ValidateHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, fprechecksum, formatspecs)
@@ -10192,7 +9758,7 @@ def CatFileValidate(infile, fmttype="auto", filestart=0,
             VerbosePrintOut(outfname)
             VerbosePrintOut("Record Number " + str(il) + "; File ID " + str(fid) + "; iNode Number " + str(finode))
 
-        if(outfcs == infcs):
+        if(hmac.compare_digest(outfcs, infcs)):
             if(verbose):
                 VerbosePrintOut("File Header Checksum Passed at offset " + str(outfhstart))
                 VerbosePrintOut("'" + outfcs + "' == " + "'" + infcs + "'")
@@ -10204,7 +9770,7 @@ def CatFileValidate(infile, fmttype="auto", filestart=0,
                 VerbosePrintOut("'" + outfcs + "' != " + "'" + infcs + "'")
 
         if(outfjsonsize > 0):
-            if(outfjsonchecksum == injsonfcs):
+            if(hmac.compare_digest(injsonfcs, outfjsonchecksum)):
                 if(verbose):
                     VerbosePrintOut("File JSON Data Checksum Passed at offset " + str(outfjstart))
                     VerbosePrintOut("'" + outfjsonchecksum + "' == " + "'" + injsonfcs + "'")
@@ -10228,7 +9794,7 @@ def CatFileValidate(infile, fmttype="auto", filestart=0,
             infccs = GetFileChecksum(outfcontents, inheaderdata[-3].lower(), False, formatspecs)
             pyhascontents = True
 
-            if(outfccs == infccs):
+            if(hmac.compare_digest(outfccs, infccs)):
                 if(verbose):
                     VerbosePrintOut("File Content Checksum Passed at offset " + str(outfcontentstart))
                     VerbosePrintOut("'" + outfccs + "' == " + "'" + infccs + "'")
@@ -10301,7 +9867,7 @@ def StackedCatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__fi
     while True:
         if outstartfile >= outfsize:   # stop when function signals False
             break
-        is_valid_file = ArchiveFileValidate(infile, fmttype, outstartfile, formatspecs, seektoend, verbose, True)
+        is_valid_file = CatFileValidate(infile, fmttype, outstartfile, formatspecs, seektoend, verbose, True)
         if is_valid_file is False:   # stop when function signals False
             outretval.append(is_valid_file)
             break
@@ -10311,9 +9877,7 @@ def StackedCatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__fi
         outstartfile = infile.tell()
         try:
             infile.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(infile)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(infile)
         outfsize = infile.tell()
         infile.seek(outstartfile, 0)
@@ -10389,7 +9953,7 @@ def TarFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile
         formatspecs = formatspecs[checkcompressfile]
     fp = MkTempFile()
     fp = PackCatFileFromTarFile(
-        infile, fp, "auto", True, None, compressionlistalt, "crc32", [], formatspecs, False, True)
+        infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, False, True)
     listarrayfiles = CatFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, seektoend, returnfp)
     return listarrayfiles
 
@@ -10400,7 +9964,7 @@ def ZipFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile
         formatspecs = formatspecs[checkcompressfile]
     fp = MkTempFile()
     fp = PackCatFileFromZipFile(
-        infile, fp, "auto", True, None, compressionlistalt, "crc32", [], formatspecs, False, True)
+        infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, False, True)
     listarrayfiles = CatFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, seektoend, returnfp)
     return listarrayfiles
 
@@ -10416,7 +9980,7 @@ if(rarfile_support):
             formatspecs = formatspecs[checkcompressfile]
         fp = MkTempFile()
         fp = PackCatFileFromRarFile(
-            infile, fp, "auto", True, None, compressionlistalt, "crc32", [], formatspecs, False, True)
+            infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, False, True)
         listarrayfiles = CatFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, seektoend, returnfp)
         return listarrayfiles
 
@@ -10431,7 +9995,7 @@ if(py7zr_support):
             formatspecs = formatspecs[checkcompressfile]
         fp = MkTempFile()
         fp = PackCatFileFromSevenZipFile(
-            infile, fp, "auto", True, None, compressionlistalt, "crc32", [], formatspecs, False, True)
+            infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, False, True)
         listarrayfiles = CatFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, seektoend, returnfp)
         return listarrayfiles
 
@@ -10455,7 +10019,7 @@ def InFileToArray(infile, filestart=0, seekstart=0, seekend=0, listonly=False, c
     return False
 
 
-def ListDirToArray(infiles, dirlistfromtxt=False, fmttype=__file_format_default__, compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, filestart=0, seekstart=0, seekend=0, listonly=False, skipchecksum=False, checksumtype=["crc32", "crc32", "crc32"], extradata=[], formatspecs=__file_format_dict__, verbose=False, seektoend=False, returnfp=False):
+def ListDirToArray(infiles, dirlistfromtxt=False, fmttype=__file_format_default__, compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, filestart=0, seekstart=0, seekend=0, listonly=False, skipchecksum=False, checksumtype=["md5", "md5", "md5"], extradata=[], formatspecs=__file_format_dict__, verbose=False, seektoend=False, returnfp=False):
     outarray = MkTempFile()
     packform = PackCatFile(infiles, outarray, dirlistfromtxt, fmttype, compression, compresswholefile,
                               compressionlevel, followlink, checksumtype, extradata, formatspecs, verbose, True)
@@ -10586,7 +10150,7 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
     if compressionuselist is None:
         compressionuselist = compressionlistalt
     if checksumtype is None:
-        checksumtype = ["crc32", "crc32", "crc32", "crc32"]
+        checksumtype = ["md5", "md5", "md5", "md5"]
     if extradata is None:
         extradata = []
     if jsondata is None:
@@ -10673,7 +10237,7 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
             compression = "auto"
 
         if verbose:
-            logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+            logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
 
         # No files?
         if not listarrayfiles.get('ffilelist'):
@@ -10778,7 +10342,7 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
                     while ilmin < ilsize:
                         cfcontents = MkTempFile()
                         fcontents.seek(0, 0)
-                        shutil.copyfileobj(fcontents, cfcontents)
+                        shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                         fcontents.seek(0, 0)
                         cfcontents.seek(0, 0)
                         cfcontents = CompressOpenFileAlt(
@@ -10796,7 +10360,7 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
 
                 fcontents.seek(0, 0)
                 cfcontents = MkTempFile()
-                shutil.copyfileobj(fcontents, cfcontents)
+                shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                 cfcontents.seek(0, 0)
                 cfcontents = CompressOpenFileAlt(
                     cfcontents, curcompression, compressionlevel, compressionuselist, formatspecs
@@ -10895,22 +10459,12 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
             fp.flush()
             if hasattr(os, "sync"):
                 os.fsync(fp.fileno())
-        except io.UnsupportedOperation:
-            if verbose:
-                logging.warning("Flush/sync unsupported on this file object.")
-        except AttributeError:
-            if verbose:
-                logging.warning("Flush/sync attributes missing on this file object.")
-        except OSError as e:
-            if verbose:
-                logging.warning("OS error during flush/sync: %s", e)
+        except (io.UnsupportedOperation, AttributeError, OSError):
+            pass
 
     if outfile == "-":
         fp.seek(0, 0)
-        if hasattr(sys.stdout, "buffer"):
-            shutil.copyfileobj(fp, sys.stdout.buffer)
-        else:
-            shutil.copyfileobj(fp, sys.stdout)
+        shutil.copyfileobj(fp, PY_STDOUT_BUF, length=__filebuff_size__)
     elif outfile is None:
         fp.seek(0, 0)
         outvar = fp.read()
@@ -10949,14 +10503,14 @@ def RePackMultipleCatFile(infiles, outfile, fmttype="auto", compression="auto",
         return True
     return returnout
 
-def RePackCatFileFromString(instr, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=["crc32", "crc32", "crc32"], skipchecksum=False, extradata=[], jsondata={}, formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
+def RePackCatFileFromString(instr, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=["md5", "md5", "md5"], skipchecksum=False, extradata=[], jsondata={}, formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
     fp = MkTempFile(instr)
     listarrayfiles = RePackCatFile(fp, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, followlink, filestart, seekstart, seekend,
                                      checksumtype, skipchecksum, extradata, jsondata, formatspecs, seektoend, verbose, returnfp)
     return listarrayfiles
 
 
-def PackCatFileFromListDir(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=["crc32", "crc32", "crc32"], skipchecksum=False, extradata=[], jsondata={}, formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
+def PackCatFileFromListDir(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=["md5", "md5", "md5"], skipchecksum=False, extradata=[], jsondata={}, formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
     outarray = MkTempFile()
     packform = PackCatFile(infiles, outarray, dirlistfromtxt, fmttype, compression, compresswholefile,
                               compressionlevel, compressionuselist, followlink, checksumtype, extradata, formatspecs, verbose, True)
@@ -10969,7 +10523,7 @@ def UnPackCatFile(infile, outdir=None, followlink=False, filestart=0, seekstart=
     if(outdir is not None):
         outdir = RemoveWindowsPath(outdir)
     if(verbose):
-        logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+        logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
     if(isinstance(infile, dict)):
         listarrayfiles = infile
     else:
@@ -11019,16 +10573,12 @@ def UnPackCatFile(infile, outdir=None, followlink=False, filestart=0, seekstart=
                         listarrayfiles['ffilelist'][lcfi]['fcontents'])
                 listarrayfiles['ffilelist'][lcfi]['fcontents'].seek(0, 0)
                 shutil.copyfileobj(
-                    listarrayfiles['ffilelist'][lcfi]['fcontents'], fpc)
+                    listarrayfiles['ffilelist'][lcfi]['fcontents'], fpc, length=__filebuff_size__)
                 try:
                     fpc.flush()
                     if(hasattr(os, "sync")):
                         os.fsync(fpc.fileno())
-                except io.UnsupportedOperation:
-                    pass
-                except AttributeError:
-                    pass
-                except OSError:
+                except (io.UnsupportedOperation, AttributeError, OSError):
                     pass
             if(hasattr(os, "chown") and funame == listarrayfiles['ffilelist'][lcfi]['funame'] and fgname == listarrayfiles['ffilelist'][lcfi]['fgname'] and preservepermissions):
                 os.chown(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']),
@@ -11070,16 +10620,12 @@ def UnPackCatFile(infile, outdir=None, followlink=False, filestart=0, seekstart=
                             flinkinfo['fcontents'] = MkTempFile(
                                 flinkinfo['fcontents'])
                         flinkinfo['fcontents'].seek(0, 0)
-                        shutil.copyfileobj(flinkinfo['fcontents'], fpc)
+                        shutil.copyfileobj(flinkinfo['fcontents'], fpc, length=__filebuff_size__)
                         try:
                             fpc.flush()
                             if(hasattr(os, "sync")):
                                 os.fsync(fpc.fileno())
-                        except io.UnsupportedOperation:
-                            pass
-                        except AttributeError:
-                            pass
-                        except OSError:
+                        except (io.UnsupportedOperation, AttributeError, OSError):
                             pass
                     if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
                         os.chown(PrependPath(
@@ -11149,16 +10695,12 @@ def UnPackCatFile(infile, outdir=None, followlink=False, filestart=0, seekstart=
                             flinkinfo['fcontents'] = MkTempFile(
                                 flinkinfo['fcontents'])
                         flinkinfo['fcontents'].seek(0, 0)
-                        shutil.copyfileobj(flinkinfo['fcontents'], fpc)
+                        shutil.copyfileobj(flinkinfo['fcontents'], fpc, length=__filebuff_size__)
                         try:
                             fpc.flush()
                             if(hasattr(os, "sync")):
                                 os.fsync(fpc.fileno())
-                        except io.UnsupportedOperation:
-                            pass
-                        except AttributeError:
-                            pass
-                        except OSError:
+                        except (io.UnsupportedOperation, AttributeError, OSError):
                             pass
                     if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
                         os.chown(PrependPath(
@@ -11245,7 +10787,7 @@ def ftype_to_str(ftype):
 
 def CatFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, newstyle=False, returnfp=False):
     if(verbose):
-        logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+        logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
     if(isinstance(infile, dict)):
         listarrayfileslist = [infile]
     if(isinstance(infile, list)):
@@ -11253,7 +10795,7 @@ def CatFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0
     else:
         if(infile != "-" and not hasattr(infile, "read") and not hasattr(infile, "write") and not (sys.version_info[0] >= 3 and isinstance(infile, bytes))):
             infile = RemoveWindowsPath(infile)
-        listarrayfileslist = ArchiveFileToArray(infile, fmttype, filestart, seekstart, seekend, True, False, False, skipchecksum, formatspecs, seektoend, returnfp)
+        listarrayfileslist = CatFileToArray(infile, fmttype, filestart, seekstart, seekend, True, False, False, skipchecksum, formatspecs, seektoend, returnfp)
     if(not listarrayfileslist):
         return False
     for listarrayfiles in listarrayfileslist:
@@ -11326,9 +10868,7 @@ def StackedCatFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, se
         outstartfile = infile.tell()
         try:
             infile.seek(0, 2)
-        except OSError:
-            SeekToEndOfFile(infile)
-        except ValueError:
+        except (OSError, ValueError):
             SeekToEndOfFile(infile)
         outfsize = infile.tell()
         infile.seek(outstartfile, 0)
@@ -11358,13 +10898,10 @@ def CatFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipcheck
 
 def TarFileListFiles(infile, verbose=False, returnfp=False):
     if(verbose):
-        logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+        logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
     if(infile == "-"):
         infile = MkTempFile()
-        if(hasattr(sys.stdin, "buffer")):
-            shutil.copyfileobj(sys.stdin.buffer, infile)
-        else:
-            shutil.copyfileobj(sys.stdin, infile)
+        shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
         if(not infile):
             return False
@@ -11483,13 +11020,10 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
 
 def ZipFileListFiles(infile, verbose=False, returnfp=False):
     if(verbose):
-        logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+        logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
     if(infile == "-"):
         infile = MkTempFile()
-        if(hasattr(sys.stdin, "buffer")):
-            shutil.copyfileobj(sys.stdin.buffer, infile)
-        else:
-            shutil.copyfileobj(sys.stdin, infile)
+        shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
         if(not infile):
             return False
@@ -11566,24 +11100,18 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
             printfname = member.filename
             try:
                 fuid = int(os.getuid())
-            except AttributeError:
-                fuid = int(0)
-            except KeyError:
+            except (KeyError, AttributeError):
                 fuid = int(0)
             try:
                 fgid = int(os.getgid())
-            except AttributeError:
-                fgid = int(0)
-            except KeyError:
+            except (KeyError, AttributeError):
                 fgid = int(0)
             try:
                 import pwd
                 try:
                     userinfo = pwd.getpwuid(os.getuid())
                     funame = userinfo.pw_name
-                except KeyError:
-                    funame = ""
-                except AttributeError:
+                except (KeyError, AttributeError):
                     funame = ""
             except ImportError:
                 funame = ""
@@ -11593,9 +11121,7 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
                 try:
                     groupinfo = grp.getgrgid(os.getgid())
                     fgname = groupinfo.gr_name
-                except KeyError:
-                    fgname = ""
-                except AttributeError:
+                except (KeyError, AttributeError):
                     fgname = ""
             except ImportError:
                 fgname = ""
@@ -11621,7 +11147,7 @@ if(not rarfile_support):
 if(rarfile_support):
     def RarFileListFiles(infile, verbose=False, returnfp=False):
         if(verbose):
-            logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+            logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
         if(not os.path.exists(infile) or not os.path.isfile(infile)):
             return False
         if(not rarfile.is_rarfile(infile) and not rarfile.is_rarfile_sfx(infile)):
@@ -11704,24 +11230,18 @@ if(rarfile_support):
                     printfname = member.filename
                 try:
                     fuid = int(os.getuid())
-                except AttributeError:
-                    fuid = int(0)
-                except KeyError:
+                except (KeyError, AttributeError):
                     fuid = int(0)
                 try:
                     fgid = int(os.getgid())
-                except AttributeError:
-                    fgid = int(0)
-                except KeyError:
+                except (KeyError, AttributeError):
                     fgid = int(0)
                 try:
                     import pwd
                     try:
                         userinfo = pwd.getpwuid(os.getuid())
                         funame = userinfo.pw_name
-                    except KeyError:
-                        funame = ""
-                    except AttributeError:
+                    except (KeyError, AttributeError):
                         funame = ""
                 except ImportError:
                     funame = ""
@@ -11731,9 +11251,7 @@ if(rarfile_support):
                     try:
                         groupinfo = grp.getgrgid(os.getgid())
                         fgname = groupinfo.gr_name
-                    except KeyError:
-                        fgname = ""
-                    except AttributeError:
+                    except (KeyError, AttributeError):
                         fgname = ""
                 except ImportError:
                     fgname = ""
@@ -11758,7 +11276,7 @@ if(not py7zr_support):
 if(py7zr_support):
     def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
         if(verbose):
-            logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+            logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
         if(not os.path.exists(infile) or not os.path.isfile(infile)):
             return False
         lcfi = 0
@@ -11811,24 +11329,18 @@ if(py7zr_support):
                     file_content[member.filename].close()
                 try:
                     fuid = int(os.getuid())
-                except AttributeError:
-                    fuid = int(0)
-                except KeyError:
+                except (KeyError, AttributeError):
                     fuid = int(0)
                 try:
                     fgid = int(os.getgid())
-                except AttributeError:
-                    fgid = int(0)
-                except KeyError:
+                except (KeyError, AttributeError):
                     fgid = int(0)
                 try:
                     import pwd
                     try:
                         userinfo = pwd.getpwuid(os.getuid())
                         funame = userinfo.pw_name
-                    except KeyError:
-                        funame = ""
-                    except AttributeError:
+                    except (KeyError, AttributeError):
                         funame = ""
                 except ImportError:
                     funame = ""
@@ -11838,9 +11350,7 @@ if(py7zr_support):
                     try:
                         groupinfo = grp.getgrgid(os.getgid())
                         fgname = groupinfo.gr_name
-                    except KeyError:
-                        fgname = ""
-                    except AttributeError:
+                    except (KeyError, AttributeError):
                         fgname = ""
                 except ImportError:
                     fgname = ""
@@ -11861,7 +11371,7 @@ if(py7zr_support):
 
 def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict__, seektoend=False, newstyle=False, returnfp=False):
     if(verbose):
-        logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG)
+        logging.basicConfig(format="%(message)s", stream=PY_STDOUT_TEXT, level=logging.DEBUG)
     checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
     if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
         formatspecs = formatspecs[checkcompressfile]
@@ -11880,7 +11390,7 @@ def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict_
     return False
 
 
-def ListDirListFiles(infiles, dirlistfromtxt=False, compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, seekstart=0, seekend=0, skipchecksum=False, checksumtype=["crc32", "crc32", "crc32"], formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
+def ListDirListFiles(infiles, dirlistfromtxt=False, compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, seekstart=0, seekend=0, skipchecksum=False, checksumtype=["md5", "md5", "md5"], formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
     outarray = MkTempFile()
     packform = PackCatFile(infiles, outarray, dirlistfromtxt, compression, compresswholefile,
                               compressionlevel, followlink, checksumtype, formatspecs, False, True)
@@ -11892,19 +11402,19 @@ def ListDirListFiles(infiles, dirlistfromtxt=False, compression="auto", compress
 PyNeoFile compatibility layer
 """
 
-def make_empty_file_pointer_neo(fp, fmttype=None, checksumtype='crc32', formatspecs=__file_format_multi_dict__, encoding='UTF-8'):
+def make_empty_file_pointer_neo(fp, fmttype=None, checksumtype='md5', formatspecs=__file_format_multi_dict__, encoding='UTF-8'):
     return MakeEmptyFilePointer(fp, fmttype, checksumtype, formatspecs)
 
-def make_empty_archive_file_pointer_neo(fp, fmttype=None, checksumtype='crc32', formatspecs=__file_format_multi_dict__, encoding='UTF-8'):
+def make_empty_archive_file_pointer_neo(fp, fmttype=None, checksumtype='md5', formatspecs=__file_format_multi_dict__, encoding='UTF-8'):
     return make_empty_file_pointer_neo(fp, fmttype, checksumtype, formatspecs, encoding)
 
-def make_empty_file_neo(outfile=None, fmttype=None, checksumtype='crc32', formatspecs=__file_format_multi_dict__, encoding='UTF-8', returnfp=False):
+def make_empty_file_neo(outfile=None, fmttype=None, checksumtype='md5', formatspecs=__file_format_multi_dict__, encoding='UTF-8', returnfp=False):
     return MakeEmptyFile(outfile, fmttype, "auto", False, None, compressionlistalt, checksumtype, formatspecs, returnfp)
 
-def make_empty_archive_file_neo(outfile=None, fmttype=None, checksumtype='crc32', formatspecs=__file_format_multi_dict__, encoding='UTF-8', returnfp=False):
+def make_empty_archive_file_neo(outfile=None, fmttype=None, checksumtype='md5', formatspecs=__file_format_multi_dict__, encoding='UTF-8', returnfp=False):
     return make_empty_file_neo(outfile, fmttype, checksumtype, formatspecs, encoding, returnfp)
 
-def pack_neo(infiles, outfile=None, formatspecs=__file_format_multi_dict__, checksumtypes=["crc32", "crc32", "crc32", "crc32"], encoding="UTF-8", compression="auto", compression_level=None, returnfp=False):
+def pack_neo(infiles, outfile=None, formatspecs=__file_format_multi_dict__, checksumtypes=["md5", "md5", "md5", "md5"], encoding="UTF-8", compression="auto", compression_level=None, returnfp=False):
     return PackCatFile(infiles, outfile, False, "auto", compression, False, compression_level, compressionlistalt, False, checksumtypes, [], {}, formatspecs, False, returnfp)
 
 def archive_to_array_neo(infile, formatspecs=__file_format_multi_dict__, listonly=False, skipchecksum=False, uncompress=True, returnfp=False):
@@ -11913,7 +11423,7 @@ def archive_to_array_neo(infile, formatspecs=__file_format_multi_dict__, listonl
 def unpack_neo(infile, outdir='.', formatspecs=__file_format_multi_dict__, skipchecksum=False, uncompress=True, returnfp=False):
     return UnPackCatFile(infile, outdir, False, 0, 0, skipchecksum, formatspecs, True, True, False, False, returnfp)
 
-def repack_neo(infile, outfile=None, formatspecs=__file_format_dict__, checksumtypes=["crc32", "crc32", "crc32", "crc32"], compression="auto", compression_level=None, returnfp=False):
+def repack_neo(infile, outfile=None, formatspecs=__file_format_dict__, checksumtypes=["md5", "md5", "md5", "md5"], compression="auto", compression_level=None, returnfp=False):
     return RePackCatFile(infile, outfile, "auto", compression, False, compression_level, compressionlistalt, False, 0, 0, checksumtypes, False, [], {}, formatspecs, False, False, returnfp)
 
 def validate_neo(infile, formatspecs=__file_format_multi_dict__, verbose=False, return_details=False, returnfp=False):
@@ -11922,7 +11432,7 @@ def validate_neo(infile, formatspecs=__file_format_multi_dict__, verbose=False,
 def listfiles_neo(infile, formatspecs=__file_format_multi_dict__, advanced=False, include_dirs=True, returnfp=False):
     return CatFileListFiles(infile, "auto", 0, 0, False, formatspecs, False, True, advanced, returnfp)
 
-def convert_foreign_to_neo(infile, outfile=None, formatspecs=__file_format_multi_dict__, checksumtypes=["crc32", "crc32", "crc32", "crc32"], compression="auto", compression_level=None, returnfp=False):
+def convert_foreign_to_neo(infile, outfile=None, formatspecs=__file_format_multi_dict__, checksumtypes=["md5", "md5", "md5", "md5"], compression="auto", compression_level=None, returnfp=False):
     intmp = InFileToArray(infile, 0, 0, 0, False, True, False, formatspecs, False, False)
     return RePackCatFile(intmp, outfile, "auto", compression, False, compression_level, compressionlistalt, False, 0, 0, checksumtypes, False, [], {}, formatspecs, False, False, returnfp)
 
@@ -11964,10 +11474,7 @@ def download_file_from_ftp_file(url):
         ftp_port = 21
     try:
         ftp.connect(urlparts.hostname, ftp_port)
-    except socket.gaierror:
-        log.info("Error With URL "+url)
-        return False
-    except socket.timeout:
+    except (socket.gaierror, socket.timeout):
         log.info("Error With URL "+url)
         return False
     if(urlparts.scheme == "ftps" or isinstance(ftp, FTP_TLS)):
@@ -12055,10 +11562,7 @@ def upload_file_to_ftp_file(ftpfile, url):
         ftp_port = 21
     try:
         ftp.connect(urlparts.hostname, ftp_port)
-    except socket.gaierror:
-        log.info("Error With URL "+url)
-        return False
-    except socket.timeout:
+    except (socket.gaierror, socket.timeout):
         log.info("Error With URL "+url)
         return False
     if(urlparts.scheme == "ftps" or isinstance(ftp, FTP_TLS)):
@@ -12169,7 +11673,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__):
         else:
             response = requests.get(rebuilt_url, headers=headers, timeout=(5, 30), stream=True)
         response.raw.decode_content = True
-        shutil.copyfileobj(response.raw, httpfile)
+        shutil.copyfileobj(response.raw, httpfile, length=__filebuff_size__)
 
     # 2) HTTPX branch
     elif usehttp == 'httpx' and havehttpx:
@@ -12181,7 +11685,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__):
             else:
                 response = client.get(rebuilt_url, headers=headers)
             raw_wrapper = RawIteratorWrapper(response.iter_bytes())
-            shutil.copyfileobj(raw_wrapper, httpfile)
+            shutil.copyfileobj(raw_wrapper, httpfile, length=__filebuff_size__)
 
     # 3) Mechanize branch
     elif usehttp == 'mechanize' and havemechanize:
@@ -12200,7 +11704,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__):
 
         # Open the URL and copy the response to httpfile
         response = br.open(rebuilt_url)
-        shutil.copyfileobj(response, httpfile)
+        shutil.copyfileobj(response, httpfile, length=__filebuff_size__)
 
     # 4) Fallback to urllib
     else:
@@ -12213,7 +11717,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__):
         else:
             opener = build_opener()
         response = opener.open(request)
-        shutil.copyfileobj(response, httpfile)
+        shutil.copyfileobj(response, httpfile, length=__filebuff_size__)
 
     # Reset file pointer to the start before returning
     httpfile.seek(0, 0)
@@ -12346,7 +11850,7 @@ def upload_file_to_http_file(
             fileobj.seek(0)
         except Exception:
             pass
-        shutil.copyfileobj(fileobj, buf)
+        shutil.copyfileobj(fileobj, buf, length=__filebuff_size__)
 
         _w('\r\n')
         _w('--' + boundary + '--\r\n')
@@ -12435,10 +11939,7 @@ if(haveparamiko):
                         username=sftp_username, password=sftp_password)
         except paramiko.ssh_exception.SSHException:
             return False
-        except socket.gaierror:
-            log.info("Error With URL "+url)
-            return False
-        except socket.timeout:
+        except (socket.gaierror, socket.timeout):
             log.info("Error With URL "+url)
             return False
         sftp = ssh.open_sftp()
@@ -12492,10 +11993,7 @@ if(haveparamiko):
                         username=sftp_username, password=sftp_password)
         except paramiko.ssh_exception.SSHException:
             return False
-        except socket.gaierror:
-            log.info("Error With URL "+url)
-            return False
-        except socket.timeout:
+        except (socket.gaierror, socket.timeout):
             log.info("Error With URL "+url)
             return False
         sftp = ssh.open_sftp()
@@ -12546,10 +12044,7 @@ if(havepysftp):
                               username=sftp_username, password=sftp_password)
         except paramiko.ssh_exception.SSHException:
             return False
-        except socket.gaierror:
-            log.info("Error With URL "+url)
-            return False
-        except socket.timeout:
+        except (socket.gaierror, socket.timeout):
             log.info("Error With URL "+url)
             return False
         sftpfile = MkTempFile()
@@ -12599,10 +12094,7 @@ if(havepysftp):
                               username=sftp_username, password=sftp_password)
         except paramiko.ssh_exception.SSHException:
             return False
-        except socket.gaierror:
-            log.info("Error With URL "+url)
-            return False
-        except socket.timeout:
+        except (socket.gaierror, socket.timeout):
             log.info("Error With URL "+url)
             return False
         sftpfile.seek(0, 0)