PyCatFile 0.15.8__tar.gz → 0.15.12__tar.gz

{pycatfile-0.15.8 → pycatfile-0.15.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.15.8
+Version: 0.15.12
 Summary: A tar like file format name catfile after unix cat command (concatenate files) .
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.15.8 → pycatfile-0.15.12}/PyCatFile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.15.8
+Version: 0.15.12
 Summary: A tar like file format name catfile after unix cat command (concatenate files) .
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.15.8 → pycatfile-0.15.12}/catfile.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: catfile.py - Last Update: 12/14/2024 Ver. 0.15.8 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 12/20/2024 Ver. 0.15.12 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes

{pycatfile-0.15.8 → pycatfile-0.15.12}/neocatfile.py

@@ -14,13 +14,32 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: neocatfile.py - Last Update: 12/14/2024 Ver. 0.15.8 RC 1 - Author: cooldude2k $
+    $FileInfo: neocatfile.py - Last Update: 12/20/2024 Ver. 0.15.12 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
 import argparse
 import pycatfile
 
+__project__ = pycatfile.__project__
+__program_name__ = pycatfile.__program_name__
+__file_format_name__ = pycatfile.__file_format_name__
+__file_format_lower__ = pycatfile.__file_format_lower__
+__file_format_magic__ = pycatfile.__file_format_magic__
+__file_format_len__ = pycatfile.__file_format_len__
+__file_format_hex__ = pycatfile.__file_format_hex__
+__file_format_delimiter__ = pycatfile.__file_format_delimiter__
+__file_format_list__ = pycatfile.__file_format_list__
+__use_new_style__ = pycatfile.__use_new_style__
+__use_advanced_list__ = pycatfile.__use_advanced_list__
+__use_alt_inode__ = pycatfile.__use_alt_inode__
+__project_url__ = pycatfile.__project_url__
+__version_info__ = pycatfile.__version_info__
+__version_date_info__ = pycatfile.__version_date_info__
+__version_date__ = pycatfile.__version_date__
+__version_date_plusrc__ = pycatfile.__version_date_plusrc__
+__version__ = pycatfile.__version__
+
 # Compatibility layer for Python 2 and 3 input
 try:
     input = raw_input
@@ -34,7 +53,8 @@ py7zr_support = pycatfile.py7zr_support
 # Set up the argument parser
 argparser = argparse.ArgumentParser(
     description="Manipulates concatenated files for various operations like creation, extraction, and validation.")
