Skip to content

Commit cb4ea8c

Browse files
author
Kazuki Suzuki Przyborowski
committed
Small update
1 parent 623988e commit cb4ea8c

4 files changed

Lines changed: 178 additions & 178 deletions

File tree

‎altcatfile.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@ def main():
132132

133133
# Determine operation
134134
if args.create:
135-
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)
135+
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)
136136
elif args.repack:
137-
pycatfile.RePackArchiveFile( input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], args.verbose)
137+
pycatfile.RePackCatFile( input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], args.verbose)
138138
elif args.extract:
139-
pycatfile.UnPackArchiveFile(input_file, args.output, args.verbose, args.preserve)
139+
pycatfile.UnPackCatFile(input_file, args.output, args.verbose, args.preserve)
140140
elif args.list:
141-
pycatfile.ArchiveFileListFiles(input_file, verbose=args.verbose)
141+
pycatfile.CatFileListFiles(input_file, verbose=args.verbose)
142142
elif args.validate:
143-
is_valid = pycatfile.ArchiveFileValidate(input_file, verbose=args.verbose)
143+
is_valid = pycatfile.CatFileValidate(input_file, verbose=args.verbose)
144144
result_msg = "Validation result for {}: {}".format(input_file, 'Valid' if is_valid else 'Invalid')
145145
print(result_msg)
146146
else:

