Skip to content

Commit

Permalink
Version bump 😺👍
Browse files Browse the repository at this point in the history
  • Loading branch information
@KazukiPrzyborowski
KazukiPrzyborowski committed Feb 20, 2025
1 parent 8a920d5 commit bf8a6ea
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 36 deletions.
7 changes: 3 additions & 4 deletions altcatfile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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__
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion catfile.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
24 changes: 12 additions & 12 deletions catfile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion checksum.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compression.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mkcatfilebundle.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 7 additions & 8 deletions neocatfile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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__
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion phpcatfile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
6 changes: 3 additions & 3 deletions pycatfile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "PyCatFile"
version = "0.18.2"
version = "0.18.6"
readme = "README.md"
license = { text = "BSD-3-Clause" }
keywords = []
Expand Down
2 changes: 1 addition & 1 deletion pyshell-old.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyshell.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bf8a6ea

Please sign in to comment.