-argparser.add_argument("-V", "--version", action="version", version=__program_name__ + " " + __version__, help="Displays the program's version.")
+argparser.add_argument("-V", "--version", action="version", version="{0} {1}".format(
+    __program_name__, __version__), help="Displays the program's version.")
 argparser.add_argument("-i", "--input", required=True,
                        help="Specifies input file(s) for processing.")
 argparser.add_argument(

{pycatfile-0.15.8 → pycatfile-0.15.12}/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: 12/14/2024 Ver. 0.15.8 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 12/20/2024 Ver. 0.15.12 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -304,12 +304,12 @@ __file_format_dict__ = {'format_name': __file_format_name__, 'format_magic': __f
                         'format_delimiter': __file_format_delimiter__, 'format_ver': __file_format_ver__, 'new_style': __use_new_style__, 'use_advanced_list': __use_advanced_list__, 'use_alt_inode': __use_alt_inode__}
 __project__ = __program_name__
 __project_url__ = "https://github.com/GameMaker2k/PyCatFile"
-__version_info__ = (0, 15, 8, "RC 1", 1)
-__version_date_info__ = (2024, 12, 14, "RC 1", 1)
+__version_info__ = (0, 15, 12, "RC 1", 1)
+__version_date_info__ = (2024, 12, 20, "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: d7609469045e54d12bd85a24dc8a90415987d52d $"
+__revision_id__ = "$Id: 1462baae55cec6c1aac531873eaeb2b3efe154d4 $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -1516,16 +1516,21 @@ def ValidateFileChecksum(infile, checksumtype="crc32", inchecksum="0", formatspe
 
 
 def ReadTillNullByteOld(fp, delimiter=__file_format_dict__['format_delimiter']):
-    if(not hasattr(fp, "read")):
+    if not hasattr(fp, "read"):
         return False
-    curbyte = b""
-    curfullbyte = b""
+    curfullbyte = bytearray()
     nullbyte = delimiter.encode("UTF-8")
-    while(True):
+    dellen = len(nullbyte)
+    while True:
         curbyte = fp.read(1)
-        if(curbyte == nullbyte or not curbyte):
+        if not curbyte:  # End of file or no more data
+            break
+        curfullbyte.extend(curbyte)
+        # Check if the end of the buffer matches our delimiter
+        if len(curfullbyte) >= dellen and curfullbyte[-dellen:] == nullbyte:
+            # Remove the delimiter from the returned bytes
+            curfullbyte = curfullbyte[:-dellen]
             break
-        curfullbyte = curfullbyte + curbyte
     return curfullbyte.decode('UTF-8')
 
 
@@ -1581,25 +1586,31 @@ def ReadUntilNullByteAlt(fp, delimiter=__file_format_dict__['format_delimiter'],
 
 
 def ReadTillNullByte(fp, delimiter=__file_format_dict__['format_delimiter'], max_read=1024000):
-    if(not hasattr(fp, "read")):
+    if not hasattr(fp, "read"):
         return False
     curfullbyte = bytearray()
     nullbyte = delimiter.encode("UTF-8")
+    dellen = len(nullbyte)
     total_read = 0  # Track the total number of bytes read
     while True:
         curbyte = fp.read(1)
-        if curbyte == nullbyte or not curbyte:
+        if not curbyte:  # End of file or no more data
             break
         curfullbyte.extend(curbyte)
         total_read += 1
+        # Check if the end of the buffer matches the delimiter
+        if len(curfullbyte) >= dellen and curfullbyte[-dellen:] == nullbyte:
+            # Remove the delimiter from the returned bytes
+            curfullbyte = curfullbyte[:-dellen]
+            break
+        # Check if we have exceeded the max read limit
         if total_read >= max_read:
-            raise MemoryError(
-                "Maximum read limit reached without finding the delimiter.")
+            raise MemoryError("Maximum read limit reached without finding the delimiter.")
     # Decode the full byte array to string once out of the loop
     try:
         return curfullbyte.decode('UTF-8')
     except UnicodeDecodeError:
-        # Handle potential partial UTF-8 characters
+        # Handle potential partial UTF-8 characters at the end
         for i in range(1, 4):
             try:
                 return curfullbyte[:-i].decode('UTF-8')
@@ -2453,17 +2464,17 @@ def MakeEmptyFilePointer(fp, checksumtype="crc32", formatspecs=__file_format_dic
     return fp
 
 
-def MakeEmptyFile(outfile, compression="auto", compressionlevel=None, checksumtype="crc32", formatspecs=__file_format_dict__, returnfp=False):
+def MakeEmptyFile(outfile, compression="auto", compresswholefile=True, compressionlevel=None, checksumtype="crc32", formatspecs=__file_format_dict__, returnfp=False):
     formatspecs = FormatSpecsListToDict(formatspecs)
-    if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
         if(os.path.exists(outfile)):
             try:
                 os.unlink(outfile)
             except OSError:
                 pass
-    if(outfile == "-"):
+    if(outfile == "-" or outfile is None):
         verbose = False
-        catfpfp = BytesIO()
+        catfp = BytesIO()
     elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
         catfp = outfile
     elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
@@ -2475,7 +2486,7 @@ def MakeEmptyFile(outfile, compression="auto", compressionlevel=None, checksumty
             compresswholefile = True
         catfp = CompressOpenFile(outfile, True, compressionlevel)
     catfp = AppendFileHeader(catfp, 0, checksumtype, formatspecs)
-    if(outfile == "-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
+    if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
         try:
@@ -2494,6 +2505,11 @@ def MakeEmptyFile(outfile, compression="auto", compressionlevel=None, checksumty
             shutil.copyfileobj(catfp, sys.stdout.buffer)
         else:
             shutil.copyfileobj(catfp, sys.stdout)
+    elif(outfile is None):
+        catfp.seek(0, 0)
+        outvar = catfp.read()
+        catfp.close()
+        return outvar
     elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
@@ -2694,9 +2710,13 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], ext
         getfdev = GetDevMajorMinor(fdev)
         fdev_minor = getfdev[0]
         fdev_major = getfdev[1]
-        if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):
+        # Types that should be considered zero-length in the archive context:
+        zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
+        # Types that have actual data to read:
+        data_types = {0, 7, 12}
+        if ftype in zero_length_types:
             fsize = format(int("0"), 'x').lower()
-        elif(ftype == 0 or ftype == 7):
+        elif ftype in data_types:
             fsize = format(int(fstatinfo.st_size), 'x').lower()
         else:
             fsize = format(int(fstatinfo.st_size)).lower()
@@ -2746,7 +2766,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], ext
         fcsize = format(int(0), 'x').lower()
         fcontents = BytesIO()
         chunk_size = 1024
-        if(ftype == 0 or ftype == 7):
+        if ftype in data_types:
             with open(fname, "rb") as fpc:
                 shutil.copyfileobj(fpc, fcontents)
                 if(not compresswholefile):
@@ -2838,7 +2858,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], ext
         fcontents.seek(0, 0)
         ftypehex = format(ftype, 'x').lower()
         catoutlist = [ftypehex, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
-                      fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+1"]
+                      fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
         fp = AppendFileHeaderWithContent(
             fp, catoutlist, extradata, fcontents.read(), checksumtype, formatspecs)
     if(numfiles > 0):
@@ -2919,15 +2939,15 @@ def AppendInFileWithContent(infile, fp, dirlistfromtxt=False, filevalues=[], ext
 
 def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, compression="auto", compresswholefile=True, compressionlevel=None, filevalues=[], extradata=[], followlink=False, checksumtype="crc32", formatspecs=__file_format_dict__, verbose=False, returnfp=False):
     formatspecs = FormatSpecsListToDict(formatspecs)
-    if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
         if(os.path.exists(outfile)):
             try:
                 os.unlink(outfile)
             except OSError:
                 pass
-    if(outfile == "-"):
+    if(outfile == "-" or outfile is None):
         verbose = False
-        catfpfp = BytesIO()
+        catfp = BytesIO()
     elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
         catfp = outfile
     elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
@@ -2940,7 +2960,7 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, comp
         catfp = CompressOpenFile(outfile, compresswholefile, compressionlevel)
     catfp = AppendFilesWithContent(infiles, catfp, dirlistfromtxt, filevalues, extradata, compression,
                                    compresswholefile, compressionlevel, followlink, checksumtype, formatspecs, verbose)
-    if(outfile == "-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
+    if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
         try:
@@ -2959,6 +2979,11 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, comp
             shutil.copyfileobj(catfp, sys.stdout.buffer)
         else:
             shutil.copyfileobj(catfp, sys.stdout)
+    elif(outfile is None):
+        catfp.seek(0, 0)
+        outvar = catfp.read()
+        catfp.close()
+        return outvar
     elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
@@ -2974,15 +2999,15 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, comp
 
 def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, compression="auto", compresswholefile=True, compressionlevel=None, filevalues=[], extradata=[], followlink=False, checksumtype="crc32", formatspecs=__file_format_dict__, verbose=False, returnfp=False):
     formatspecs = FormatSpecsListToDict(formatspecs)
-    if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
         if(os.path.exists(outfile)):
             try:
                 os.unlink(outfile)
             except OSError:
                 pass
-    if(outfile == "-"):
+    if(outfile == "-" or outfile is None):
         verbose = False
-        catfpfp = BytesIO()
+        catfp = BytesIO()
     elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
         catfp = outfile
     elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
@@ -2995,7 +3020,7 @@ def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, compr
         catfp = CompressOpenFile(outfile, compresswholefile, compressionlevel)
     catfp = AppendListsWithContent(inlist, catfp, dirlistfromtxt, filevalues, extradata, compression,
                                    compresswholefile, compressionlevel, followlink, checksumtype, formatspecs, verbose)
-    if(outfile == "-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
+    if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
         try:
@@ -3014,6 +3039,11 @@ def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, compr
             shutil.copyfileobj(catfp, sys.stdout.buffer)
         else:
             shutil.copyfileobj(catfp, sys.stdout)
+    elif(outfile is None):
+        catfp.seek(0, 0)
+        outvar = catfp.read()
+        catfp.close()
+        return outvar
     elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
@@ -3714,7 +3744,7 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
     formatspecs = FormatSpecsListToDict(formatspecs)
     advancedlist = formatspecs['use_advanced_list']
     altinode = formatspecs['use_alt_inode']
-    if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
         outfile = RemoveWindowsPath(outfile)
     checksumtype = checksumtype.lower()
     if(not CheckSumSupport(checksumtype, hashlib_guaranteed)):
@@ -3728,13 +3758,13 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
     if(verbose):
         logging.basicConfig(format="%(message)s",
                             stream=sys.stdout, level=logging.DEBUG)
-    if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
         if(os.path.exists(outfile)):
             try:
                 os.unlink(outfile)
             except OSError:
                 pass
-    if(outfile == "-"):
+    if(outfile == "-" or outfile is None):
         verbose = False
         catfp = BytesIO()
     elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
@@ -3803,8 +3833,8 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
         ftype = 0
         if(hasattr(os.path, "isjunction") and os.path.isjunction(fname)):
             ftype = 13
-        elif(fstatinfo.st_blocks * 512 < fstatinfo.st_size):
-            ftype = 12
+        #elif(fstatinfo.st_blocks * 512 < fstatinfo.st_size):
+        #    ftype = 12
         elif(stat.S_ISREG(fpremode)):
             ftype = 0
         elif(stat.S_ISLNK(fpremode)):
@@ -3864,9 +3894,13 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
         getfdev = GetDevMajorMinor(fdev)
         fdev_minor = getfdev[0]
         fdev_major = getfdev[1]
-        if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):
+        # Types that should be considered zero-length in the archive context:
+        zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
+        # Types that have actual data to read:
+        data_types = {0, 7, 12}
+        if ftype in zero_length_types:
             fsize = format(int("0"), 'x').lower()
-        elif(ftype == 0 or ftype == 7):
+        elif ftype in data_types:
             fsize = format(int(fstatinfo.st_size), 'x').lower()
         else:
             fsize = format(int(fstatinfo.st_size)).lower()
@@ -3915,7 +3949,7 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
         fcompression = ""
         fcsize = format(int(0), 'x').lower()
         fcontents = BytesIO()
-        if(ftype == 0 or ftype == 7):
+        if ftype in data_types:
             with open(fname, "rb") as fpc:
                 shutil.copyfileobj(fpc, fcontents)
                 if(not compresswholefile):
@@ -4007,14 +4041,14 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
         fcontents.seek(0, 0)
         ftypehex = format(ftype, 'x').lower()
         catoutlist = [ftypehex, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
-                      fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+1"]
+                      fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
         catfp = AppendFileHeaderWithContent(
             catfp, catoutlist, extradata, fcontents.read(), checksumtype, formatspecs)
         fcontents.close()
     if(numfiles > 0):
         catfp.write(AppendNullBytes(
             [0, 0], formatspecs['format_delimiter']).encode("UTF-8"))
-    if(outfile == "-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
+    if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
         try:
@@ -4033,6 +4067,11 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
             shutil.copyfileobj(catfp, sys.stdout.buffer)
         else:
             shutil.copyfileobj(catfp, sys.stdout)
+    elif(outfile is None):
+        catfp.seek(0, 0)
+        outvar = catfp.read()
+        catfp.close()
+        return outvar
     elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
@@ -4066,7 +4105,7 @@ create_alias_function("Pack", __file_format_name__,
 
 def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswholefile=True, compressionlevel=None, checksumtype="crc32", extradata=[], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
     formatspecs = FormatSpecsListToDict(formatspecs)
-    if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
         outfile = RemoveWindowsPath(outfile)
     checksumtype = checksumtype.lower()
     if(not CheckSumSupport(checksumtype, hashlib_guaranteed)):
@@ -4080,13 +4119,13 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
     if(verbose):
         logging.basicConfig(format="%(message)s",
                             stream=sys.stdout, level=logging.DEBUG)
-    if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
         if(os.path.exists(outfile)):
             try:
                 os.unlink(outfile)
             except OSError:
                 pass
-    if(outfile == "-"):
+    if(outfile == "-" or outfile is None):
         verbose = False
         catfp = BytesIO()
     elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
@@ -4194,9 +4233,13 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
             fdev = format(int(MakeDevAlt(member.devmajor, member.devminor)), 'x').lower()
         fdev_minor = format(int(member.devminor), 'x').lower()
         fdev_major = format(int(member.devmajor), 'x').lower()
-        if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):
+        # Types that should be considered zero-length in the archive context:
+        zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
+        # Types that have actual data to read:
+        data_types = {0, 7, 12}
+        if ftype in zero_length_types:
             fsize = format(int("0"), 'x').lower()
-        elif(ftype == 0 or ftype == 7):
+        elif ftype in data_types:
             fsize = format(int(member.size), 'x').lower()
         else:
             fsize = format(int(member.size), 'x').lower()
@@ -4216,7 +4259,7 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
         fcompression = ""
         fcsize = format(int(0), 'x').lower()
         fcontents = BytesIO()
-        if(ftype == 0 or ftype == 7):
+        if ftype in data_types:
             with tarfp.extractfile(member) as fpc:
                 shutil.copyfileobj(fpc, fcontents)
                 if(not compresswholefile):
@@ -4264,14 +4307,14 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
         fcontents.seek(0, 0)
         ftypehex = format(ftype, 'x').lower()
         catoutlist = [ftypehex, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
-                      fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+1"]
+                      fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
         catfp = AppendFileHeaderWithContent(
             catfp, catoutlist, extradata, fcontents.read(), checksumtype, formatspecs)
         fcontents.close()
     if(numfiles > 0):
         catfp.write(AppendNullBytes(
             [0, 0], formatspecs['format_delimiter']).encode("UTF-8"))
-    if(outfile == "-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
+    if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
         try:
@@ -4290,6 +4333,11 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
             shutil.copyfileobj(catfp, sys.stdout.buffer)
         else:
             shutil.copyfileobj(catfp, sys.stdout)
+    elif(outfile is None):
+        catfp.seek(0, 0)
+        outvar = catfp.read()
+        catfp.close()
+        return outvar
     elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
@@ -4309,7 +4357,7 @@ create_alias_function("Pack", __file_format_name__,
 
 def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compresswholefile=True, compressionlevel=None, checksumtype="crc32", extradata=[], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
     formatspecs = FormatSpecsListToDict(formatspecs)
-    if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
         outfile = RemoveWindowsPath(outfile)
     checksumtype = checksumtype.lower()
     if(not CheckSumSupport(checksumtype, hashlib_guaranteed)):
@@ -4323,13 +4371,13 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compresswhol
     if(verbose):
         logging.basicConfig(format="%(message)s",
                             stream=sys.stdout, level=logging.DEBUG)
-    if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
         if(os.path.exists(outfile)):
             try:
                 os.unlink(outfile)
             except OSError:
                 pass
-    if(outfile == "-"):
+    if(outfile == "-" or outfile is None):
         verbose = False
         catfp = BytesIO()
     elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
@@ -4531,14 +4579,14 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compresswhol
         fcontents.seek(0, 0)
         ftypehex = format(ftype, 'x').lower()
         catoutlist = [ftypehex, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
-                      fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+1"]
+                      fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
         catfp = AppendFileHeaderWithContent(
             catfp, catoutlist, extradata, fcontents.read(), checksumtype, formatspecs)
         fcontents.close()
     if(numfiles > 0):
         catfp.write(AppendNullBytes(
             [0, 0], formatspecs['format_delimiter']).encode("UTF-8"))
-    if(outfile == "-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
+    if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
         try:
@@ -4557,6 +4605,11 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compresswhol
             shutil.copyfileobj(catfp, sys.stdout.buffer)
         else:
             shutil.copyfileobj(catfp, sys.stdout)
+    elif(outfile is None):
+        catfp.seek(0, 0)
+        outvar = catfp.read()
+        catfp.close()
+        return outvar
     elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
@@ -4580,7 +4633,7 @@ if(not rarfile_support):
 if(rarfile_support):
     def PackArchiveFileFromRarFile(infile, outfile, compression="auto", compresswholefile=True, compressionlevel=None, checksumtype="crc32", extradata=[], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
         formatspecs = FormatSpecsListToDict(formatspecs)
-        if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+        if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
             outfile = RemoveWindowsPath(outfile)
         checksumtype = checksumtype.lower()
         if(not CheckSumSupport(checksumtype, hashlib_guaranteed)):
@@ -4594,13 +4647,13 @@ if(rarfile_support):
         if(verbose):
             logging.basicConfig(format="%(message)s",
                                 stream=sys.stdout, level=logging.DEBUG)
-        if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+        if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
             if(os.path.exists(outfile)):
                 try:
                     os.unlink(outfile)
                 except OSError:
                     pass
-        if(outfile == "-"):
+        if(outfile == "-" or outfile is None):
             verbose = False
             catfp = BytesIO()
         elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
@@ -4829,14 +4882,14 @@ if(rarfile_support):
             fcontents.seek(0, 0)
             ftypehex = format(ftype, 'x').lower()
             catoutlist = [ftypehex, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
-                          fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+1"]
+                          fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
             catfp = AppendFileHeaderWithContent(
                 catfp, catoutlist, extradata, fcontents.read(), checksumtype, formatspecs)
             fcontents.close()
         if(numfiles > 0):
             catfp.write(AppendNullBytes(
                 [0, 0], formatspecs['format_delimiter']).encode("UTF-8"))
-        if(outfile == "-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
+        if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
             catfp = CompressArchiveFile(
                 catfp, compression, compressionlevel, formatspecs)
             try:
@@ -4855,6 +4908,11 @@ if(rarfile_support):
                 shutil.copyfileobj(catfp, sys.stdout.buffer)
             else:
                 shutil.copyfileobj(catfp, sys.stdout)
+        elif(outfile is None):
+            catfp.seek(0, 0)
+            outvar = catfp.read()
+            catfp.close()
+            return outvar
         elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
             catfp = CompressArchiveFile(
                 catfp, compression, compressionlevel, formatspecs)
@@ -4877,7 +4935,7 @@ if(not py7zr_support):
 if(py7zr_support):
     def PackArchiveFileFromSevenZipFile(infile, outfile, compression="auto", compresswholefile=True, compressionlevel=None, checksumtype="crc32", extradata=[], formatspecs=__file_format_dict__, verbose=False, returnfp=False):
         formatspecs = FormatSpecsListToDict(formatspecs)
-        if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+        if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
             outfile = RemoveWindowsPath(outfile)
         checksumtype = checksumtype.lower()
         if(not CheckSumSupport(checksumtype, hashlib_guaranteed)):
@@ -4891,13 +4949,13 @@ if(py7zr_support):
         if(verbose):
             logging.basicConfig(format="%(message)s",
                                 stream=sys.stdout, level=logging.DEBUG)
-        if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+        if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
             if(os.path.exists(outfile)):
                 try:
                     os.unlink(outfile)
                 except OSError:
                     pass
-        if(outfile == "-"):
+        if(outfile == "-" or outfile is None):
             verbose = False
             catfp = BytesIO()
         elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
@@ -5059,14 +5117,14 @@ if(py7zr_support):
             fcontents.seek(0, 0)
             ftypehex = format(ftype, 'x').lower()
             catoutlist = [ftypehex, fname, flinkname, fsize, fatime, fmtime, fctime, fbtime, fmode, fwinattributes, fcompression,
-                          fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+1"]
+                          fcsize, fuid, funame, fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, "+"+str(len(formatspecs['format_delimiter']))]
             catfp = AppendFileHeaderWithContent(
                 catfp, catoutlist, extradata, fcontents.read(), checksumtype, formatspecs)
             fcontents.close()
         if(numfiles > 0):
             catfp.write(AppendNullBytes(
                 [0, 0], formatspecs['format_delimiter']).encode("UTF-8"))
-        if(outfile == "-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
+        if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
             catfp = CompressArchiveFile(
                 catfp, compression, compressionlevel, formatspecs)
             try:
@@ -5085,6 +5143,11 @@ if(py7zr_support):
                 shutil.copyfileobj(catfp, sys.stdout.buffer)
             else:
                 shutil.copyfileobj(catfp, sys.stdout)
+        elif(outfile is None):
+            catfp.seek(0, 0)
+            outvar = catfp.read()
+            catfp.close()
+            return outvar
         elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
             catfp = CompressArchiveFile(
                 catfp, compression, compressionlevel, formatspecs)
@@ -5157,6 +5220,14 @@ def ArchiveFileSeekToFileNum(infile, seekto=0, listonly=False, contentasfile=Tru
         if(not catfp):
             return False
         catfp.seek(0, 0)
+    elif(isinstance(infile, bytes)):
+        catfp = BytesIO()
+        catfp.write(infile)
+        catfp.seek(0, 0)
+        catfp = UncompressArchiveFile(catfp, formatspecs)
+        if(not catfp):
+            return False
+        catfp.seek(0, 0)
     elif(re.findall("^(http|https|ftp|ftps|sftp):\\/\\/", str(infile))):
         catfp = download_file_from_internet_file(infile)
         catfp.seek(0, 0)
@@ -5416,6 +5487,14 @@ def ArchiveFileSeekToFileName(infile, seekfile=None, listonly=False, contentasfi
         if(not catfp):
             return False
         catfp.seek(0, 0)
+    elif(isinstance(infile, bytes)):
+        catfp = BytesIO()
+        catfp.write(infile)
+        catfp.seek(0, 0)
+        catfp = UncompressArchiveFile(catfp, formatspecs)
+        if(not catfp):
+            return False
+        catfp.seek(0, 0)
     elif(re.findall("^(http|https|ftp|ftps|sftp):\\/\\/", str(infile))):
         catfp = download_file_from_internet_file(infile)
         catfp = UncompressArchiveFile(catfp, formatspecs)
@@ -5688,6 +5767,14 @@ def ArchiveFileValidate(infile, formatspecs=__file_format_dict__, verbose=False,
         if(not catfp):
             return False
         catfp.seek(0, 0)
+    elif(isinstance(infile, bytes)):
+        catfp = BytesIO()
+        catfp.write(infile)
+        catfp.seek(0, 0)
+        catfp = UncompressArchiveFile(catfp, formatspecs)
+        if(not catfp):
+            return False
+        catfp.seek(0, 0)
     elif(re.findall("^(http|https|ftp|ftps|sftp):\\/\\/", str(infile))):
         catfp = download_file_from_internet_file(infile)
         catfp = UncompressArchiveFile(catfp, formatspecs)
@@ -5967,6 +6054,14 @@ def ArchiveFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentas
         if(not catfp):
             return False
         catfp.seek(0, 0)
+    elif(isinstance(infile, bytes)):
+        catfp = BytesIO()
+        catfp.write(infile)
+        catfp.seek(0, 0)
+        catfp = UncompressArchiveFile(catfp, formatspecs)
+        if(not catfp):
+            return False
+        catfp.seek(0, 0)
     elif(re.findall("^(http|https|ftp|ftps|sftp):\\/\\/", str(infile))):
         catfp = download_file_from_internet_file(infile)
         catfp = UncompressArchiveFile(catfp, formatspecs)
@@ -6442,8 +6537,8 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
         ftype = 0
         if(hasattr(os.path, "isjunction") and os.path.isjunction(fname)):
             ftype = 13
-        elif(fstatinfo.st_blocks * 512 < fstatinfo.st_size):
-            ftype = 12
+        #elif(fstatinfo.st_blocks * 512 < fstatinfo.st_size):
+        #    ftype = 12
         elif(stat.S_ISREG(fpremode)):
             ftype = 0
         elif(stat.S_ISLNK(fpremode)):
@@ -6504,9 +6599,15 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
         getfdev = GetDevMajorMinor(fdev)
         fdev_minor = getfdev[0]
         fdev_major = getfdev[1]
-        if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):
+        # Types that should be considered zero-length in the archive context:
+        zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
+        # Types that have actual data to read:
+        data_types = {0, 7, 12}
+        if ftype in zero_length_types:
             fsize = "0"
-        if(ftype == 0 or ftype == 7):
+        elif ftype in data_types:
+            fsize = fstatinfo.st_size
+        else:
             fsize = fstatinfo.st_size
         fatime = fstatinfo.st_atime
         fmtime = fstatinfo.st_mtime
@@ -6547,7 +6648,7 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
         fcompression = ""
         fcsize = 0
         fcontents = BytesIO()
-        if(ftype == 0 or ftype == 7):
+        if ftype in data_types:
             with open(fname, "rb") as fpc:
                 shutil.copyfileobj(fpc, fcontents)
         if(followlink and (ftype == 1 or ftype == 2)):
@@ -6567,7 +6668,7 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
         extrasizelen = len(extrasizestr)
         extrasizelenhex = format(extrasizelen, 'x').lower()
         catoutlist = [ftypehex, fname, flinkname, format(int(fsize), 'x').lower(), format(int(fatime), 'x').lower(), format(int(fmtime), 'x').lower(), format(int(fctime), 'x').lower(), format(int(fbtime), 'x').lower(), format(int(fmode), 'x').lower(), format(int(fwinattributes), 'x').lower(), fcompression, format(int(fcsize), 'x').lower(), format(int(fuid), 'x').lower(
-        ), funame, format(int(fgid), 'x').lower(), fgname, format(int(fcurfid), 'x').lower(), format(int(fcurinode), 'x').lower(), format(int(flinkcount), 'x').lower(), format(int(fdev), 'x').lower(), format(int(fdev_minor), 'x').lower(), format(int(fdev_major), 'x').lower(), "+1", extrasizelenhex, format(catfextrafields, 'x').lower()]
+        ), funame, format(int(fgid), 'x').lower(), fgname, format(int(fcurfid), 'x').lower(), format(int(fcurinode), 'x').lower(), format(int(flinkcount), 'x').lower(), format(int(fdev), 'x').lower(), format(int(fdev_minor), 'x').lower(), format(int(fdev_major), 'x').lower(), "+"+str(len(formatspecs['format_delimiter'])), extrasizelenhex, format(catfextrafields, 'x').lower()]
         catoutlen = len(catoutlist) + len(extradata) + 3
         catoutlenhex = format(catoutlen, 'x').lower()
         catoutlist.insert(0, catoutlenhex)
@@ -6622,7 +6723,7 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
         if(not contentasfile):
             fcontents = fcontents.read()
         catlist['ffilelist'].append({'fid': fileidnum, 'fidalt': fileidnum, 'fheadersize': int(catheaersize, 16), 'fhstart': catfhstart, 'fhend': catfhend, 'ftype': ftype, 'fname': fname, 'fbasedir': fbasedir, 'flinkname': flinkname, 'fsize': fsize, 'fatime': fatime, 'fmtime': fmtime, 'fctime': fctime, 'fbtime': fbtime, 'fmode': fmode, 'fchmode': fchmode, 'ftypemod': ftypemod, 'fwinattributes': fwinattributes, 'fcompression': fcompression, 'fcsize': fcsize, 'fuid': fuid, 'funame': funame, 'fgid': fgid, 'fgname': fgname, 'finode': finode, 'flinkcount': flinkcount,
-                                     'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': "+1", 'fheaderchecksumtype': checksumtype, 'fcontentchecksumtype': checksumtype, 'fnumfields': catfnumfields + 2, 'frawheader': catheaderdata, 'fextrafields': catfextrafields, 'fextrafieldsize': extrasizelen, 'fextralist': extrafieldslist, 'fheaderchecksum': int(catfileheadercshex, 16), 'fcontentchecksum': int(catfilecontentcshex, 16), 'fhascontents': pyhascontents, 'fcontentstart': catfcontentstart, 'fcontentend': catfcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents})
+                                     'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': "+"+str(len(formatspecs['format_delimiter'])), 'fheaderchecksumtype': checksumtype, 'fcontentchecksumtype': checksumtype, 'fnumfields': catfnumfields + 2, 'frawheader': catheaderdata, 'fextrafields': catfextrafields, 'fextrafieldsize': extrasizelen, 'fextralist': extrafieldslist, 'fheaderchecksum': int(catfileheadercshex, 16), 'fcontentchecksum': int(catfilecontentcshex, 16), 'fhascontents': pyhascontents, 'fcontentstart': catfcontentstart, 'fcontentend': catfcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents})
         fileidnum = fileidnum + 1
     return catlist
 
@@ -6742,9 +6843,13 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
             fdev = MakeDevAlt(member.devmajor, member.devminor)
         fdev_minor = member.devminor
         fdev_major = member.devmajor
-        if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):
+        # Types that should be considered zero-length in the archive context:
+        zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
+        # Types that have actual data to read:
+        data_types = {0, 7, 12}
+        if ftype in zero_length_types:
             fsize = "0"
-        elif(ftype == 0 or ftype == 7):
+        elif ftype in data_types:
             fsize = member.size
         else:
             fsize = member.size
@@ -6764,7 +6869,7 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
         fcompression = ""
         fcsize = 0
         fcontents = BytesIO()
-        if(ftype == 0 or ftype == 7):
+        if ftype in data_types:
             with tarfp.extractfile(member) as fpc:
                 shutil.copyfileobj(fpc, fcontents)
         fcontents.seek(0, 0)
@@ -6780,7 +6885,7 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
         extrasizelen = len(extrasizestr)
         extrasizelenhex = format(extrasizelen, 'x').lower()
         catoutlist = [ftypehex, fname, flinkname, format(int(fsize), 'x').lower(), format(int(fatime), 'x').lower(), format(int(fmtime), 'x').lower(), format(int(fctime), 'x').lower(), format(int(fbtime), 'x').lower(), format(int(fmode), 'x').lower(), format(int(fwinattributes), 'x').lower(), fcompression, format(int(fcsize), 'x').lower(), format(int(fuid), 'x').lower(
-        ), funame, format(int(fgid), 'x').lower(), fgname, format(int(fcurfid), 'x').lower(), format(int(fcurinode), 'x').lower(), format(int(flinkcount), 'x').lower(), format(int(fdev), 'x').lower(), format(int(fdev_minor), 'x').lower(), format(int(fdev_major), 'x').lower(), "+1", extrasizelenhex, format(catfextrafields, 'x').lower()]
+        ), funame, format(int(fgid), 'x').lower(), fgname, format(int(fcurfid), 'x').lower(), format(int(fcurinode), 'x').lower(), format(int(flinkcount), 'x').lower(), format(int(fdev), 'x').lower(), format(int(fdev_minor), 'x').lower(), format(int(fdev_major), 'x').lower(), "+"+str(len(formatspecs['format_delimiter'])), extrasizelenhex, format(catfextrafields, 'x').lower()]
         catoutlen = len(catoutlist) + len(extradata) + 3
         catoutlenhex = format(catoutlen, 'x').lower()
         catoutlist.insert(0, catoutlenhex)
@@ -6835,7 +6940,7 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
         if(not contentasfile):
             fcontents = fcontents.read()
         catlist['ffilelist'].append({'fid': fileidnum, 'fidalt': fileidnum, 'fheadersize': int(catheaersize, 16), 'fhstart': catfhstart, 'fhend': catfhend, 'ftype': ftype, 'fname': fname, 'fbasedir': fbasedir, 'flinkname': flinkname, 'fsize': fsize, 'fatime': fatime, 'fmtime': fmtime, 'fctime': fctime, 'fbtime': fbtime, 'fmode': fmode, 'fchmode': fchmode, 'ftypemod': ftypemod, 'fwinattributes': fwinattributes, 'fcompression': fcompression, 'fcsize': fcsize, 'fuid': fuid, 'funame': funame, 'fgid': fgid, 'fgname': fgname, 'finode': finode, 'flinkcount': flinkcount,
-                                    'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': "+1", 'fheaderchecksumtype': checksumtype, 'fcontentchecksumtype': checksumtype, 'fnumfields': catfnumfields + 2, 'frawheader': catheaderdata, 'fextrafields': catfextrafields, 'fextrafieldsize': extrasizelen, 'fextralist': extrafieldslist, 'fheaderchecksum': int(catfileheadercshex, 16), 'fcontentchecksum': int(catfilecontentcshex, 16), 'fhascontents': pyhascontents, 'fcontentstart': catfcontentstart, 'fcontentend': catfcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents})
+                                    'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': "+"+str(len(formatspecs['format_delimiter'])), 'fheaderchecksumtype': checksumtype, 'fcontentchecksumtype': checksumtype, 'fnumfields': catfnumfields + 2, 'frawheader': catheaderdata, 'fextrafields': catfextrafields, 'fextrafieldsize': extrasizelen, 'fextralist': extrafieldslist, 'fheaderchecksum': int(catfileheadercshex, 16), 'fcontentchecksum': int(catfilecontentcshex, 16), 'fhascontents': pyhascontents, 'fcontentstart': catfcontentstart, 'fcontentend': catfcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents})
         fileidnum = fileidnum + 1
     return catlist
 
@@ -7015,7 +7120,7 @@ def ZipFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
         extrasizelen = len(extrasizestr)
         extrasizelenhex = format(extrasizelen, 'x').lower()
         catoutlist = [ftypehex, fname, flinkname, format(int(fsize), 'x').lower(), format(int(fatime), 'x').lower(), format(int(fmtime), 'x').lower(), format(int(fctime), 'x').lower(), format(int(fbtime), 'x').lower(), format(int(fmode), 'x').lower(), format(int(fwinattributes), 'x').lower(), fcompression, format(int(fcsize), 'x').lower(), format(int(fuid), 'x').lower(
-        ), funame, format(int(fgid), 'x').lower(), fgname, format(int(fcurfid), 'x').lower(), format(int(fcurinode), 'x').lower(), format(int(flinkcount), 'x').lower(), format(int(fdev), 'x').lower(), format(int(fdev_minor), 'x').lower(), format(int(fdev_major), 'x').lower(), "+1", extrasizelenhex, format(catfextrafields, 'x').lower()]
+        ), funame, format(int(fgid), 'x').lower(), fgname, format(int(fcurfid), 'x').lower(), format(int(fcurinode), 'x').lower(), format(int(flinkcount), 'x').lower(), format(int(fdev), 'x').lower(), format(int(fdev_minor), 'x').lower(), format(int(fdev_major), 'x').lower(), "+"+str(len(formatspecs['format_delimiter'])), extrasizelenhex, format(catfextrafields, 'x').lower()]
         catoutlen = len(catoutlist) + len(extradata) + 3
         catoutlenhex = format(catoutlen, 'x').lower()
         catoutlist.insert(0, catoutlenhex)
@@ -7070,7 +7175,7 @@ def ZipFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
         if(not contentasfile):
             fcontents = fcontents.read()
         catlist['ffilelist'].append({'fid': fileidnum, 'fidalt': fileidnum, 'fheadersize': int(catheaersize, 16), 'fhstart': catfhstart, 'fhend': catfhend, 'ftype': ftype, 'fname': fname, 'fbasedir': fbasedir, 'flinkname': flinkname, 'fsize': fsize, 'fatime': fatime, 'fmtime': fmtime, 'fctime': fctime, 'fbtime': fbtime, 'fmode': fmode, 'fchmode': fchmode, 'ftypemod': ftypemod, 'fwinattributes': fwinattributes, 'fcompression': fcompression, 'fcsize': fcsize, 'fuid': fuid, 'funame': funame, 'fgid': fgid, 'fgname': fgname, 'finode': finode, 'flinkcount': flinkcount,
-                                    'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': "+1", 'fheaderchecksumtype': checksumtype, 'fcontentchecksumtype': checksumtype, 'fnumfields': catfnumfields + 2, 'frawheader': catheaderdata, 'fextrafields': catfextrafields, 'fextrafieldsize': extrasizelen, 'fextralist': extrafieldslist, 'fheaderchecksum': int(catfileheadercshex, 16), 'fcontentchecksum': int(catfilecontentcshex, 16), 'fhascontents': pyhascontents, 'fcontentstart': catfcontentstart, 'fcontentend': catfcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents})
+                                    'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': "+"+str(len(formatspecs['format_delimiter'])), 'fheaderchecksumtype': checksumtype, 'fcontentchecksumtype': checksumtype, 'fnumfields': catfnumfields + 2, 'frawheader': catheaderdata, 'fextrafields': catfextrafields, 'fextrafieldsize': extrasizelen, 'fextralist': extrafieldslist, 'fheaderchecksum': int(catfileheadercshex, 16), 'fcontentchecksum': int(catfilecontentcshex, 16), 'fhascontents': pyhascontents, 'fcontentstart': catfcontentstart, 'fcontentend': catfcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents})
         fileidnum = fileidnum + 1
     return catlist
 
@@ -7263,7 +7368,7 @@ if(rarfile_support):
             extrasizelen = len(extrasizestr)
             extrasizelenhex = format(extrasizelen, 'x').lower()
             catoutlist = [ftypehex, fname, flinkname, format(int(fsize), 'x').lower(), format(int(fatime), 'x').lower(), format(int(fmtime), 'x').lower(), format(int(fctime), 'x').lower(), format(int(fbtime), 'x').lower(), format(int(fmode), 'x').lower(), format(int(fwinattributes), 'x').lower(), fcompression, format(int(fcsize), 'x').lower(), format(int(fuid), 'x').lower(
-            ), funame, format(int(fgid), 'x').lower(), fgname, format(int(fcurfid), 'x').lower(), format(int(fcurinode), 'x').lower(), format(int(flinkcount), 'x').lower(), format(int(fdev), 'x').lower(), format(int(fdev_minor), 'x').lower(), format(int(fdev_major), 'x').lower(), "+1", extrasizelenhex, format(catfextrafields, 'x').lower()]
+            ), funame, format(int(fgid), 'x').lower(), fgname, format(int(fcurfid), 'x').lower(), format(int(fcurinode), 'x').lower(), format(int(flinkcount), 'x').lower(), format(int(fdev), 'x').lower(), format(int(fdev_minor), 'x').lower(), format(int(fdev_major), 'x').lower(), "+"+str(len(formatspecs['format_delimiter'])), extrasizelenhex, format(catfextrafields, 'x').lower()]
             catoutlen = len(catoutlist) + len(extradata) + 3
             catoutlenhex = format(catoutlen, 'x').lower()
             catoutlist.insert(0, catoutlenhex)
@@ -7318,7 +7423,7 @@ if(rarfile_support):
             if(not contentasfile):
                 fcontents = fcontents.read()
             catlist['ffilelist'].append({'fid': fileidnum, 'fidalt': fileidnum, 'fheadersize': int(catheaersize, 16), 'fhstart': catfhstart, 'fhend': catfhend, 'ftype': ftype, 'fname': fname, 'fbasedir': fbasedir, 'flinkname': flinkname, 'fsize': fsize, 'fatime': fatime, 'fmtime': fmtime, 'fctime': fctime, 'fbtime': fbtime, 'fmode': fmode, 'fchmode': fchmode, 'ftypemod': ftypemod, 'fwinattributes': fwinattributes, 'fcompression': fcompression, 'fcsize': fcsize, 'fuid': fuid, 'funame': funame, 'fgid': fgid, 'fgname': fgname, 'finode': finode, 'flinkcount': flinkcount,
-                                        'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': "+1", 'fheaderchecksumtype': checksumtype, 'fcontentchecksumtype': checksumtype, 'fnumfields': catfnumfields + 2, 'frawheader': catheaderdata, 'fextrafields': catfextrafields, 'fextrafieldsize': extrasizelen, 'fextralist': extrafieldslist, 'fheaderchecksum': int(catfileheadercshex, 16), 'fcontentchecksum': int(catfilecontentcshex, 16), 'fhascontents': pyhascontents, 'fcontentstart': catfcontentstart, 'fcontentend': catfcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents})
+                                        'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': "+"+str(len(formatspecs['format_delimiter'])), 'fheaderchecksumtype': checksumtype, 'fcontentchecksumtype': checksumtype, 'fnumfields': catfnumfields + 2, 'frawheader': catheaderdata, 'fextrafields': catfextrafields, 'fextrafieldsize': extrasizelen, 'fextralist': extrafieldslist, 'fheaderchecksum': int(catfileheadercshex, 16), 'fcontentchecksum': int(catfilecontentcshex, 16), 'fhascontents': pyhascontents, 'fcontentstart': catfcontentstart, 'fcontentend': catfcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents})
             fileidnum = fileidnum + 1
         return catlist
 
