Skip to content

Commit e702539

Browse files
committed
Small update
1 parent d3568e7 commit e702539

1 file changed

Lines changed: 17 additions & 9 deletions

File tree

pycatfile/pycatfile.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9939,7 +9939,7 @@ def CatFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0
99399939
else:
99409940
if(infile != "-" and not hasattr(infile, "read") and not hasattr(infile, "write") and not isinstance(infile, bytes)):
99419941
infile = RemoveWindowsPath(infile)
9942-
listarrayfileslist = CatFileToArray(infile, fmttype, filestart, seekstart, seekend, True, False, False, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
9942+
listarrayfileslist = ArchiveFileToArray(infile, fmttype, filestart, seekstart, seekend, True, False, False, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
99439943
if(not listarrayfileslist):
99449944
return False
99459945
for listarrayfiles in listarrayfileslist:
@@ -9973,16 +9973,24 @@ def CatFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0
99739973
if(len(fgprint) <= 0):
99749974
fgprint = listarrayfiles['ffilelist'][lcfi]['fgid']
99759975
if(newstyle):
9976-
compratio = calc_compression(listarrayfiles['ffilelist'][lcfi]['fsize'], listarrayfiles['ffilelist'][lcfi]['fcsize'], "percent")
9977-
if(compratio=="-"):
9976+
compressiontype = listarrayfiles['ffilelist'][lcfi]['fcompression']
9977+
if(compressiontype == ""):
99789978
compratio = ""
9979+
compressprint = " "
9980+
compressiontype = "none"
99799981
else:
9980-
compratio = str(""+compratio)
9981-
if(listarrayfiles['ffilelist'][lcfi]['fcsize']==0):
9982-
compressprint = str("") + " "
9983-
else:
9984-
compressprint = str(listarrayfiles['ffilelist'][lcfi]['fcsize']) + " "
9985-
VerbosePrintOut(ftype_to_str(listarrayfiles['ffilelist'][lcfi]['ftype']).rjust(5) + " " + listarrayfiles['ffilelist'][lcfi]['fcompression'].rjust(5) + " " + compratio.rjust(5) + " " + str(
9982+
compratio = calc_compression(listarrayfiles['ffilelist'][lcfi]['fsize'], listarrayfiles['ffilelist'][lcfi]['fcsize'], "percent")
9983+
if(compratio=="-"):
9984+
compratio = ""
9985+
compressiontype = "none"
9986+
else:
9987+
compratio = str(""+compratio)
9988+
if(listarrayfiles['ffilelist'][lcfi]['fcsize']==0):
9989+
compressprint = " "
9990+
compressiontype = "none"
9991+
else:
9992+
compressprint = str(listarrayfiles['ffilelist'][lcfi]['fcsize']) + " "
9993+
VerbosePrintOut(ftype_to_str(listarrayfiles['ffilelist'][lcfi]['ftype']).rjust(5) + " " + compressiontype.rjust(5) + " " + compratio.rjust(5) + " " + str(
99869994
listarrayfiles['ffilelist'][lcfi]['fsize']).rjust(15) + " " + compressprint.rjust(15) + printfname)
99879995
else:
99889996
dt = datetime.datetime.fromtimestamp(listarrayfiles['ffilelist'][lcfi]['fmtime'])

0 commit comments

Comments
 (0)