Skip to content

Commit f574425

Browse files
author
Kazuki Suzuki Przyborowski
committed
Small update
1 parent fef68c9 commit f574425

4 files changed

Lines changed: 126 additions & 156 deletions

File tree

‎altcatfile.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ def main():
122122
# Determine operation
123123
if args.create:
124124
pycatfile.PackArchiveFile(args.input, args.output, args.verbose, args.compression,
125-
args.level, pycatfile.compressionlistalt, False, args.checksum, [], format_dict, args.verbose, False)
125+
args.level, pycatfile.compressionlistalt, False, [args.checksum, args.checksum, args.checksum], [], format_dict, args.verbose, False)
126126
elif args.repack:
127127
pycatfile.RePackArchiveFile(
128-
input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, args.checksum, args.verbose)
128+
input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], args.verbose)
129129
elif args.extract:
130130
pycatfile.UnPackArchiveFile(
131131
input_file, args.output, args.verbose, args.preserve)

‎catfile.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,41 +171,41 @@ def handler(signum, frame):
171171
input_file, fnamedict, True)
172172
if(checkcompressfile == "catfile"):
173173
tmpout = pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile,
174-
getargs.level, pycatfile.compressionlistalt, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
174+
getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
175175
else:
176176
tmpout = pycatfile.PackArchiveFileFromInFile(
177-
input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, getargs.checksum, [], fnamedict, getargs.verbose, False)
177+
input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, getargs.verbose, False)
178178
if(not tmpout):
179179
sys.exit(1)
180180
else:
181181
pycatfile.PackArchiveFile(getargs.input, getargs.output, getargs.text, getargs.compression,
182-
getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, getargs.checksum, [], fnamedict, getargs.verbose, False)
182+
getargs.wholefile, getargs.level, pycatfile.compressionlistalt, False, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, getargs.verbose, False)
183183
elif active_action == 'repack':
184184
if getargs.convert:
185185
checkcompressfile = pycatfile.CheckCompressionSubType(
186186
input_file, fnamedict, True)
187187
if(checkcompressfile == "catfile"):
188188
pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt,
189-
False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
189+
False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
190190
else:
191191
pycatfile.PackArchiveFileFromInFile(input_file, getargs.output, getargs.compression,
192-
getargs.wholefile, getargs.level, pycatfile.compressionlistalt, getargs.checksum, [], fnamedict, getargs.verbose, False)
192+
getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, getargs.verbose, False)
193193
if(not tmpout):
194194
sys.exit(1)
195195
else:
196196
pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt,
197-
False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
197+
False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
198198
elif active_action == 'extract':
199199
if getargs.convert:
200200
checkcompressfile = pycatfile.CheckCompressionSubType(
201201
input_file, fnamedict, True)
202202
tempout = BytesIO()
203203
if(checkcompressfile == "catfile"):
204204
tmpout = pycatfile.RePackArchiveFile(input_file, tempout, getargs.compression, getargs.wholefile,
205-
getargs.level, pycatfile.compressionlistalt, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, False, False)
205+
getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, False, False)
206206
else:
207207
tmpout = pycatfile.PackArchiveFileFromInFile(
208-
input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, getargs.checksum, [], fnamedict, False, False)
208+
input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, False, False)
209209
if(not tmpout):
210210
sys.exit(1)
211211
input_file = tempout
@@ -233,10 +233,10 @@ def handler(signum, frame):
233233
tempout = BytesIO()
234234
if(checkcompressfile == "catfile"):
235235
tmpout = pycatfile.RePackArchiveFile(input_file, tempout, getargs.compression, getargs.wholefile,
236-
getargs.level, pycatfile.compressionlistalt, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, False, False)
236+
getargs.level, pycatfile.compressionlistalt, False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, False, False)
237237
else:
238238
tmpout = pycatfile.PackArchiveFileFromInFile(
239-
input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, getargs.checksum, [], fnamedict, False, False)
239+
input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, False, False)
240240
input_file = tempout
241241
if(not tmpout):
242242
sys.exit(1)

‎neocatfile.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,23 @@
9898
# Functionality mappings
9999
if primary_action == 'create':
100100
if args.convert == 'tar':
101-
pycatfile.PackArchiveFileFromTarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, args.checksum, [
101+
pycatfile.PackArchiveFileFromTarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
102102
], pycatfile.__file_format_list__, args.verbose, False)
103103
elif args.convert == 'zip':
104-
pycatfile.PackArchiveFileFromZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, args.checksum, [
104+
pycatfile.PackArchiveFileFromZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
105105
], pycatfile.__file_format_list__, args.verbose, False)
106106
elif py7zr_support and args.convert == '7zip':
107-
pycatfile.PackArchiveFileFromSevenZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, args.checksum, [
107+
pycatfile.PackArchiveFileFromSevenZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
108108
], pycatfile.__file_format_list__, args.verbose, False)
109109
elif rarfile_support and args.convert == 'rar':
110-
pycatfile.PackArchiveFileFromRarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, args.checksum, [
110+
pycatfile.PackArchiveFileFromRarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
111111
], pycatfile.__file_format_list__, args.verbose, False)
112112
else:
113113
pycatfile.PackArchiveFile(args.input, args.output, args.verbose, args.compression, args.level, pycatfile.compressionlistalt,
114-
False, args.checksum, [], pycatfile.__file_format_list__, args.verbose, False)
114+
False, [args.checksum, args.checksum, args.checksum], [], pycatfile.__file_format_list__, args.verbose, False)
115115
elif primary_action == 'repack':
116116
pycatfile.RePackArchiveFile(
117-
input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, args.checksum, args.verbose)
117+
input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], args.verbose)
118118
elif primary_action == 'extract':
119119
pycatfile.UnPackArchiveFile(
120120
input_file, args.output, args.verbose, args.preserve)

0 commit comments

Comments
 (0)