@@ -7455,7 +7560,7 @@ if(py7zr_support):
             extrasizelen = len(extrasizestr)
             extrasizelenhex = format(extrasizelen, 'x').lower()
             catoutlist = [ftypehex, fname, flinkname, format(int(fsize), 'x').lower(), format(int(fatime), 'x').lower(), format(int(fmtime), 'x').lower(), format(int(fctime), 'x').lower(), format(int(fbtime), 'x').lower(), format(int(fmode), 'x').lower(), format(int(fwinattributes), 'x').lower(), fcompression, format(int(fcsize), 'x').lower(), format(int(fuid), 'x').lower(
-            ), funame, format(int(fgid), 'x').lower(), fgname, format(int(fcurfid), 'x').lower(), format(int(fcurinode), 'x').lower(), format(int(flinkcount), 'x').lower(), format(int(fdev), 'x').lower(), format(int(fdev_minor), 'x').lower(), format(int(fdev_major), 'x').lower(), "+1", extrasizelenhex, format(catfextrafields, 'x').lower()]
+            ), funame, format(int(fgid), 'x').lower(), fgname, format(int(fcurfid), 'x').lower(), format(int(fcurinode), 'x').lower(), format(int(flinkcount), 'x').lower(), format(int(fdev), 'x').lower(), format(int(fdev_minor), 'x').lower(), format(int(fdev_major), 'x').lower(), "+"+str(len(formatspecs['format_delimiter'])), extrasizelenhex, format(catfextrafields, 'x').lower()]
             catoutlen = len(catoutlist) + len(extradata) + 3
             catoutlenhex = format(catoutlen, 'x').lower()
             catoutlist.insert(0, catoutlenhex)
