PyCatFile 0.15.12__tar.gz → 0.15.14__tar.gz

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.15.12
+Version: 0.15.14
 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.12 → pycatfile-0.15.14}/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/20/2024 Ver. 0.15.12 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 12/21/2024 Ver. 0.15.14 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -98,7 +98,7 @@ argparser.add_argument("-V", "--version", action="version",
                        version=__program_name__ + " " + __version__)
 # Input and output specifications
 argparser.add_argument(
-    "-i", "--input", help="Specify the file(s) to concatenate or the concatenated file to extract.", required=True)
+    "-i", "--input", nargs="+", help="Specify the file(s) to concatenate or the concatenated file to extract.", required=True)
 argparser.add_argument("-o", "--output", default=None,
                        help="Specify the name for the extracted or output concatenated files.")
 # Operations
@@ -161,19 +161,20 @@ fnamedict = {'format_name': fname, 'format_magic': fnamemagic, 'format_lower': f
 actions = ['create', 'extract', 'list', 'repack', 'validate']
 active_action = next(
     (action for action in actions if getattr(getargs, action)), None)
+input_file = getargs.input[0]
 
 # Execute the appropriate functions based on determined actions and arguments
 if active_action:
     if active_action == 'create':
         if getargs.convert:
             checkcompressfile = pycatfile.CheckCompressionSubType(
-                getargs.input, fnamedict, True)
+                input_file, fnamedict, True)
             if(checkcompressfile == "catfile"):
-                tmpout = pycatfile.RePackArchiveFile(getargs.input, getargs.output, getargs.compression, getargs.wholefile,
+                tmpout = pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile,
                                                      getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
             else:
                 tmpout = pycatfile.PackArchiveFileFromInFile(
-                    getargs.input, getargs.output, getargs.compression, getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, getargs.verbose, False)
+                    input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, getargs.verbose, False)
             if(not tmpout):
                 sys.exit(1)
         else:
@@ -182,72 +183,72 @@ if active_action:
     elif active_action == 'repack':
         if getargs.convert:
             checkcompressfile = pycatfile.CheckCompressionSubType(
-                getargs.input, fnamedict, True)
+                input_file, fnamedict, True)
             if(checkcompressfile == "catfile"):
-                pycatfile.RePackArchiveFile(getargs.input, getargs.output, getargs.compression, getargs.wholefile, getargs.level,
+                pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level,
                                             False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
             else:
-                pycatfile.PackArchiveFileFromInFile(getargs.input, getargs.output, getargs.compression,
+                pycatfile.PackArchiveFileFromInFile(input_file, getargs.output, getargs.compression,
                                                     getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, getargs.verbose, False)
             if(not tmpout):
                 sys.exit(1)
         else:
-            pycatfile.RePackArchiveFile(getargs.input, getargs.output, getargs.compression, getargs.wholefile, getargs.level,
+            pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level,
                                         False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
     elif active_action == 'extract':
         if getargs.convert:
             checkcompressfile = pycatfile.CheckCompressionSubType(
-                getargs.input, fnamedict, True)
+                input_file, fnamedict, True)
             tempout = BytesIO()
             if(checkcompressfile == "catfile"):
-                tmpout = pycatfile.RePackArchiveFile(getargs.input, tempout, getargs.compression, getargs.wholefile,
+                tmpout = pycatfile.RePackArchiveFile(input_file, tempout, getargs.compression, getargs.wholefile,
                                                      getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, False, False)
             else:
                 tmpout = pycatfile.PackArchiveFileFromInFile(
-                    getargs.input, tempout, getargs.compression, getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, False, False)
+                    input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, False, False)
             if(not tmpout):
                 sys.exit(1)
-            getargs.input = tempout
-        pycatfile.UnPackArchiveFile(getargs.input, getargs.output, False, 0, 0, getargs.skipchecksum,
+            input_file = tempout
+        pycatfile.UnPackArchiveFile(input_file, getargs.output, False, 0, 0, getargs.skipchecksum,
                                     fnamedict, getargs.verbose, getargs.preserve, getargs.preserve, False)
     elif active_action == 'list':
         if getargs.convert:
             checkcompressfile = pycatfile.CheckCompressionSubType(
-                getargs.input, fnamedict, True)
+                input_file, fnamedict, True)
             if(checkcompressfile == "catfile"):
                 tmpout = pycatfile.ArchiveFileListFiles(
-                    getargs.input, 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
+                    input_file, 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
             else:
                 tmpout = pycatfile.InFileListFiles(
-                    getargs.input, getargs.verbose, fnamedict, False)
+                    input_file, getargs.verbose, fnamedict, False)
             if(not tmpout):
                 sys.exit(1)
         else:
             pycatfile.ArchiveFileListFiles(
-                getargs.input, 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
+                input_file, 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
     elif active_action == 'validate':
         if getargs.convert:
             checkcompressfile = pycatfile.CheckCompressionSubType(
-                getargs.input, fnamedict, True)
+                input_file, fnamedict, True)
             tempout = BytesIO()
             if(checkcompressfile == "catfile"):
-                tmpout = pycatfile.RePackArchiveFile(getargs.input, tempout, getargs.compression, getargs.wholefile,
+                tmpout = pycatfile.RePackArchiveFile(input_file, tempout, getargs.compression, getargs.wholefile,
                                                      getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, False, False)
             else:
                 tmpout = pycatfile.PackArchiveFileFromInFile(
-                    getargs.input, tempout, getargs.compression, getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, False, False)
-            getargs.input = tempout
+                    input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, False, False)
+            input_file = tempout
             if(not tmpout):
                 sys.exit(1)
         fvalid = pycatfile.ArchiveFileValidate(
-            getargs.input, fnamedict, getargs.verbose, False)
+            input_file, fnamedict, getargs.verbose, False)
         if(not getargs.verbose):
             import sys
             import logging
             logging.basicConfig(format="%(message)s",
                                 stream=sys.stdout, level=logging.DEBUG)
         if(fvalid):
-            pycatfile.VerbosePrintOut("File is valid: \n" + str(getargs.input))
+            pycatfile.VerbosePrintOut("File is valid: \n" + str(input_file))
         else:
             pycatfile.VerbosePrintOut(
-                "File is invalid: \n" + str(getargs.input))
+                "File is invalid: \n" + str(input_file))

