PyCatFile 0.27.4__py3-none-any.whl → 0.28.0__py3-none-any.whl

pycatfile.py

@@ -10,11 +10,11 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     Revised BSD License for more details.
 
-    Copyright 2018-2024 Cool Dude 2k - http://idb.berlios.de/
-    Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
-    Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
+    Copyright 2018-2026 Cool Dude 2k - http://idb.berlios.de/
+    Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
+    Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: pycatfile.py - Last Update: 11/16/2025 Ver. 0.27.4 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 2/3/2026 Ver. 0.28.0 RC 1  - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -661,12 +661,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, 27, 4, "RC 1", 1)
-__version_date_info__ = (2025, 11, 16, "RC 1", 1)
+__version_info__ = (0, 28, 0, "RC 1", 1)
+__version_date_info__ = (2026, 2, 3, "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: 9e8b32c35830838aaf65e0655146a3d9269d096a $"
+__revision_id__ = "$Id: 620c61932370f8b836e70c8dbe572587740d66e2 $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -859,15 +859,6 @@ try:
     compressionsupport.append("lz4")
 except ImportError:
     pass
-'''
-try:
-    import lzo
-    compressionsupport.append("lzo")
-    compressionsupport.append("lzop")
-except ImportError:
-    lzo = None
-    pass
-'''
 try:
     try:
         import compression.zstd as zstd
@@ -931,13 +922,6 @@ if('lzo' in compressionsupport):
     compressionlistalt.append('lzo')
     outextlist.append('lzo')
     outextlistwd.append('.lzo')
-'''
-if('lzop' in compressionsupport):
-    compressionlist.append('lzop')
-    compressionlistalt.append('lzop')
-    outextlist.append('lzop')
-    outextlistwd.append('.lzop')
-'''
 if('lzma' in compressionsupport):
     compressionlist.append('lzma')
     compressionlistalt.append('lzma')
@@ -6190,6 +6174,27 @@ def AppendNullBytes(indata=None, delimiter=__file_format_dict__['format_delimite
 def _hex_lower(n):
     return format(int(n), 'x').lower()
 
+def system_and_major():
+    info = platform.uname()
+
+    # Python 3: info is a namedtuple with .system / .release
+    # Python 2: info is a plain tuple (system, node, release, version, machine, processor)
+    try:
+        system = info.system
+        release = info.release
+    except AttributeError:
+        # Fallback for Python 2
+        system = info[0]
+        release = info[2]
+
+    # Find the first run of digits in the release string
+    m = re.search(r'\d+', release)
+    if m:
+        major = m.group(0)  # e.g. '11' or '6'
+        return u"%s%s" % (system, major)  # unicode-safe in Py2
+    else:
+        return system
+
 def AppendFileHeader(fp, numfiles, fencoding, extradata=[], jsondata={}, checksumtype=["md5", "md5"], formatspecs=__file_format_dict__, saltkey=None):
     """
     Build and write the archive file header.
@@ -6268,7 +6273,7 @@ def AppendFileHeader(fp, numfiles, fencoding, extradata=[], jsondata={}, checksu
     else:
         fctime = format(int(to_ns(time.time())), 'x').lower()
     # Serialize the first group
-    fnumfilesa = AppendNullBytes([tmpoutlenhex, fctime, fctime, fencoding, platform.system(), py_implementation, __program_name__+str(__version_info__[0]), fnumfiles_hex, "+"+str(len(formatspecs['format_delimiter']))], delimiter)
+    fnumfilesa = AppendNullBytes([tmpoutlenhex, fctime, fctime, fencoding, system_and_major(), py_implementation, __program_name__+str(__version_info__[0]), fnumfiles_hex, "+"+str(len(formatspecs['format_delimiter']))], delimiter)
     # Append tmpoutlist
     fnumfilesa += AppendNullBytes(tmpoutlist, delimiter)
     # Append extradata items if any
@@ -6856,7 +6861,9 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
     inodetofile = {}
     filetoinode = {}
     inodetoforminode = {}
-    if(not isinstance(infile, (list, tuple, )) and infile == "-"):
+    if(isinstance(infile, (list, tuple, ))):
+        infile = infile[0]
+    if(infile == "-"):
         infile = MkTempFile()
         shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
@@ -7082,7 +7089,9 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
     inodetofile = {}
     filetoinode = {}
     inodetoforminode = {}
-    if(not isinstance(infile, (list, tuple, )) and infile == "-"):
+    if(isinstance(infile, (list, tuple, ))):
+        infile = infile[0]
+    if(infile == "-"):
         infile = MkTempFile()
         shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
@@ -7245,6 +7254,9 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
             fcontents.write(zipfp.read(member.filename))
             typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
             fcontents.seek(0, 0)
+            if(typechecktest is not False):
+                typechecktest = GetBinaryFileType(fcontents, filestart=0, closefp=False)
+                fcontents.seek(0, 0)
             fcencoding = GetFileEncoding(fcontents, 0, False)[0]
             if(typechecktest is False and not compresswholefile):
                 fcontents.seek(0, 2)
@@ -7328,6 +7340,8 @@ else:
         inodetofile = {}
         filetoinode = {}
         inodetoforminode = {}
+        if(isinstance(infile, (list, tuple, ))):
+            infile = infile[0]
         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)):
@@ -7478,6 +7492,9 @@ else:
                 fcontents.write(rarfp.read(member.filename))
                 typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
                 fcontents.seek(0, 0)
+                if(typechecktest is not False):
+                    typechecktest = GetBinaryFileType(fcontents, filestart=0, closefp=False)
+                    fcontents.seek(0, 0)
                 fcencoding = GetFileEncoding(fcontents, 0, False)[0]
                 if(typechecktest is False and not compresswholefile):
                     fcontents.seek(0, 2)
@@ -7606,6 +7623,8 @@ else:
         inodetofile = {}
         filetoinode = {}
         inodetoforminode = {}
+        if(isinstance(infile, (list, tuple, ))):
+            infile = infile[0]
         if(not os.path.exists(infile) or not os.path.isfile(infile)):
             return False
         szpfp = py7zr.SevenZipFile(infile, mode="r")
@@ -7712,6 +7731,9 @@ else:
                 fcontents.seek(0, 0)
                 typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
                 fcontents.seek(0, 0)
+                if(typechecktest is not False):
+                    typechecktest = GetBinaryFileType(fcontents, filestart=0, closefp=False)
+                    fcontents.seek(0, 0)
                 fcencoding = GetFileEncoding(fcontents, 0, False)[0]
                 try:
                     file_content[member.filename].close()
@@ -8013,6 +8035,126 @@ def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, fmtty
         fp.close()
         return True
 
+def AppendReadInFileWithContentToList(infile, extradata=[], jsondata={}, contentasfile=False, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, saltkey=None, verbose=False):
+    return ReadInFileWithContentToList(infile, "auto", 0, 0, 0, False, contentasfile, uncompress, skipchecksum, formatspecs, saltkey, seektoend)
+
+def AppendReadInMultipleFileWithContentToList(infile, extradata=[], jsondata={}, contentasfile=False, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, saltkey=None, verbose=False):
+    return ReadInMultipleFileWithContentToList(infile, fmttype, 0, 0, 0, False, contentasfile, uncompress, skipchecksum, formatspecs, saltkey, seektoend)
+
+def AppendReadInMultipleFilesWithContentToList(infile, extradata=[], jsondata={}, contentasfile=False, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, saltkey=None, verbose=False):
+    return ReadInMultipleFilesWithContentToList(infile, fmttype, 0, 0, 0, False, contentasfile, uncompress, skipchecksum, formatspecs, saltkey, seektoend)
+
+def AppendReadInFileWithContent(infile, fp, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, insaltkey=None, outsaltkey=None, verbose=False):
+    if(not hasattr(fp, "write")):
+        return False
+    GetDirList = AppendReadInFileWithContentToList(infile, extradata, jsondata, False, compression, compresswholefile, compressionlevel, compressionuselist, [checksumtype[2], checksumtype[3], checksumtype[3]], formatspecs, insaltkey, verbose)
+    numfiles = int(len(GetDirList))
+    fnumfiles = format(numfiles, 'x').lower()
+    AppendFileHeader(fp, numfiles, "UTF-8", [], {}, [checksumtype[0], checksumtype[1]], formatspecs, outsaltkey)
+    try:
+        fp.flush()
+        if(hasattr(os, "sync")):
+            os.fsync(fp.fileno())
+    except (io.UnsupportedOperation, AttributeError, OSError):
+        pass
+    for curfname in GetDirList:
+        tmpoutlist = curfname['fheaders']
+        AppendFileHeaderWithContent(fp, tmpoutlist, curfname['fextradata'], curfname['fjsoncontent'], curfname['fcontents'], [curfname['fheaderchecksumtype'], curfname['fcontentchecksumtype'], curfname['fjsonchecksumtype']], formatspecs, outsaltkey)
+        try:
+            fp.flush()
+            if(hasattr(os, "sync")):
+                os.fsync(fp.fileno())
+        except (io.UnsupportedOperation, AttributeError, OSError):
+            pass
+    return fp
+
+def AppendReadInFileWithContentToOutFile(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__, insaltkey=None, outsaltkey=None, 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)
+        tmpfmt = GetKeyByFormatExtension(get_in_ext[1], formatspecs=__file_format_multi_dict__)
+        if(tmpfmt is None and get_in_ext[1]!=""):
+            get_in_ext = os.path.splitext(get_in_ext[0])
+            tmpfmt = GetKeyByFormatExtension(get_in_ext[0], formatspecs=__file_format_multi_dict__)
+        if(tmpfmt is None):
+            fmttype = __file_format_default__
+            formatspecs = formatspecs[fmttype]
+        else:
+            fmttype = tmpfmt
+            formatspecs = formatspecs[tmpfmt]
+    elif(IsNestedDict(formatspecs) and fmttype in formatspecs):
+        formatspecs = formatspecs[fmttype]
+    elif(IsNestedDict(formatspecs) and fmttype not in formatspecs):
+        fmttype = __file_format_default__
+        formatspecs = formatspecs[fmttype]
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+        outfile = RemoveWindowsPath(outfile)
+        if(os.path.exists(outfile)):
+            try:
+                os.unlink(outfile)
+            except OSError:
+                pass
+    if(outfile == "-" or outfile is None):
+        verbose = False
+        fp = MkTempFile()
+    elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
+        fp = outfile
+    elif(re.findall(__upload_proto_support__, outfile)):
+        fp = MkTempFile()
+    else:
+        fbasename = os.path.splitext(outfile)[0]
+        fextname = os.path.splitext(outfile)[1]
+        if(not compresswholefile and fextname in outextlistwd):
+            compresswholefile = True
+        try:
+            fp = CompressOpenFile(outfile, compresswholefile, compressionlevel)
+        except PermissionError:
+            return False
+    AppendReadInFileWithContent(infiles, fp, extradata, jsondata, compression, compresswholefile, compressionlevel, compressionuselist, checksumtype, formatspecs, insaltkey, outsaltkey, verbose)
+    if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
+        fp = CompressOpenFileAlt(
+            fp, compression, compressionlevel, compressionuselist, formatspecs)
+        try:
+            fp.flush()
+            if(hasattr(os, "sync")):
+                os.fsync(fp.fileno())
+        except (io.UnsupportedOperation, AttributeError, OSError):
+            pass
+    if(outfile == "-"):
+        fp.seek(0, 0)
+        shutil.copyfileobj(fp, PY_STDOUT_BUF, length=__filebuff_size__)
+    elif(outfile is None):
+        fp.seek(0, 0)
+        outvar = fp.read()
+        fp.close()
+        return outvar
+    elif((not hasattr(outfile, "read") and not hasattr(outfile, "write")) and re.findall(__upload_proto_support__, outfile)):
+        fp = CompressOpenFileAlt(
+            fp, compression, compressionlevel, compressionuselist, formatspecs)
+        fp.seek(0, 0)
+        upload_file_to_internet_file(fp, outfile)
+    if(returnfp):
+        fp.seek(0, 0)
+        return fp
+    else:
+        fp.close()
+        return True
+
+def AppendReadInFileWithContentToStackedOutFile(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__, insaltkey=None, outsaltkey=None, verbose=False, returnfp=False):
+    if not isinstance(infiles, list):
+        infiles = [infiles]
+    returnout = False
+    for infileslist in infiles:
+        returnout = AppendReadInFileWithContentToOutFile(infileslist, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, extradata, jsondata, checksumtype, formatspecs, insaltkey, outsaltkey, verbose, True)
+        if(not returnout):
+            break
+        else:
+            outfile = returnout
+    if(not returnfp and returnout):
+        returnout.close()
+        return True
+    return returnout
+
 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__, saltkey=None, 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"))):
@@ -9004,8 +9146,6 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_multi_dict__, file
             compresscheck = "zstd"
         elif(fextname == ".lz4"):
             compresscheck = "lz4"
-        elif(fextname == ".lzo" or fextname == ".lzop"):
-            compresscheck = "lzo"
         elif(fextname == ".lzma"):
             compresscheck = "lzma"
         elif(fextname == ".xz"):
@@ -9297,8 +9437,6 @@ def UncompressString(infile, formatspecs=__file_format_multi_dict__, filestart=0
         fileuz = decompressor.decompress(infile)
     elif(compresscheck == "lz4" and compresscheck in compressionsupport):
         fileuz = lz4.frame.decompress(infile)
-    elif((compresscheck == "lzo" or compresscheck == "lzop") and compresscheck in compressionsupport):
-        fileuz = lzo.decompress(infile)
     elif((compresscheck == "lzma" or compresscheck == "xz") and compresscheck in compressionsupport):
         fileuz = lzma.decompress(infile)
     elif(compresscheck == "zlib" and compresscheck in compressionsupport):
@@ -9349,8 +9487,6 @@ def UncompressBytes(infile, formatspecs=__file_format_multi_dict__, filestart=0)
         fileuz = decompressor.decompress(infile)
     elif(compresscheck == "lz4" and compresscheck in compressionsupport):
         fileuz = lz4.frame.decompress(infile)
-    elif((compresscheck == "lzo" or compresscheck == "lzop") and compresscheck in compressionsupport):
-        fileuz = lzo.decompress(infile)
     elif((compresscheck == "lzma" or compresscheck == "xz") and compresscheck in compressionsupport):
         fileuz = lzma.decompress(infile)
     elif(compresscheck == "zlib" and compresscheck in compressionsupport):
@@ -9922,9 +10058,6 @@ def CompressOpenFileAlt(fp, compression="auto", compressionlevel=None,
         elif compression == "lz4" and "lz4" in compressionsupport:
             bytesfp = MkTempFile()
             bytesfp.write(lz4.frame.compress(fp.read(), compression_level=_lvl(compressionlevel)))
-        elif (compression in ("lzo", "lzop")) and "lzop" in compressionsupport:
-            bytesfp = MkTempFile()
-            bytesfp.write(lzo.compress(fp.read(), _lvl(compressionlevel)))
         elif compression == "zstd" and "zstandard" in compressionsupport:
             bytesfp = MkTempFile()
             level = _lvl(compressionlevel)
@@ -10241,7 +10374,7 @@ def CatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
         if(not fp):
             return False
         fp.seek(filestart, 0)
-    elif(not isinstance(infile, (list, tuple, )) and infile == "-"):
+    elif(infile == "-"):
         fp = MkTempFile()
         shutil.copyfileobj(PY_STDIN_BUF, fp, length=__filebuff_size__)
         fp.seek(filestart, 0)
@@ -10299,10 +10432,8 @@ def CatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
                 compresscheck = "bzip2"
             elif(fextname == ".zst"):
                 compresscheck = "zstd"
-            elif(fextname == ".lz4" or fextname == ".clz4"):
+            elif(fextname == ".lz4"):
                 compresscheck = "lz4"
-            elif(fextname == ".lzo" or fextname == ".lzop"):
-                compresscheck = "lzo"
             elif(fextname == ".lzma"):
                 compresscheck = "lzma"
             elif(fextname == ".xz"):
@@ -11025,6 +11156,10 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
             typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
             fcontents.seek(0, 0)
 
+            if(typechecktest is not False):
+                typechecktest = GetBinaryFileType(fcontents, filestart=0, closefp=False)
+                fcontents.seek(0, 0)
+
             # get fcencoding once here
             fcencoding = GetFileEncoding(fcontents, 0, False)[0]
 
@@ -11618,7 +11753,9 @@ def CatFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipcheck
 
 
 def TarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
-    if(not isinstance(infile, (list, tuple, )) and infile == "-"):
+    if(isinstance(infile, (list, tuple, ))):
+        infile = infile[0]
+    if(infile == "-"):
         infile = MkTempFile()
         shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
@@ -11738,7 +11875,9 @@ def TarFileListFile(infile, formatspecs=__file_format_multi_dict__, verbose=Fals
 
 
 def ZipFileListFiles(infile, verbose=False, returnfp=False):
-    if(not isinstance(infile, (list, tuple, )) and infile == "-"):
+    if(isinstance(infile, (list, tuple, ))):
+        infile = infile[0]
+    if(infile == "-"):
         infile = MkTempFile()
         shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
@@ -11895,9 +12034,10 @@ def ZipFileListFile(infile, verbose=False, returnfp=False):
 if(not rarfile_support):
     def RarFileListFiles(infile, verbose=False, returnfp=False):
         return False
-
-if(rarfile_support):
+else:
     def RarFileListFiles(infile, verbose=False, returnfp=False):
+        if(isinstance(infile, (list, tuple, ))):
+            infile = infile[0]
         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)):
@@ -12027,9 +12167,10 @@ def RarFileListFile(infile, verbose=False, returnfp=False):
 if(not py7zr_support):
     def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
         return False
-
-if(py7zr_support):
+else:
     def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
+        if(isinstance(infile, (list, tuple, ))):
+            infile = infile[0]
         if(not os.path.exists(infile) or not os.path.isfile(infile)):
             return False
         lcfi = 0
@@ -12390,8 +12531,14 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__):
     if headers is None:
         headers = {}
     urlparts = urlparse(url)
-    username = unquote(urlparts.username)
-    password = unquote(urlparts.password)
+    if(urlparts.username is not None):
+        username = unquote(urlparts.username)
+    else:
+        username = None
+    if(urlparts.password is not None):
+        password = unquote(urlparts.password)
+    else:
+        password = None
 
     # Rebuild URL without username and password
     netloc = urlparts.hostname or ''