@@ -7510,7 +7615,7 @@ if(py7zr_support):
             if(not contentasfile):
                 fcontents = fcontents.read()
             catlist['ffilelist'].append({'fid': fileidnum, 'fidalt': fileidnum, 'fheadersize': int(catheaersize, 16), 'fhstart': catfhstart, 'fhend': catfhend, 'ftype': ftype, 'fname': fname, 'fbasedir': fbasedir, 'flinkname': flinkname, 'fsize': fsize, 'fatime': fatime, 'fmtime': fmtime, 'fctime': fctime, 'fbtime': fbtime, 'fmode': fmode, 'fchmode': fchmode, 'ftypemod': ftypemod, 'fwinattributes': fwinattributes, 'fcompression': fcompression, 'fcsize': fcsize, 'fuid': fuid, 'funame': funame, 'fgid': fgid, 'fgname': fgname, 'finode': finode, 'flinkcount': flinkcount,
-                                        'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': "+1", 'fheaderchecksumtype': checksumtype, 'fcontentchecksumtype': checksumtype, 'fnumfields': catfnumfields + 2, 'frawheader': catheaderdata, 'fextrafields': catfextrafields, 'fextrafieldsize': extrasizelen, 'fextralist': extrafieldslist, 'fheaderchecksum': int(catfileheadercshex, 16), 'fcontentchecksum': int(catfilecontentcshex, 16), 'fhascontents': pyhascontents, 'fcontentstart': catfcontentstart, 'fcontentend': catfcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents})
+                                        'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': "+"+str(len(formatspecs['format_delimiter'])), 'fheaderchecksumtype': checksumtype, 'fcontentchecksumtype': checksumtype, 'fnumfields': catfnumfields + 2, 'frawheader': catheaderdata, 'fextrafields': catfextrafields, 'fextrafieldsize': extrasizelen, 'fextralist': extrafieldslist, 'fheaderchecksum': int(catfileheadercshex, 16), 'fcontentchecksum': int(catfilecontentcshex, 16), 'fhascontents': pyhascontents, 'fcontentstart': catfcontentstart, 'fcontentend': catfcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents})
             fileidnum = fileidnum + 1
         return catlist
 
