PyCatFile 0.16.4__tar.gz → 0.17.2__tar.gz

{pycatfile-0.16.4 → pycatfile-0.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyCatFile
-Version: 0.16.4
+Version: 0.17.2
 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.16.4 → pycatfile-0.17.2}/PyCatFile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyCatFile
-Version: 0.16.4
+Version: 0.17.2
 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.16.4 → pycatfile-0.17.2}/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: 1/15/2025 Ver. 0.16.4 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 1/24/2025 Ver. 0.17.2 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -78,7 +78,9 @@ __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__
+__file_format_dict__ = pycatfile.__file_format_dict__
+__file_format_default__ = pycatfile.__file_format_default__
+__file_format_multi_dict__ = pycatfile.__file_format_multi_dict__
 __use_new_style__ = pycatfile.__use_new_style__
 __use_advanced_list__ = pycatfile.__use_advanced_list__
 __use_alt_inode__ = pycatfile.__use_alt_inode__
@@ -112,11 +114,11 @@ argparser.add_argument("-r", "--repack", action="store_true",
                        help="Re-concatenate files, fixing checksum errors if any.")
 # File manipulation options
 argparser.add_argument(
-    "-F", "--format", default=__file_format_list__[0], help="Specify the format to use.")
+    "-F", "--format", default="auto", help="Specify the format to use.")
 argparser.add_argument(
-    "-D", "--delimiter", default=__file_format_list__[5], help="Specify the delimiter to use.")
+    "-D", "--delimiter", default=__file_format_dict__['format_delimiter'], help="Specify the delimiter to use.")
 argparser.add_argument(
-    "-m", "--formatver", default=__file_format_list__[6], help="Specify the format version.")
+    "-m", "--formatver", default=__file_format_dict__['format_ver'], help="Specify the format version.")
 argparser.add_argument("-l", "--list", action="store_true",
                        help="List files included in the concatenated file.")
 # Compression options
@@ -146,21 +148,19 @@ getargs = argparser.parse_args()
 
 fname = getargs.format
 fnamelower = fname.lower()
-if(getargs.format==__file_format_list__[0]):
-    fnamemagic = __file_format_magic__
-    fnamelen = __file_format_len__
-    fnamehex = __file_format_hex__
+if(getargs.format=="auto"):
+    fnamedict = __file_format_multi_dict__
+    __file_format_default__ = getargs.format
 else:
     fnamemagic = fname
     fnamelen = len(fname)
     fnamehex = binascii.hexlify(fname.encode("UTF-8")).decode("UTF-8")
-fnamesty = __use_new_style__
-fnamelst = __use_advanced_list__
-fnameino = __use_alt_inode__
-fnamelist = [fname, fnamemagic, fnamelower, fnamelen, fnamehex,
-             getargs.delimiter, getargs.formatver, fnamesty, fnamelst, fnameino]
-fnamedict = {'format_name': fname, 'format_magic': fnamemagic, 'format_lower': fnamelower, 'format_len': fnamelen, 'format_hex': fnamehex,
-             'format_delimiter': getargs.delimiter, 'format_ver': getargs.formatver, 'new_style': fnamesty, 'use_advanced_list': fnamelst, 'use_alt_inode': fnameino}
+    __file_format_default__ = fnamemagic
+    fnamesty = __use_new_style__
+    fnamelst = __use_advanced_list__
+    fnameino = __use_alt_inode__
+    fnamedict = {'format_name': fname, 'format_magic': fnamemagic, 'format_lower': fnamelower, 'format_len': fnamelen, 'format_hex': fnamehex,
+                 'format_delimiter': getargs.delimiter, 'format_ver': getargs.formatver, 'new_style': fnamesty, 'use_advanced_list': fnamelst, 'use_alt_inode': fnameino}
 
 # Determine the primary action based on user input
 actions = ['create', 'extract', 'list', 'repack', 'validate']
@@ -174,27 +174,24 @@ if active_action:
         if getargs.convert:
             checkcompressfile = pycatfile.CheckCompressionSubType(
                 input_file, fnamedict, True)
-            if(checkcompressfile == "catfile"):
-                tmpout = pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile,
-                                                     getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
+            if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])):
+                tmpout = pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
             else:
                 tmpout = pycatfile.PackArchiveFileFromInFile(
-                    input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, getargs.verbose, False)
+                    input_file, getargs.output, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, getargs.verbose, False)
             if(not tmpout):
                 sys.exit(1)
         else:
-            pycatfile.PackArchiveFile(getargs.input, getargs.output, getargs.text, getargs.compression,
-                                      getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, getargs.verbose, False)
+            pycatfile.PackArchiveFile(getargs.input, getargs.output, getargs.text, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, getargs.verbose, False)
     elif active_action == 'repack':
         if getargs.convert:
             checkcompressfile = pycatfile.CheckCompressionSubType(
                 input_file, fnamedict, True)
-            if(checkcompressfile == "catfile"):
+            if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])):
                 pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt,
                                             False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
             else:
-                pycatfile.PackArchiveFileFromInFile(input_file, getargs.output, getargs.compression,
-                                                    getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, getargs.verbose, False)
+                pycatfile.PackArchiveFileFromInFile(input_file, getargs.output, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, getargs.verbose, False)
             if(not tmpout):
                 sys.exit(1)
         else:
@@ -205,12 +202,11 @@ if active_action:
             checkcompressfile = pycatfile.CheckCompressionSubType(
                 input_file, fnamedict, True)
             tempout = BytesIO()
