PyCatFile 0.14.18__tar.gz → 0.15.0__tar.gz

{pycatfile-0.14.18 → pycatfile-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.14.18
+Version: 0.15.0
 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.14.18 → pycatfile-0.15.0}/PyCatFile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.14.18
+Version: 0.15.0
 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.14.18 → pycatfile-0.15.0}/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/4/2024 Ver. 0.14.18 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 12/6/2024 Ver. 0.15.0 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes

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

{pycatfile-0.14.18 → pycatfile-0.15.0}/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/4/2024 Ver. 0.14.18 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 12/6/2024 Ver. 0.15.0 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -303,12 +303,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, 14, 18, "RC 1", 1)
-__version_date_info__ = (2024, 12, 4, "RC 1", 1)
+__version_info__ = (0, 15, 0, "RC 1", 1)
+__version_date_info__ = (2024, 12, 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: c90abbff71adacac4de6eafc28f0cff10ced1e38 $"
+__revision_id__ = "$Id: eb6da8da544b0f7fab37dddab5ce3751d196ab97 $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -693,10 +693,29 @@ def ListDirAdvanced(dirpath, followlink=False, duplicates=False, include_regex=N
             if ((not include_pattern or include_pattern.search(path)) and
                 (not exclude_pattern or not exclude_pattern.search(path))):
                 retlist.append(path)
-
     return retlist
 
 
+def GetTotalSize(file_list):
+    """
+    Calculate the total size of all files in the provided list.
+    
+    Parameters:
+        file_list (list): List of file paths.
+
+    Returns:
+        int: Total size of all files in bytes.
+    """
+    total_size = 0
+    for item in file_list:
+        if os.path.isfile(item):  # Ensure it's a file
+            try:
+                total_size += os.path.getsize(item)
+            except OSError as e:
+                sys.stderr.write("Error accessing file {}: {}\n".format(item, e))
+    return total_size
+
+
 def create_alias_function(prefix, base_name, suffix, target_function):
     # Define a new function that wraps the target function
     def alias_function(*args, **kwargs):
@@ -1468,6 +1487,8 @@ def ValidateFileChecksum(infile, checksumtype="crc32", inchecksum="0", formatspe
 
 
 def ReadTillNullByteOld(fp, delimiter=__file_format_dict__['format_delimiter']):
+    if(not hasattr(fp, "read")):
+        return False
     curbyte = b""
     curfullbyte = b""
     nullbyte = delimiter.encode("UTF-8")
@@ -1484,6 +1505,8 @@ def ReadUntilNullByteOld(fp, delimiter=__file_format_dict__['format_delimiter'])
 
 
 def ReadTillNullByteAlt(fp, delimiter=__file_format_dict__['format_delimiter'], chunk_size=1024, max_read=1024000):
+    if(not hasattr(fp, "read")):
+        return False
     delimiter = delimiter.encode('UTF-8')  # Ensure the delimiter is in bytes
     buffer = bytearray()
     total_read = 0
@@ -1529,6 +1552,8 @@ 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")):
+        return False
     curfullbyte = bytearray()
     nullbyte = delimiter.encode("UTF-8")
     total_read = 0  # Track the total number of bytes read
@@ -1559,6 +1584,8 @@ def ReadUntilNullByte(fp, delimiter=__file_format_dict__['format_delimiter'], ma
 
 
 def ReadTillNullByteByNum(fp, delimiter=__file_format_dict__['format_delimiter'], num_delimiters=1, chunk_size=1024, max_read=1024000):
+    if(not hasattr(fp, "read")):
+        return False
     delimiter = delimiter.encode('UTF-8')  # Ensure the delimiter is in bytes
     buffer = bytearray()
     total_read = 0
@@ -1619,6 +1646,8 @@ def SeekToEndOfFile(fp):
 
 
 def ReadFileHeaderData(fp, rounds=0, delimiter=__file_format_dict__['format_delimiter']):
+    if(not hasattr(fp, "read")):
+        return False
     rocount = 0
     roend = int(rounds)
     HeaderOut = []
@@ -1629,6 +1658,8 @@ def ReadFileHeaderData(fp, rounds=0, delimiter=__file_format_dict__['format_deli
 
 
 def ReadFileHeaderDataBySize(fp, delimiter=__file_format_dict__['format_delimiter']):
+    if(not hasattr(fp, "read")):
+        return False
     headerpresize = ReadTillNullByte(fp, delimiter)
     headersize = int(headerpresize, 16)
     if(headersize <= 0):
@@ -1645,6 +1676,8 @@ def ReadFileHeaderDataBySize(fp, delimiter=__file_format_dict__['format_delimite
 
 
 def ReadFileHeaderDataWoSize(fp, delimiter=__file_format_dict__['format_delimiter']):
+    if(not hasattr(fp, "read")):
+        return False
     preheaderdata = ReadFileHeaderData(fp, 2, delimiter)
     headersize = int(preheaderdata[0], 16)
     headernumfields = int(preheaderdata[1], 16)
@@ -1657,6 +1690,8 @@ def ReadFileHeaderDataWoSize(fp, delimiter=__file_format_dict__['format_delimite
 
 
 def ReadFileHeaderDataBySizeWithContent(fp, listonly=False, uncompress=True, skipchecksum=False, formatspecs=__file_format_dict__):
+    if(not hasattr(fp, "read")):
+        return False
     formatspecs = FormatSpecsListToDict(formatspecs)
     delimiter = formatspecs['format_delimiter']
     fheaderstart = fp.tell()
@@ -1730,6 +1765,8 @@ def ReadFileHeaderDataBySizeWithContent(fp, listonly=False, uncompress=True, ski
 
 
 def ReadFileHeaderDataBySizeWithContentToArray(fp, listonly=False, contentasfile=True, uncompress=True, skipchecksum=False, formatspecs=__file_format_dict__):
+    if(not hasattr(fp, "read")):
+        return False
     formatspecs = FormatSpecsListToDict(formatspecs)
     delimiter = formatspecs['format_delimiter']
     fheaderstart = fp.tell()
@@ -1848,6 +1885,8 @@ def ReadFileHeaderDataBySizeWithContentToArray(fp, listonly=False, contentasfile
 
 
 def ReadFileHeaderDataBySizeWithContentToList(fp, listonly=False, uncompress=True, skipchecksum=False, formatspecs=__file_format_dict__):
+    if(not hasattr(fp, "read")):
+        return False
     formatspecs = FormatSpecsListToDict(formatspecs)
     delimiter = formatspecs['format_delimiter']
     fheaderstart = fp.tell()
@@ -1963,6 +2002,8 @@ def ReadFileHeaderDataBySizeWithContentToList(fp, listonly=False, uncompress=Tru
 
 
 def ReadFileDataBySizeWithContent(fp, listonly=False, uncompress=True, skipchecksum=False, formatspecs=__file_format_dict__):
+    if(not hasattr(fp, "read")):
+        return False
     formatspecs = FormatSpecsListToDict(formatspecs)
     delimiter = formatspecs['format_delimiter']
     curloc = fp.tell()
@@ -1994,6 +2035,8 @@ def ReadFileDataBySizeWithContent(fp, listonly=False, uncompress=True, skipcheck
 
 
 def ReadFileDataBySizeWithContentToArray(fp, seekstart=0, seekend=0, listonly=False, contentasfile=True, uncompress=True, skipchecksum=False, formatspecs=__file_format_dict__):
+    if(not hasattr(fp, "read")):
+        return False
     formatspecs = FormatSpecsListToDict(formatspecs)
     delimiter = formatspecs['format_delimiter']
     curloc = fp.tell()
@@ -2097,6 +2140,8 @@ def ReadFileDataBySizeWithContentToArray(fp, seekstart=0, seekend=0, listonly=Fa
 
 
 def ReadFileDataBySizeWithContentToList(fp, seekstart=0, seekend=0, listonly=False, uncompress=True, skipchecksum=False, formatspecs=__file_format_dict__):
+    if(not hasattr(fp, "read")):
+        return False
     formatspecs = FormatSpecsListToDict(formatspecs)
     delimiter = formatspecs['format_delimiter']
     curloc = fp.tell()
@@ -2343,6 +2388,8 @@ def AppendNullBytes(indata=[], delimiter=__file_format_dict__['format_delimiter'
 
 
 def AppendFileHeader(fp, numfiles, checksumtype="crc32", formatspecs=__file_format_dict__):
+    if(not hasattr(fp, "write")):
+        return False
     formatspecs = FormatSpecsListToDict(formatspecs)
     delimiter = formatspecs['format_delimiter']
     catver = formatspecs['format_ver']
@@ -2361,6 +2408,8 @@ def AppendFileHeader(fp, numfiles, checksumtype="crc32", formatspecs=__file_form
     try:
         fp.flush()
         os.fsync(fp.fileno())
+        if(hasattr(os, "sync")):
+            os.sync()
     except io.UnsupportedOperation:
         pass
     except AttributeError:
@@ -2404,6 +2453,8 @@ def MakeEmptyFile(outfile, compression="auto", compressionlevel=None, checksumty
         try:
             catfp.flush()
             os.fsync(catfp.fileno())
+            if(hasattr(os, "sync")):
+                os.sync()
         except io.UnsupportedOperation:
             pass
         except AttributeError:
@@ -2430,6 +2481,8 @@ def MakeEmptyFile(outfile, compression="auto", compressionlevel=None, checksumty
 
 
 def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], filecontent="", checksumtype="crc32", formatspecs=__file_format_dict__):
+    if(not hasattr(fp, "write")):
+        return False
     formatspecs = FormatSpecsListToDict(formatspecs)
     extrafields = format(len(extradata), 'x').lower()
     extrasizestr = AppendNullByte(extrafields, formatspecs['format_delimiter'])
@@ -2480,6 +2533,8 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], filecontent="",
     try:
         fp.flush()
         os.fsync(fp.fileno())
+        if(hasattr(os, "sync")):
+            os.sync()
     except io.UnsupportedOperation:
         pass
     except AttributeError:
@@ -2490,6 +2545,8 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], filecontent="",
 
 
 def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], extradata=[], compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, checksumtype="crc32", formatspecs=__file_format_dict__, verbose=False):
+    if(not hasattr(fp, "write")):
+        return False
     formatspecs = FormatSpecsListToDict(formatspecs)
     advancedlist = formatspecs['use_advanced_list']
     altinode = formatspecs['use_alt_inode']
@@ -2516,6 +2573,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], ext
         GetDirList = ListDirAdvanced(infilelist, followlink, False)
     else:
         GetDirList = ListDir(infilelist, followlink, False)
+    FullSizeFiles = GetTotalSize(GetDirList)
     if(not GetDirList):
         return False
     curinode = 0
@@ -2527,6 +2585,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], ext
     numfiles = int(len(GetDirList))
     fnumfiles = format(numfiles, 'x').lower()
     AppendFileHeader(fp, fnumfiles, checksumtype, formatspecs)
+    FullSizeFilesAlt = 0
     for curfname in GetDirList:
         if(re.findall("^[.|/]", curfname)):
             fname = curfname
@@ -2541,8 +2600,14 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], ext
         fpremode = fstatinfo.st_mode
         finode = fstatinfo.st_ino
         flinkcount = fstatinfo.st_nlink
+        try:
+            FullSizeFilesAlt += fstatinfo.st_rsize
+        except AttributeError:
+            FullSizeFilesAlt += fstatinfo.st_size
         ftype = 0
-        if(stat.S_ISREG(fpremode)):
+        if(hasattr(os.path, "isjunction") and os.path.isjunction(fname)):
+            ftype = 13
+        elif(stat.S_ISREG(fpremode)):
             ftype = 0
         elif(stat.S_ISLNK(fpremode)):
             ftype = 2
@@ -2562,36 +2627,44 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], ext
             ftype = 10
         elif(hasattr(stat, "S_ISWHT") and stat.S_ISWHT(fpremode)):
             ftype = 11
+        elif(fstatinfo.st_blocks * 512 < fstatinfo.st_size):
+            ftype = 12
         else:
             ftype = 0
         flinkname = ""
         fcurfid = format(int(curfid), 'x').lower()
-        if(not followlink and finode != 0):
-            if(ftype != 1):
-                if(finode in inodelist):
+        if not followlink and finode != 0:
+            unique_id = (fstatinfo.st_dev, finode)
+            if ftype != 1:
+                if unique_id in inodelist:
+                    # Hard link detected
                     ftype = 1
-                    flinkname = inodetofile[finode]
-                    if(altinode):
-                        fcurinode = format(int(finode), 'x').lower()
+                    flinkname = inodetofile[unique_id]
+                    if altinode:
+                        fcurinode = format(int(unique_id[1]), 'x').lower()
                     else:
-                        fcurinode = format(
-                            int(inodetocatinode[finode]), 'x').lower()
-                if(finode not in inodelist):
-                    inodelist.append(finode)
-                    inodetofile.update({finode: fname})
-                    inodetocatinode.update({finode: curinode})
-                    if(altinode):
-                        fcurinode = format(int(finode), 'x').lower()
+                        fcurinode = format(int(inodetocatinode[unique_id]), 'x').lower()
+                else:
+                    # New inode
+                    inodelist.append(unique_id)
+                    inodetofile[unique_id] = fname
+                    inodetocatinode[unique_id] = curinode
+                    if altinode:
+                        fcurinode = format(int(unique_id[1]), 'x').lower()
                     else:
                         fcurinode = format(int(curinode), 'x').lower()
-                    curinode = curinode + 1
+                    curinode += 1
         else:
+            # Handle cases where inodes are not supported or symlinks are followed
             fcurinode = format(int(curinode), 'x').lower()
-            curinode = curinode + 1
+            curinode += 1
         curfid = curfid + 1
         if(ftype == 2):
             flinkname = os.readlink(fname)
-        fdev = fstatinfo.st_dev
+        try:
+            fdev = fstatinfo.st_rdev
+        except AttributeError:
+            fdev = 0
         getfdev = GetDevMajorMinor(fdev)
         fdev_minor = getfdev[0]
         fdev_major = getfdev[1]
@@ -2750,6 +2823,8 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], ext
 
 
 def AppendListsWithContent(inlist, fp, dirlistfromtxt=False, filevalues=[], extradata=[], compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, checksumtype="crc32", formatspecs=__file_format_dict__, verbose=False):
+    if(not hasattr(fp, "write")):
+        return False
     formatspecs = FormatSpecsListToDict(formatspecs)
     if(verbose):
         logging.basicConfig(format="%(message)s",
@@ -2845,6 +2920,8 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, comp
         try:
             catfp.flush()
             os.fsync(catfp.fileno())
+            if(hasattr(os, "sync")):
+                os.sync()
         except io.UnsupportedOperation:
             pass
         except AttributeError:
@@ -2899,6 +2976,8 @@ def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, compr
         try:
             catfp.flush()
             os.fsync(catfp.fileno())
+            if(hasattr(os, "sync")):
+                os.sync()
         except io.UnsupportedOperation:
             pass
         except AttributeError:
@@ -3162,7 +3241,7 @@ def GetCompressionMimeType(infile, formatspecs=__file_format_dict__):
 
 def UncompressArchiveFile(fp, formatspecs=__file_format_dict__):
     formatspecs = FormatSpecsListToDict(formatspecs)
-    if(not hasattr(fp, "read") and not hasattr(fp, "write")):
+    if(not hasattr(fp, "read")):
         return False
     compresscheck = CheckCompressionType(fp, formatspecs, False)
     if(compresscheck == "gzip" and compresscheck in compressionsupport):
@@ -3406,7 +3485,7 @@ def GZipCompress(data, compresslevel=9):
 
 def CompressArchiveFile(fp, compression="auto", compressionlevel=None, formatspecs=__file_format_dict__):
     formatspecs = FormatSpecsListToDict(formatspecs)
-    if(not hasattr(fp, "read") and not hasattr(fp, "write")):
+    if(not hasattr(fp, "read")):
         return False
     fp.seek(0, 0)
     if(not compression or compression == "catfile" or compression == formatspecs['format_lower']):
@@ -3684,6 +3763,7 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
         GetDirList = ListDirAdvanced(infilelist, followlink, False)
     else:
         GetDirList = ListDir(infilelist, followlink, False)
+    FullSizeFiles = GetTotalSize(GetDirList)
     if(not GetDirList):
         return False
     curinode = 0
@@ -3694,6 +3774,7 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
     inodetocatinode = {}
     numfiles = int(len(GetDirList))
     catfp = AppendFileHeader(catfp, numfiles, checksumtype, formatspecs)
+    FullSizeFilesAlt = 0
     for curfname in GetDirList:
         if(re.findall("^[.|/]", curfname)):
             fname = curfname
@@ -3708,8 +3789,14 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
         fpremode = fstatinfo.st_mode
         finode = fstatinfo.st_ino
         flinkcount = fstatinfo.st_nlink
+        try:
+            FullSizeFilesAlt += fstatinfo.st_rsize
+        except AttributeError:
+            FullSizeFilesAlt += fstatinfo.st_size
         ftype = 0
-        if(stat.S_ISREG(fpremode)):
+        if(hasattr(os.path, "isjunction") and os.path.isjunction(fname)):
+            ftype = 13
+        elif(stat.S_ISREG(fpremode)):
             ftype = 0
         elif(stat.S_ISLNK(fpremode)):
             ftype = 2
@@ -3729,36 +3816,44 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
             ftype = 10
         elif(hasattr(stat, "S_ISWHT") and stat.S_ISWHT(fpremode)):
             ftype = 11
+        elif(fstatinfo.st_blocks * 512 < fstatinfo.st_size):
+            ftype = 12
         else:
             ftype = 0
         flinkname = ""
         fcurfid = format(int(curfid), 'x').lower()
-        if(not followlink and finode != 0):
-            if(ftype != 1):
-                if(finode in inodelist):
+        if not followlink and finode != 0:
+            unique_id = (fstatinfo.st_dev, finode)
+            if ftype != 1:
+                if unique_id in inodelist:
+                    # Hard link detected
                     ftype = 1
-                    flinkname = inodetofile[finode]
-                    if(altinode):
-                        fcurinode = format(int(finode), 'x').lower()
+                    flinkname = inodetofile[unique_id]
+                    if altinode:
+                        fcurinode = format(int(unique_id[1]), 'x').lower()
                     else:
-                        fcurinode = format(
-                            int(inodetocatinode[finode]), 'x').lower()
-                if(finode not in inodelist):
-                    inodelist.append(finode)
-                    inodetofile.update({finode: fname})
-                    inodetocatinode.update({finode: curinode})
-                    if(altinode):
-                        fcurinode = format(int(finode), 'x').lower()
+                        fcurinode = format(int(inodetocatinode[unique_id]), 'x').lower()
+                else:
+                    # New inode
+                    inodelist.append(unique_id)
+                    inodetofile[unique_id] = fname
+                    inodetocatinode[unique_id] = curinode
+                    if altinode:
+                        fcurinode = format(int(unique_id[1]), 'x').lower()
                     else:
                         fcurinode = format(int(curinode), 'x').lower()
-                    curinode = curinode + 1
+                    curinode += 1
         else:
+            # Handle cases where inodes are not supported or symlinks are followed
             fcurinode = format(int(curinode), 'x').lower()
-            curinode = curinode + 1
+            curinode += 1
         curfid = curfid + 1
         if(ftype == 2):
             flinkname = os.readlink(fname)
-        fdev = fstatinfo.st_dev
+        try:
+            fdev = fstatinfo.st_rdev
+        except AttributeError:
+            fdev = 0
         getfdev = GetDevMajorMinor(fdev)
         fdev_minor = getfdev[0]
         fdev_major = getfdev[1]
@@ -3918,6 +4013,8 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
         try:
             catfp.flush()
             os.fsync(catfp.fileno())
+            if(hasattr(os, "sync")):
+                os.sync()
         except io.UnsupportedOperation:
             pass
         except AttributeError:
@@ -4052,9 +4149,6 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
         if(member.isreg()):
             ffullmode = member.mode + stat.S_IFREG
             ftype = 0
-        elif(member.isdev()):
-            ffullmode = member.mode
-            ftype = 7
         elif(member.islnk()):
             ffullmode = member.mode + stat.S_IFREG
             ftype = 1
@@ -4073,9 +4167,12 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
         elif(member.isfifo()):
             ffullmode = member.mode + stat.S_IFIFO
             ftype = 6
-        elif(member.issparse()):
+        elif(hasattr(member, "issparse") and member.issparse()):
             ffullmode = member.mode
             ftype = 12
+        elif(member.isdev()):
+            ffullmode = member.mode
+            ftype = 7
         else:
             ffullmode = member.mode
             ftype = 0
@@ -4174,6 +4271,8 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
         try:
             catfp.flush()
             os.fsync(catfp.fileno())
+            if(hasattr(os, "sync")):
+                os.sync()
         except io.UnsupportedOperation:
             pass
         except AttributeError:
@@ -4440,6 +4539,8 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compresswhol
         try:
             catfp.flush()
             os.fsync(catfp.fileno())
+            if(hasattr(os, "sync")):
+                os.sync()
         except io.UnsupportedOperation:
             pass
         except AttributeError:
@@ -4530,6 +4631,8 @@ if(rarfile_support):
         try:
             catfp.flush()
             os.fsync(catfp.fileno())
+            if(hasattr(os, "sync")):
+                os.sync()
         except io.UnsupportedOperation:
             pass
         except AttributeError:
@@ -4736,6 +4839,8 @@ if(rarfile_support):
             try:
                 catfp.flush()
                 os.fsync(catfp.fileno())
+                if(hasattr(os, "sync")):
+                    os.sync()
             except io.UnsupportedOperation:
                 pass
             except AttributeError:
@@ -4965,6 +5070,8 @@ if(py7zr_support):
             try:
                 catfp.flush()
                 os.fsync(catfp.fileno())
+                if(hasattr(os, "sync")):
+                    os.sync()
             except io.UnsupportedOperation:
                 pass
             except AttributeError:
@@ -6279,6 +6386,7 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
         GetDirList = ListDirAdvanced(infilelist, followlink, False)
     else:
         GetDirList = ListDir(infilelist, followlink, False)
+    FullSizeFiles = GetTotalSize(GetDirList)
     if(not GetDirList):
         return False
     curinode = 0
@@ -6306,6 +6414,7 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
     fheadtell = len(fileheader)
     catlist = {'fnumfiles': fnumfiles, 'fformat': catversions[0], 'fversion': catversions[1],
                'fformatspecs': formatspecs, 'fchecksumtype': checksumtype, 'fheaderchecksum': catfileheadercshex, 'ffilelist': []}
+    FullSizeFilesAlt = 0
     for curfname in GetDirList:
         catfhstart = fheadtell
         if(re.findall("^[.|/]", curfname)):
@@ -6321,8 +6430,14 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
         fpremode = fstatinfo.st_mode
         finode = fstatinfo.st_ino
         flinkcount = fstatinfo.st_nlink
+        try:
+            FullSizeFilesAlt += fstatinfo.st_rsize
+        except AttributeError:
+            FullSizeFilesAlt += fstatinfo.st_size
         ftype = 0
-        if(stat.S_ISREG(fpremode)):
+        if(hasattr(os.path, "isjunction") and os.path.isjunction(fname)):
+            ftype = 13
+        elif(stat.S_ISREG(fpremode)):
             ftype = 0
         elif(stat.S_ISLNK(fpremode)):
             ftype = 2
@@ -6342,36 +6457,45 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
             ftype = 10
         elif(hasattr(stat, "S_ISWHT") and stat.S_ISWHT(fpremode)):
             ftype = 11
+        elif(fstatinfo.st_blocks * 512 < fstatinfo.st_size):
+            ftype = 12
         else:
             ftype = 0
         flinkname = ""
         fbasedir = os.path.dirname(fname)
         fcurfid = curfid
-        if(not followlink and finode != 0):
-            if(ftype != 1):
-                if(finode in inodelist):
+        if not followlink and finode != 0:
+            unique_id = (fstatinfo.st_dev, finode)
+            if ftype != 1:
+                if unique_id in inodelist:
+                    # Hard link detected
                     ftype = 1
-                    flinkname = inodetofile[finode]
-                    if(altinode):
-                        fcurinode = finode
+                    flinkname = inodetofile[unique_id]
+                    if altinode:
+                        fcurinode = format(int(unique_id[1]), 'x').lower()
                     else:
-                        fcurinode = inodetocatinode[finode]
-                if(finode not in inodelist):
-                    inodelist.append(finode)
-                    inodetofile.update({finode: fname})
-                    inodetocatinode.update({finode: curinode})
-                    if(altinode):
-                        fcurinode = finode
+                        fcurinode = format(int(inodetocatinode[unique_id]), 'x').lower()
+                else:
+                    # New inode
+                    inodelist.append(unique_id)
+                    inodetofile[unique_id] = fname
+                    inodetocatinode[unique_id] = curinode
+                    if altinode:
+                        fcurinode = format(int(unique_id[1]), 'x').lower()
                     else:
-                        fcurinode = curinode
-                    curinode = curinode + 1
+                        fcurinode = format(int(curinode), 'x').lower()
+                    curinode += 1
         else:
-            fcurinode = curinode
-            curinode = curinode + 1
+            # Handle cases where inodes are not supported or symlinks are followed
+            fcurinode = format(int(curinode), 'x').lower()
+            curinode += 1
         curfid = curfid + 1
         if(ftype == 2):
             flinkname = os.readlink(fname)
-        fdev = fstatinfo.st_dev
+        try:
+            fdev = fstatinfo.st_rdev
+        except AttributeError:
+            fdev = 0
         getfdev = GetDevMajorMinor(fdev)
         fdev_minor = getfdev[0]
         fdev_major = getfdev[1]
@@ -6572,9 +6696,6 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
         if(member.isreg()):
             ffullmode = member.mode + stat.S_IFREG
             ftype = 0
-        elif(member.isdev()):
-            ffullmode = member.mode
-            ftype = 7
         elif(member.islnk()):
             ffullmode = member.mode + stat.S_IFREG
             ftype = 1
@@ -6593,9 +6714,12 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
         elif(member.isfifo()):
             ffullmode = member.mode + stat.S_IFIFO
             ftype = 6
-        elif(member.issparse()):
+        elif(hasattr(member, "issparse") and member.issparse()):
             ffullmode = member.mode
             ftype = 12
+        elif(member.isdev()):
+            ffullmode = member.mode
+            ftype = 7
         else:
             ffullmode = member.mode
             ftype = 0
@@ -7717,6 +7841,8 @@ def RePackArchiveFile(infile, outfile, compression="auto", compresswholefile=Tru
         try:
             catfp.flush()
             os.fsync(catfp.fileno())
+            if(hasattr(os, "sync")):
+                os.sync()
         except io.UnsupportedOperation:
             pass
         except AttributeError:
@@ -7832,6 +7958,8 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, seekstart=0, seeken
                 try:
                     fpc.flush()
                     os.fsync(fpc.fileno())
+                    if(hasattr(os, "sync")):
+                        os.sync()
                 except io.UnsupportedOperation:
                     pass
                 except AttributeError:
@@ -7882,6 +8010,8 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, seekstart=0, seeken
                         try:
                             fpc.flush()
                             os.fsync(fpc.fileno())
+                            if(hasattr(os, "sync")):
+                                os.sync()
                         except io.UnsupportedOperation:
                             pass
                         except AttributeError:
@@ -7960,6 +8090,8 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, seekstart=0, seeken
                         try:
                             fpc.flush()
                             os.fsync(fpc.fileno())
+                            if(hasattr(os, "sync")):
+                                os.sync()
                         except io.UnsupportedOperation:
                             pass
                         except AttributeError:
@@ -8184,9 +8316,15 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
         elif(member.isfifo()):
             ffullmode = member.mode + stat.S_IFIFO
             ftype = 6
-        elif(member.issparse()):
+        elif(hasattr(member, "issparse") and member.issparse()):
             ffullmode = member.mode
             ftype = 12
+        elif(member.isdev()):
+            ffullmode = member.mode
+            ftype = 7
+        else:
+            ffullmode = member.mode
+            ftype = 0
         if(not verbose):
             VerbosePrintOut(member.name)
         elif(verbose):

{pycatfile-0.14.18 → pycatfile-0.15.0}/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/4/2024 Ver. 0.14.18 RC 1 - Author: cooldude2k $
+    $FileInfo: setup.py - Last Update: 12/6/2024 Ver. 0.15.0 RC 1 - Author: cooldude2k $
 '''
 
 import os