‎catfile.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,69 +175,69 @@ def handler(signum, frame):
175175
checkcompressfile = pycatfile.CheckCompressionSubType(
176176
input_file, fnamedict, True)
177177
if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])):
178-
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)
178+
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)
179179
else:
180-
tmpout = pycatfile.PackArchiveFileFromInFile(
180+
tmpout = pycatfile.PackCatFileFromInFile(
181181
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)
182182
if(not tmpout):
183183
sys.exit(1)
184184
else:
185-
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)
185+
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)
186186
elif active_action == 'repack':
187187
if getargs.convert:
188188
checkcompressfile = pycatfile.CheckCompressionSubType(
189189
input_file, fnamedict, True)
190190
if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])):
191-
pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt,
191+
pycatfile.RePackCatFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt,
192192
False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
193193
else:
194-
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)
194+
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)
195195
if(not tmpout):
196196
sys.exit(1)
197197
else:
198-
pycatfile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt,
198+
pycatfile.RePackCatFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt,
199199
False, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], fnamedict, getargs.verbose, False)
200200
elif active_action == 'extract':
201201
if getargs.convert:
202202
checkcompressfile = pycatfile.CheckCompressionSubType(
203203
input_file, fnamedict, True)
204204
tempout = BytesIO()
205205
if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])):
206-
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)
206+
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)
207207
else:
208-
tmpout = pycatfile.PackArchiveFileFromInFile(
208+
tmpout = pycatfile.PackCatFileFromInFile(
209209
input_file, tempout, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, False, False)
210210
if(not tmpout):
211211
sys.exit(1)
212212
input_file = tempout
213-
pycatfile.UnPackArchiveFile(input_file, getargs.output, False, 0, 0, getargs.skipchecksum,
213+
pycatfile.UnPackCatFile(input_file, getargs.output, False, 0, 0, getargs.skipchecksum,
214214
fnamedict, getargs.verbose, getargs.preserve, getargs.preserve, False)
215215
elif active_action == 'list':
216216
if getargs.convert:
217217
checkcompressfile = pycatfile.CheckCompressionSubType(
218218
input_file, fnamedict, True)
219219
if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])):
220-
tmpout = pycatfile.ArchiveFileListFiles(input_file, "auto", 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
220+
tmpout = pycatfile.CatFileListFiles(input_file, "auto", 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
221221
else:
222222
tmpout = pycatfile.InFileListFiles(input_file, getargs.verbose, fnamedict, False)
223223
if(not tmpout):
224224
sys.exit(1)
225225
else:
226-
pycatfile.ArchiveFileListFiles(input_file, "auto", 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
226+
pycatfile.CatFileListFiles(input_file, "auto", 0, 0, getargs.skipchecksum, fnamedict, getargs.verbose, False)
227227
elif active_action == 'validate':
228228
if getargs.convert:
229229
checkcompressfile = pycatfile.CheckCompressionSubType(
230230
input_file, fnamedict, True)
231231
tempout = BytesIO()
232232
if((IsNestedDict(fnamedict) and compresscheck in fnamedict) or (IsSingleDict(fnamedict) and compresscheck==fnamedict['format_magic'])):
233-
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)
233+
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)
234234
else:
235-
tmpout = pycatfile.PackArchiveFileFromInFile(
235+
tmpout = pycatfile.PackCatFileFromInFile(
236236
input_file, tempout, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pycatfile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum], [], fnamedict, False, False)
237237
input_file = tempout
238238
if(not tmpout):
239239
sys.exit(1)
240-
fvalid = pycatfile.ArchiveFileValidate(
240+
fvalid = pycatfile.CatFileValidate(
241241
input_file, "auto", fnamedict, getargs.verbose, False)
242242
if(not getargs.verbose):
243243
import sys

‎neocatfile.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,25 +99,25 @@
9999
# Functionality mappings
100100
if primary_action == 'create':
101101
if args.convert == 'tar':
102-
pycatfile.PackArchiveFileFromTarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
102+
pycatfile.PackCatFileFromTarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
103103
], pycatfile.__file_format_dict__, args.verbose, False)
104104
elif args.convert == 'zip':
105-
pycatfile.PackArchiveFileFromZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
105+
pycatfile.PackCatFileFromZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
106106
], pycatfile.__file_format_dict__, args.verbose, False)
107107
elif py7zr_support and args.convert == '7zip':
108-
pycatfile.PackArchiveFileFromSevenZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
108+
pycatfile.PackCatFileFromSevenZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
109109
], pycatfile.__file_format_dict__, args.verbose, False)
110110
elif rarfile_support and args.convert == 'rar':
111-
pycatfile.PackArchiveFileFromRarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
111+
pycatfile.PackCatFileFromRarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
112112
], pycatfile.__file_format_dict__, args.verbose, False)
113113
else:
114-
pycatfile.PackArchiveFile(args.input, args.output, args.verbose, args.compression, args.level, pycatfile.compressionlistalt,
114+
pycatfile.PackCatFile(args.input, args.output, args.verbose, args.compression, args.level, pycatfile.compressionlistalt,
115115
False, [args.checksum, args.checksum, args.checksum], [], pycatfile.__file_format_dict__, args.verbose, False)
116116
elif primary_action == 'repack':
117-
pycatfile.RePackArchiveFile(
117+
pycatfile.RePackCatFile(
118118
input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], args.verbose)
119119
elif primary_action == 'extract':
120-
pycatfile.UnPackArchiveFile(
120+
pycatfile.UnPackCatFile(
121121
input_file, args.output, args.verbose, args.preserve)
122122
elif primary_action == 'list':
123123
if args.convert == 'tar':
@@ -129,9 +129,9 @@
129129
elif rarfile_support and args.convert == 'rar':
130130
pycatfile.RarFileListFiles(input_file, verbose=args.verbose)
131131
else:
132-
pycatfile.ArchiveFileListFiles(input_file, verbose=args.verbose)
132+
pycatfile.CatFileListFiles(input_file, verbose=args.verbose)
133133
elif primary_action == 'validate':
134-
is_valid = pycatfile.ArchiveFileValidate(input_file, verbose=args.verbose)
134+
is_valid = pycatfile.CatFileValidate(input_file, verbose=args.verbose)
135135
result_msg = "Validation result for {0}: {1}".format(
136136
input_file, 'Valid' if is_valid else 'Invalid')
137137
print(result_msg)

0 commit comments

Comments
 (0)