Skip to content

Commit

Permalink
Small update
Browse files Browse the repository at this point in the history
  • Loading branch information
@KazukiPrzyborowski
KazukiPrzyborowski committed Jan 29, 2025
1 parent 623988e commit cb4ea8c
Show file tree
Hide file tree
Showing 4 changed files with 178 additions and 178 deletions.
10 changes: 5 additions & 5 deletions altcatfile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,15 @@ def main():

# Determine operation
if args.create:
pycatfile.PackArchiveFile(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], [], format_dict, args.verbose, False)
elif args.repack:
pycatfile.RePackArchiveFile( input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], args.verbose)
pycatfile.RePackCatFile( input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], args.verbose)
elif args.extract:
pycatfile.UnPackArchiveFile(input_file, args.output, args.verbose, args.preserve)
pycatfile.UnPackCatFile(input_file, args.output, args.verbose, args.preserve)
elif args.list:
pycatfile.ArchiveFileListFiles(input_file, verbose=args.verbose)
pycatfile.CatFileListFiles(input_file, verbose=args.verbose)
elif args.validate:
is_valid = pycatfile.ArchiveFileValidate(input_file, verbose=args.verbose)
is_valid = pycatfile.CatFileValidate(input_file, verbose=args.verbose)
result_msg = "Validation result for {}: {}".format(input_file, 'Valid' if is_valid else 'Invalid')
print(result_msg)
else:
Expand Down
28 changes: 14 additions & 14 deletions catfile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,69 +175,69 @@ 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.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)
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)
else:
tmpout = pycatfile.PackArchiveFileFromInFile(
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)
if(not tmpout):
sys.exit(1)
else:
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)
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)
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.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt,
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)
else:
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)
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)
if(not tmpout):
sys.exit(1)
else:
pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt,
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)
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.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)
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)
else:
tmpout = pycatfile.PackArchiveFileFromInFile(
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)
if(not tmpout):
sys.exit(1)
input_file = tempout
pycatfile.UnPackArchiveFile(input_file, getargs.output, False, 0, 0, getargs.skipchecksum,
pycatfile.UnPackCatFile(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(
input_file, fnamedict, True)
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)
tmpout = pycatfile.CatFileListFiles(input_file, "auto", 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
else:
tmpout = pycatfile.InFileListFiles(input_file, getargs.verbose, fnamedict, False)
if(not tmpout):
sys.exit(1)
else:
pycatfile.ArchiveFileListFiles(input_file, "auto", 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
pycatfile.CatFileListFiles(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((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)
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)
else:
tmpout = pycatfile.PackArchiveFileFromInFile(
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
if(not tmpout):
sys.exit(1)
fvalid = pycatfile.ArchiveFileValidate(
fvalid = pycatfile.CatFileValidate(
input_file, "auto", fnamedict, getargs.verbose, False)
if(not getargs.verbose):
import sys
Expand Down
18 changes: 9 additions & 9 deletions neocatfile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,25 @@
# Functionality mappings
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.PackCatFileFromTarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
], 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.PackCatFileFromZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
], 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.PackCatFileFromSevenZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
], 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.PackCatFileFromRarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
], pycatfile.__file_format_dict__, args.verbose, False)
else:
pycatfile.PackArchiveFile(args.input, args.output, args.verbose, args.compression, args.level, pycatfile.compressionlistalt,
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)
elif primary_action == 'repack':
pycatfile.RePackArchiveFile(
pycatfile.RePackCatFile(
input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], args.verbose)
elif primary_action == 'extract':
pycatfile.UnPackArchiveFile(
pycatfile.UnPackCatFile(
input_file, args.output, args.verbose, args.preserve)
elif primary_action == 'list':
if args.convert == 'tar':
Expand All @@ -129,9 +129,9 @@
elif rarfile_support and args.convert == 'rar':
pycatfile.RarFileListFiles(input_file, verbose=args.verbose)
else:
pycatfile.ArchiveFileListFiles(input_file, verbose=args.verbose)
pycatfile.CatFileListFiles(input_file, verbose=args.verbose)
elif primary_action == 'validate':
is_valid = pycatfile.ArchiveFileValidate(input_file, verbose=args.verbose)
is_valid = pycatfile.CatFileValidate(input_file, verbose=args.verbose)
result_msg = "Validation result for {0}: {1}".format(
input_file, 'Valid' if is_valid else 'Invalid')
print(result_msg)
Loading

0 comments on commit cb4ea8c

Please sign in to comment.