@@ -7619,11 +7724,11 @@ def RePackArchiveFile(infile, outfile, compression="auto", compresswholefile=Tru
     if(isinstance(infile, dict)):
         listcatfiles = infile
     else:
-        if(infile != "-" and not hasattr(infile, "read") and not hasattr(infile, "write")):
+        if(infile != "-" and not isinstance(infile, bytes) and not hasattr(infile, "read") and not hasattr(infile, "write")):
             infile = RemoveWindowsPath(infile)
         listcatfiles = ArchiveFileToArray(
             infile, seekstart, seekend, False, True, skipchecksum, formatspecs, returnfp)
-    if(outfile != "-" and not hasattr(infile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and not isinstance(infile, bytes) and not hasattr(infile, "read") and not hasattr(outfile, "write")):
         outfile = RemoveWindowsPath(outfile)
     checksumtype = checksumtype.lower()
     if(not CheckSumSupport(checksumtype, hashlib_guaranteed)):
@@ -7637,7 +7742,7 @@ def RePackArchiveFile(infile, outfile, compression="auto", compresswholefile=Tru
     if(verbose):
         logging.basicConfig(format="%(message)s",
                             stream=sys.stdout, level=logging.DEBUG)
-    if(outfile != "-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
         if(os.path.exists(outfile)):
             try:
                 os.unlink(outfile)
@@ -7645,7 +7750,7 @@ def RePackArchiveFile(infile, outfile, compression="auto", compresswholefile=Tru
                 pass
     if(not listcatfiles):
         return False
-    if(outfile == "-"):
+    if(outfile == "-" or outfile is None):
         verbose = False
         catfp = BytesIO()
     elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
@@ -7840,7 +7945,7 @@ def RePackArchiveFile(infile, outfile, compression="auto", compresswholefile=Tru
     if(lcfx > 0):
         catfp.write(AppendNullBytes(
             [0, 0], formatspecs['format_delimiter']).encode("UTF-8"))
-    if(outfile == "-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
+    if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)
         try:
@@ -7859,6 +7964,11 @@ def RePackArchiveFile(infile, outfile, compression="auto", compresswholefile=Tru
             shutil.copyfileobj(catfp, sys.stdout.buffer)
         else:
             shutil.copyfileobj(catfp, sys.stdout)
+    elif(outfile is None):
+        catfp.seek(0, 0)
+        outvar = catfp.read()
+        catfp.close()
+        return outvar
     elif(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
         catfp = CompressArchiveFile(
             catfp, compression, compressionlevel, formatspecs)

{pycatfile-0.15.8 → pycatfile-0.15.12}/setup.py

@@ -13,7 +13,7 @@
     Copyright 2016-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2016-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: setup.py - Last Update: 12/14/2024 Ver. 0.15.8 RC 1 - Author: cooldude2k $
+    $FileInfo: setup.py - Last Update: 12/20/2024 Ver. 0.15.12 RC 1 - Author: cooldude2k $
 '''
 
 import os