Skip to content

Commit 341c15b

Browse files
committed
Small update
1 parent ffc5783 commit 341c15b

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

pyarchivefile/pyarchivefile.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9793,19 +9793,19 @@ def ArchiveFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seeke
97939793
if(newstyle):
97949794
compratio = calc_compression(listarrayfiles['ffilelist'][lcfi]['fsize'], listarrayfiles['ffilelist'][lcfi]['fcsize'], "percent")
97959795
if(compratio=="-"):
9796-
compratio = "\t"
9796+
compratio = " "
97979797
else:
9798-
compratio = "\t"+compratio
9798+
compratio = str(" "+compratio)
97999799
if(listarrayfiles['ffilelist'][lcfi]['fcsize']==0):
9800-
compressprint = str("").rjust(15) + "\t"
9800+
compressprint = str("") + " "
98019801
else:
9802-
compressprint = str(listarrayfiles['ffilelist'][lcfi]['fcsize']).rjust(15) + "\t"
9803-
VerbosePrintOut(ftype_to_str(listarrayfiles['ffilelist'][lcfi]['ftype']) + "\t" + listarrayfiles['ffilelist'][lcfi]['fcompression'] + compratio + "\t" + str(
9804-
listarrayfiles['ffilelist'][lcfi]['fsize']).rjust(15) + "\t" + compressprint + printfname)
9802+
compressprint = str(listarrayfiles['ffilelist'][lcfi]['fcsize']) + " "
9803+
VerbosePrintOut(ftype_to_str(listarrayfiles['ffilelist'][lcfi]['ftype']).rjust(5) + " " + listarrayfiles['ffilelist'][lcfi]['fcompression'].rjust(5) + compratio.rjust(5) + " " + str(
9804+
listarrayfiles['ffilelist'][lcfi]['fsize']).rjust(15) + " " + compressprint.rjust(15) + printfname)
98059805
else:
98069806
dt = datetime.datetime.fromtimestamp(listarrayfiles['ffilelist'][lcfi]['fmtime'])
9807-
VerbosePrintOut(PrintPermissionString(listarrayfiles['ffilelist'][lcfi]['fmode'], listarrayfiles['ffilelist'][lcfi]['ftype']) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
9808-
listarrayfiles['ffilelist'][lcfi]['fsize']).rjust(15) + "\t" + dt.strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
9807+
VerbosePrintOut(PrintPermissionString(listarrayfiles['ffilelist'][lcfi]['fmode'], listarrayfiles['ffilelist'][lcfi]['ftype']) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(
9808+
listarrayfiles['ffilelist'][lcfi]['fsize']).rjust(15) + " " + dt.strftime('%Y-%m-%d %H:%M') + " " + printfname)
98099809
lcfi = lcfi + 1
98109810
if(returnfp):
98119811
return listarrayfiles['fp']
@@ -9974,8 +9974,8 @@ def TarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=Fal
99749974
fgprint = member.gname
99759975
if(len(fgprint) <= 0):
99769976
fgprint = member.gid
9977-
VerbosePrintOut(PrintPermissionString(ffullmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
9978-
member.size).rjust(15) + "\t" + datetime.datetime.fromtimestamp(member.mtime).strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
9977+
VerbosePrintOut(PrintPermissionString(ffullmode, ftype) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(
9978+
member.size).rjust(15) + " " + datetime.datetime.fromtimestamp(member.mtime).strftime('%Y-%m-%d %H:%M') + " " + printfname)
99799979
lcfi = lcfi + 1
99809980
if(returnfp):
99819981
return listarrayfiles['fp']
@@ -10103,8 +10103,8 @@ def BSDTarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=
1010310103
fgprint = member.gid
1010410104
else:
1010510105
fgprint = "0"
10106-
VerbosePrintOut(PrintPermissionString(ffullmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
10107-
fsize).rjust(15) + "\t" + datetime.datetime.fromtimestamp(member.mtime).strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
10106+
VerbosePrintOut(PrintPermissionString(ffullmode, ftype) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(
10107+
fsize).rjust(15) + " " + datetime.datetime.fromtimestamp(member.mtime).strftime('%Y-%m-%d %H:%M') + " " + printfname)
1010810108
lcfi = lcfi + 1
1010910109
if(returnfp):
1011010110
return listarrayfiles['fp']
@@ -10261,8 +10261,8 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
1026110261
fgprint = fgname
1026210262
if(len(fgprint) <= 0):
1026310263
fgprint = str(fgid)
10264-
VerbosePrintOut(PrintPermissionString(fmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(member.file_size).rjust(
10265-
15) + "\t" + datetime.datetime.fromtimestamp(int(get_unix_timestamp_zip(zipinfo))).strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
10264+
VerbosePrintOut(PrintPermissionString(fmode, ftype) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(member.file_size).rjust(
10265+
15) + " " + datetime.datetime.fromtimestamp(int(get_unix_timestamp_zip(zipinfo))).strftime('%Y-%m-%d %H:%M') + " " + printfname)
1026610266
lcfi = lcfi + 1
1026710267
if(returnfp):
1026810268
return listarrayfiles['fp']
@@ -10394,8 +10394,8 @@ def RarFileListFiles(infile, verbose=False, returnfp=False):
1039410394
fgprint = fgname
1039510395
if(len(fgprint) <= 0):
1039610396
fgprint = str(fgid)
10397-
VerbosePrintOut(PrintPermissionString(fmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
10398-
member.file_size).rjust(15) + "\t" + member.mtime.strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
10397+
VerbosePrintOut(PrintPermissionString(fmode, ftype) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(
10398+
member.file_size).rjust(15) + " " + member.mtime.strftime('%Y-%m-%d %H:%M') + " " + printfname)
1039910399
lcfi = lcfi + 1
1040010400
if(returnfp):
1040110401
return listarrayfiles['fp']
@@ -10507,8 +10507,8 @@ def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
1050710507
fgprint = fgname
1050810508
if(len(fgprint) <= 0):
1050910509
fgprint = str(fgid)
10510-
VerbosePrintOut(PrintPermissionString(fmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
10511-
fsize).rjust(15) + "\t" + member.creationtime.strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
10510+
VerbosePrintOut(PrintPermissionString(fmode, ftype) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(
10511+
fsize).rjust(15) + " " + member.creationtime.strftime('%Y-%m-%d %H:%M') + " " + printfname)
1051210512
lcfi = lcfi + 1
1051310513
if(returnfp):
1051410514
return listarrayfiles['fp']

0 commit comments

Comments
 (0)