Skip to content

Commit a611027

Browse files
committed
Small update
1 parent 4e21594 commit a611027

1 file changed

Lines changed: 17 additions & 9 deletions

File tree

pyfoxfile/pyfoxfile.py

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

0 commit comments

Comments
 (0)