From bf8a6ea7059dd928945d866212f33ff42d661ee9 Mon Sep 17 00:00:00 2001 From: Kazuki Suzuki Przyborowski Date: Thu, 20 Feb 2025 12:50:33 -0600 Subject: [PATCH] =?UTF-8?q?Version=20bump=20=F0=9F=98=BA=F0=9F=91=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- altcatfile.py | 7 +++---- catfile.ini | 2 +- catfile.py | 24 ++++++++++++------------ checksum.py | 2 +- compression.py | 2 +- mkcatfilebundle.py | 2 +- neocatfile.py | 15 +++++++-------- phpcatfile.php | 2 +- pycatfile.py | 6 +++--- pyproject.toml | 2 +- pyshell-old.py | 2 +- pyshell.py | 2 +- setup.py | 2 +- 13 files changed, 34 insertions(+), 36 deletions(-) diff --git a/altcatfile.py b/altcatfile.py index d3e978a..83f3281 100755 --- a/altcatfile.py +++ b/altcatfile.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: altcatfile.py - Last Update: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: altcatfile.py - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes @@ -27,7 +27,6 @@ __project__ = pycatfile.__project__ __program_name__ = pycatfile.__program_name__ __file_format_name__ = pycatfile.__file_format_name__ -__file_format_lower__ = pycatfile.__file_format_lower__ __file_format_magic__ = pycatfile.__file_format_magic__ __file_format_len__ = pycatfile.__file_format_len__ __file_format_hex__ = pycatfile.__file_format_hex__ @@ -132,9 +131,9 @@ def main(): # Determine operation if args.create: - pycatfile.PackCatFile(args.input, args.output, False, __file_format_default__, args.compression, args.level, pycatfile.compressionlistalt, False, [args.checksum, args.checksum, args.checksum], [], {}, format_dict, args.verbose, False) + pycatfile.PackCatFile(args.input, args.output, False, __file_format_default__, args.compression, args.level, pycatfile.compressionlistalt, False, [args.checksum, args.checksum, args.checksum, args.checksum], [], {}, format_dict, args.verbose, False) elif args.repack: - pycatfile.RePackCatFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], False, args.verbose) + pycatfile.RePackCatFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], False, args.verbose) elif args.extract: pycatfile.UnPackCatFile(input_file, args.output, args.verbose, args.preserve) elif args.list: diff --git a/catfile.ini b/catfile.ini index 77829b8..5d0df4b 100644 --- a/catfile.ini +++ b/catfile.ini @@ -1,4 +1,4 @@ -; $FileInfo: catfile.ini - Last Update: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ +; $FileInfo: catfile.ini - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ [config] default = CatFile diff --git a/catfile.py b/catfile.py index 501d349..84391e5 100755 --- a/catfile.py +++ b/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: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: catfile.py - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes @@ -173,38 +173,38 @@ def handler(signum, frame): checkcompressfile = pycatfile.CheckCompressionSubType( input_file, fnamedict, True) if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])): - tmpout = pycatfile.RePackCatFile(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) + tmpout = pycatfile.RePackCatFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.verbose, False) else: tmpout = pycatfile.PackCatFileFromInFile( - 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) + input_file, getargs.output, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.verbose, False) if(not tmpout): sys.exit(1) else: - pycatfile.PackCatFile(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) + pycatfile.PackCatFile(getargs.input, getargs.output, getargs.text, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, [getargs.checksum, 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((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])): pycatfile.RePackCatFile(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) + False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.verbose, False) else: - pycatfile.PackCatFileFromInFile(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) + pycatfile.PackCatFileFromInFile(input_file, getargs.output, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.verbose, False) if(not tmpout): sys.exit(1) else: pycatfile.RePackCatFile(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) + False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.verbose, False) elif active_action == 'extract': if getargs.convert: checkcompressfile = pycatfile.CheckCompressionSubType( input_file, fnamedict, True) tempout = BytesIO() if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])): - tmpout = pycatfile.RePackCatFile(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) + tmpout = pycatfile.RePackCatFile(input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, False, False) else: tmpout = pycatfile.PackCatFileFromInFile( - 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, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, False, False) if(not tmpout): sys.exit(1) input_file = tempout @@ -228,15 +228,15 @@ def handler(signum, frame): input_file, fnamedict, True) tempout = BytesIO() if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])): - tmpout = pycatfile.RePackCatFile(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, False) + tmpout = pycatfile.RePackCatFile(input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, False, False, False) else: tmpout = pycatfile.PackCatFileFromInFile( - 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, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, False, False) input_file = tempout if(not tmpout): sys.exit(1) fvalid = pycatfile.CatFileValidate( - input_file, "auto", fnamedict, getargs.verbose, False) + input_file, "auto", fnamedict, False, getargs.verbose, False) if(not getargs.verbose): import sys import logging diff --git a/checksum.py b/checksum.py index 0055fe8..a6560f8 100755 --- a/checksum.py +++ b/checksum.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: checksum.py - Last Update: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: checksum.py - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes diff --git a/compression.py b/compression.py index 1ea916d..d8cba1c 100755 --- a/compression.py +++ b/compression.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: compression.py - Last Update: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: compression.py - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes diff --git a/mkcatfilebundle.py b/mkcatfilebundle.py index 52ffe3c..bd7918a 100755 --- a/mkcatfilebundle.py +++ b/mkcatfilebundle.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: mkbundle.py - Last Update: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: mkbundle.py - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ ''' import os diff --git a/neocatfile.py b/neocatfile.py index 9f8a7b4..265aa15 100755 --- a/neocatfile.py +++ b/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: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: neocatfile.py - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes @@ -24,7 +24,6 @@ __project__ = pycatfile.__project__ __program_name__ = pycatfile.__program_name__ __file_format_name__ = pycatfile.__file_format_name__ -__file_format_lower__ = pycatfile.__file_format_lower__ __file_format_magic__ = pycatfile.__file_format_magic__ __file_format_len__ = pycatfile.__file_format_len__ __file_format_hex__ = pycatfile.__file_format_hex__ @@ -99,23 +98,23 @@ # Functionality mappings if primary_action == 'create': if args.convert == 'tar': - pycatfile.PackCatFileFromTarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [ + pycatfile.PackCatFileFromTarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], [ ], pycatfile.__file_format_dict__, args.verbose, False) elif args.convert == 'zip': - pycatfile.PackCatFileFromZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [ + pycatfile.PackCatFileFromZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], [ ], pycatfile.__file_format_dict__, args.verbose, False) elif py7zr_support and args.convert == '7zip': - pycatfile.PackCatFileFromSevenZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [ + pycatfile.PackCatFileFromSevenZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], [ ], pycatfile.__file_format_dict__, args.verbose, False) elif rarfile_support and args.convert == 'rar': - pycatfile.PackCatFileFromRarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [ + pycatfile.PackCatFileFromRarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], [ ], pycatfile.__file_format_dict__, args.verbose, False) else: pycatfile.PackCatFile(args.input, args.output, args.verbose, args.compression, args.level, pycatfile.compressionlistalt, - False, [args.checksum, args.checksum, args.checksum], [], {}, pycatfile.__file_format_dict__, args.verbose, False) + False, [args.checksum, args.checksum, args.checksum, args.checksum], [], {}, pycatfile.__file_format_dict__, args.verbose, False) elif primary_action == 'repack': pycatfile.RePackCatFile( - input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], False, args.verbose) + input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], False, args.verbose) elif primary_action == 'extract': pycatfile.UnPackCatFile( input_file, args.output, args.verbose, False, args.preserve) diff --git a/phpcatfile.php b/phpcatfile.php index 2a11d22..7a8bdfe 100755 --- a/phpcatfile.php +++ b/phpcatfile.php @@ -12,7 +12,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: phpcatfile.php - Last Update: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: phpcatfile.php - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ */ date_default_timezone_set('UTC'); diff --git a/pycatfile.py b/pycatfile.py index 2a8eac0..a5eced5 100755 --- a/pycatfile.py +++ b/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: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: pycatfile.py - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes @@ -351,8 +351,8 @@ def decode_unicode_escape(value): __file_format_dict__ = __file_format_multi_dict__[__file_format_default__] __project__ = __program_name__ __project_url__ = "https://github.com/GameMaker2k/PyCatFile" -__version_info__ = (0, 18, 2, "RC 1", 1) -__version_date_info__ = (2025, 2, 7, "RC 1", 1) +__version_info__ = (0, 18, 6, "RC 1", 1) +__version_date_info__ = (2025, 2, 20, "RC 1", 1) __version_date__ = str(__version_date_info__[0]) + "." + str( __version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2) __revision__ = __version_info__[3] diff --git a/pyproject.toml b/pyproject.toml index efaf485..190b21e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "PyCatFile" - version = "0.18.2" + version = "0.18.6" readme = "README.md" license = { text = "BSD-3-Clause" } keywords = [] diff --git a/pyshell-old.py b/pyshell-old.py index a70e433..5c95256 100755 --- a/pyshell-old.py +++ b/pyshell-old.py @@ -13,7 +13,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: pyshell-old.py - Last Update: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: pyshell-old.py - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes diff --git a/pyshell.py b/pyshell.py index 21739c8..8629a6c 100755 --- a/pyshell.py +++ b/pyshell.py @@ -13,7 +13,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: pyshell.py - Last Update: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: pyshell.py - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes diff --git a/setup.py b/setup.py index 4ed2483..5a992c3 100755 --- a/setup.py +++ b/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: 2/7/2025 Ver. 0.18.2 RC 1 - Author: cooldude2k $ + $FileInfo: setup.py - Last Update: 2/20/2025 Ver. 0.18.6 RC 1 - Author: cooldude2k $ ''' import os