-            if(checkcompressfile == "catfile"):
-                tmpout = pycatfile.RePackArchiveFile(input_file, tempout, getargs.compression, getargs.wholefile,
-                                                     getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, False, False)
+            if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])):
+                tmpout = pycatfile.RePackArchiveFile(input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, False, False)
             else:
                 tmpout = pycatfile.PackArchiveFileFromInFile(
-                    input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, False, False)
+                    input_file, tempout, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, False, False)
             if(not tmpout):
                 sys.exit(1)
             input_file = tempout
@@ -220,33 +216,29 @@ if active_action:
         if getargs.convert:
             checkcompressfile = pycatfile.CheckCompressionSubType(
                 input_file, fnamedict, True)
-            if(checkcompressfile == "catfile"):
-                tmpout = pycatfile.ArchiveFileListFiles(
-                    input_file, 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
+            if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])):
+                tmpout = pycatfile.ArchiveFileListFiles(input_file, "auto", 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
             else:
-                tmpout = pycatfile.InFileListFiles(
-                    input_file, getargs.verbose, fnamedict, False)
+                tmpout = pycatfile.InFileListFiles(input_file, getargs.verbose, fnamedict, False)
             if(not tmpout):
                 sys.exit(1)
         else:
-            pycatfile.ArchiveFileListFiles(
-                input_file, 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
+            pycatfile.ArchiveFileListFiles(input_file, "auto", 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
     elif active_action == 'validate':
         if getargs.convert:
             checkcompressfile = pycatfile.CheckCompressionSubType(
                 input_file, fnamedict, True)
             tempout = BytesIO()
-            if(checkcompressfile == "catfile"):
-                tmpout = pycatfile.RePackArchiveFile(input_file, tempout, getargs.compression, getargs.wholefile,
-                                                     getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, False, False)
+            if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])):
+                tmpout = pycatfile.RePackArchiveFile(input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, False, False)
             else:
                 tmpout = pycatfile.PackArchiveFileFromInFile(
-                    input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, False, False)
+                    input_file, tempout, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, False, False)
             input_file = tempout
             if(not tmpout):
                 sys.exit(1)
         fvalid = pycatfile.ArchiveFileValidate(
-            input_file, fnamedict, getargs.verbose, False)
+            input_file, "auto", fnamedict, getargs.verbose, False)
         if(not getargs.verbose):
             import sys
             import logging
@@ -255,5 +247,4 @@ if active_action:
         if(fvalid):
             pycatfile.VerbosePrintOut("File is valid: \n" + str(input_file))
         else:
-            pycatfile.VerbosePrintOut(
-                "File is invalid: \n" + str(input_file))
+            pycatfile.VerbosePrintOut("File is invalid: \n" + str(input_file))

{pycatfile-0.16.4 → pycatfile-0.17.2}/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: 1/15/2025 Ver. 0.16.4 RC 1 - Author: cooldude2k $
+    $FileInfo: neocatfile.py - Last Update: 1/24/2025 Ver. 0.17.2 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -29,7 +29,8 @@ __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__
+__file_format_dict__ = pycatfile.__file_format_dict__
+__file_format_default__ = pycatfile.__file_format_default__
 __use_new_style__ = pycatfile.__use_new_style__
 __use_advanced_list__ = pycatfile.__use_advanced_list__
 __use_alt_inode__ = pycatfile.__use_alt_inode__
@@ -99,19 +100,19 @@ input_file = args.input[0]
 if primary_action == 'create':
     if args.convert == 'tar':
         pycatfile.PackArchiveFileFromTarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
-        ], pycatfile.__file_format_list__, args.verbose, False)
+        ], pycatfile.__file_format_dict__, args.verbose, False)
     elif args.convert == 'zip':
         pycatfile.PackArchiveFileFromZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
-        ], pycatfile.__file_format_list__, args.verbose, False)
+        ], pycatfile.__file_format_dict__, args.verbose, False)
     elif py7zr_support and args.convert == '7zip':
         pycatfile.PackArchiveFileFromSevenZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
-        ], pycatfile.__file_format_list__, args.verbose, False)
+        ], pycatfile.__file_format_dict__, args.verbose, False)
     elif rarfile_support and args.convert == 'rar':
         pycatfile.PackArchiveFileFromRarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
-        ], pycatfile.__file_format_list__, args.verbose, False)
+        ], pycatfile.__file_format_dict__, args.verbose, False)
     else:
         pycatfile.PackArchiveFile(args.input, args.output, args.verbose, args.compression, args.level, pycatfile.compressionlistalt,
-                                  False, [args.checksum, args.checksum, args.checksum], [], pycatfile.__file_format_list__, args.verbose, False)
+                                  False, [args.checksum, args.checksum, args.checksum], [], pycatfile.__file_format_dict__, args.verbose, False)
 elif primary_action == 'repack':
     pycatfile.RePackArchiveFile(
         input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], args.verbose)
@@ -130,7 +131,7 @@ elif primary_action == 'list':
     else:
         pycatfile.ArchiveFileListFiles(input_file, verbose=args.verbose)
 elif primary_action == 'validate':
-    is_valid = pycatfile.ArchiveFileValidate(input_file, args.verbose)
+    is_valid = pycatfile.ArchiveFileValidate(input_file, verbose=args.verbose)
     result_msg = "Validation result for {0}: {1}".format(
         input_file, 'Valid' if is_valid else 'Invalid')
     print(result_msg)