{pycatfile-0.15.12 → pycatfile-0.15.14}/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/20/2024 Ver. 0.15.12 RC 1 - Author: cooldude2k $
+    $FileInfo: neocatfile.py - Last Update: 12/21/2024 Ver. 0.15.14 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -55,7 +55,7 @@ argparser = argparse.ArgumentParser(
     description="Manipulates concatenated files for various operations like creation, extraction, and validation.")
 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,
+argparser.add_argument("-i", "--input", nargs="+", required=True,
                        help="Specifies input file(s) for processing.")
 argparser.add_argument(
     "-o", "--output", help="Specifies the output file name.")
@@ -94,43 +94,43 @@ elif args.list:
     primary_action = 'list'
 elif args.validate:
     primary_action = 'validate'
-
+input_file = args.input[0]
 # Functionality mappings
 if primary_action == 'create':
     if args.convert == 'tar':
-        pycatfile.PackArchiveFileFromTarFile(args.input, args.output, args.compression, args.level, args.checksum, [
+        pycatfile.PackArchiveFileFromTarFile(input_file, args.output, args.compression, args.level, args.checksum, [
         ], pycatfile.__file_format_list__, args.verbose, False)
     elif args.convert == 'zip':
-        pycatfile.PackArchiveFileFromZipFile(args.input, args.output, args.compression, args.level, args.checksum, [
+        pycatfile.PackArchiveFileFromZipFile(input_file, args.output, args.compression, args.level, args.checksum, [
         ], pycatfile.__file_format_list__, args.verbose, False)
     elif py7zr_support and args.convert == '7zip':
-        pycatfile.PackArchiveFileFromSevenZipFile(args.input, args.output, args.compression, args.level, args.checksum, [
+        pycatfile.PackArchiveFileFromSevenZipFile(input_file, args.output, args.compression, args.level, args.checksum, [
         ], pycatfile.__file_format_list__, args.verbose, False)
     elif rarfile_support and args.convert == 'rar':
-        pycatfile.PackArchiveFileFromRarFile(args.input, args.output, args.compression, args.level, args.checksum, [
+        pycatfile.PackArchiveFileFromRarFile(input_file, args.output, args.compression, args.level, args.checksum, [
         ], pycatfile.__file_format_list__, args.verbose, False)
     else:
         pycatfile.PackArchiveFile(args.input, args.output, args.verbose, args.compression, args.level,
                                   False, args.checksum, [], pycatfile.__file_format_list__, args.verbose, False)
 elif primary_action == 'repack':
     pycatfile.RePackArchiveFile(
-        args.input, args.output, args.compression, args.level, args.checksum, args.verbose)
+        input_file, args.output, args.compression, args.level, args.checksum, args.verbose)
 elif primary_action == 'extract':
     pycatfile.UnPackArchiveFile(
-        args.input, args.output, args.verbose, args.preserve)
+        input_file, args.output, args.verbose, args.preserve)
 elif primary_action == 'list':
     if args.convert == 'tar':
-        pycatfile.TarFileListFiles(args.input, verbose=args.verbose)
+        pycatfile.TarFileListFiles(input_file, verbose=args.verbose)
     elif args.convert == 'zip':
-        pycatfile.ZipFileListFiles(args.input, verbose=args.verbose)
+        pycatfile.ZipFileListFiles(input_file, verbose=args.verbose)
     elif args.convert == '7zip':
-        pycatfile.SevenZipFileListFiles(args.input, verbose=args.verbose)
+        pycatfile.SevenZipFileListFiles(input_file, verbose=args.verbose)
     elif rarfile_support and args.convert == 'rar':
-        pycatfile.RarFileListFiles(args.input, verbose=args.verbose)
+        pycatfile.RarFileListFiles(input_file, verbose=args.verbose)
     else:
-        pycatfile.ArchiveFileListFiles(args.input, verbose=args.verbose)
+        pycatfile.ArchiveFileListFiles(input_file, verbose=args.verbose)
 elif primary_action == 'validate':
-    is_valid = pycatfile.ArchiveFileValidate(args.input, args.verbose)
+    is_valid = pycatfile.ArchiveFileValidate(input_file, args.verbose)
     result_msg = "Validation result for {0}: {1}".format(
-        args.input, 'Valid' if is_valid else 'Invalid')
+        input_file, 'Valid' if is_valid else 'Invalid')
     print(result_msg)

{pycatfile-0.15.12 → pycatfile-0.15.14}/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/20/2024 Ver. 0.15.12 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 12/21/2024 Ver. 0.15.14 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, 12, "RC 1", 1)
-__version_date_info__ = (2024, 12, 20, "RC 1", 1)
+__version_info__ = (0, 15, 14, "RC 1", 1)
+__version_date_info__ = (2024, 12, 21, "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: 1462baae55cec6c1aac531873eaeb2b3efe154d4 $"
+__revision_id__ = "$Id: 5ac437d67d0b485df434560f6f73d2823777d4c1 $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -591,6 +591,8 @@ def ListDir(dirpath, followlink=False, duplicates=False, include_regex=None, exc
     Returns:
         list: A list of files and directories matching the criteria.
     """
+    if os.stat not in os.supports_follow_symlinks and followlink:
+        followlink = False
     if isinstance(dirpath, (list, tuple)):
         dirpath = list(filter(None, dirpath))
     elif isinstance(dirpath, basestring):
@@ -656,6 +658,8 @@ def ListDirAdvanced(dirpath, followlink=False, duplicates=False, include_regex=N
     Returns:
         list: A list of files and directories matching the criteria.
     """
+    if os.stat not in os.supports_follow_symlinks and followlink:
+        followlink = False
     if isinstance(dirpath, (list, tuple)):
         dirpath = list(filter(None, dirpath))
     elif isinstance(dirpath, basestring):
@@ -729,7 +733,7 @@ def GetTotalSize(file_list):
     return total_size
 
 
-def create_alias_function(prefix, base_name, suffix, target_function):
+def create_alias_function_alt(prefix, base_name, suffix, target_function):
     # Define a new function that wraps the target function
     def alias_function(*args, **kwargs):
         return target_function(*args, **kwargs)
@@ -739,7 +743,7 @@ def create_alias_function(prefix, base_name, suffix, target_function):
     globals()[function_name] = alias_function
 
 
-def create_alias_function_alt(prefix, base_name, suffix, target_function):
+def create_alias_function(prefix, base_name, suffix, target_function):
     # Create the function name by combining the prefix, base name, and the suffix
     # Use the format method for string formatting, compatible with Python 2 and 3
     function_name = "{}{}{}".format(prefix, base_name, suffix)
@@ -2611,6 +2615,8 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], ext
             infilelist = list(filter(None, infiles))
         elif(isinstance(infiles, (basestring, ))):
             infilelist = list(filter(None, [infiles]))
+    if os.stat not in os.supports_follow_symlinks and followlink:
+        followlink = False
     if(advancedlist):
         GetDirList = ListDirAdvanced(infilelist, followlink, False)
     else:
@@ -3796,6 +3802,8 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
             infilelist = list(filter(None, infiles))
         elif(isinstance(infiles, (basestring, ))):
             infilelist = list(filter(None, [infiles]))
+    if os.stat not in os.supports_follow_symlinks and followlink:
+        followlink = False
     if(advancedlist):
         GetDirList = ListDirAdvanced(infilelist, followlink, False)
     else:
@@ -6482,6 +6490,8 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
             infilelist = list(filter(None, infiles))
         elif(isinstance(infiles, (basestring, ))):
             infilelist = list(filter(None, [infiles]))
+    if os.stat not in os.supports_follow_symlinks and followlink:
+        followlink = False
     if(advancedlist):
         GetDirList = ListDirAdvanced(infilelist, followlink, False)
     else:

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