Skip to content

Commit d4e3279

Browse files
ReikaNekoUwUReikaNekoUwU
committed
Small update
1 parent 9ea431d commit d4e3279

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

‎pyfoxfile/pyfoxfile.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9764,7 +9764,7 @@ def FoxFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0
97649764
else:
97659765
if(infile != "-" and not hasattr(infile, "read") and not hasattr(infile, "write") and not isinstance(infile, bytes)):
97669766
infile = RemoveWindowsPath(infile)
9767-
listarrayfileslist = FoxFileToArray(infile, fmttype, filestart, seekstart, seekend, True, False, False, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
9767+
listarrayfileslist = ArchiveFileToArray(infile, fmttype, filestart, seekstart, seekend, True, False, False, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
97689768
if(not listarrayfileslist):
97699769
return False
97709770
for listarrayfiles in listarrayfileslist:
@@ -9800,19 +9800,19 @@ def FoxFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0
98009800
if(newstyle):
98019801
compratio = calc_compression(listarrayfiles['ffilelist'][lcfi]['fsize'], listarrayfiles['ffilelist'][lcfi]['fcsize'], "percent")
98029802
if(compratio=="-"):
9803-
compratio = "\t"
9803+
compratio = " "
98049804
else:
9805-
compratio = "\t"+compratio
9805+
compratio = str(" "+compratio)
98069806
if(listarrayfiles['ffilelist'][lcfi]['fcsize']==0):
9807-
compressprint = str("").rjust(15) + "\t"
9807+
compressprint = str("") + " "
98089808
else:
9809-
compressprint = str(listarrayfiles['ffilelist'][lcfi]['fcsize']).rjust(15) + "\t"
9810-
VerbosePrintOut(ftype_to_str(listarrayfiles['ffilelist'][lcfi]['ftype']) + "\t" + listarrayfiles['ffilelist'][lcfi]['fcompression'] + compratio + "\t" + str(
9811-
listarrayfiles['ffilelist'][lcfi]['fsize']).rjust(15) + "\t" + compressprint + printfname)
9809+
compressprint = str(listarrayfiles['ffilelist'][lcfi]['fcsize']) + " "
9810+
VerbosePrintOut(ftype_to_str(listarrayfiles['ffilelist'][lcfi]['ftype']).rjust(5) + " " + listarrayfiles['ffilelist'][lcfi]['fcompression'].rjust(5) + compratio.rjust(5) + " " + str(
9811+
listarrayfiles['ffilelist'][lcfi]['fsize']).rjust(15) + " " + compressprint.rjust(15) + printfname)
98129812
else:
98139813
dt = datetime.datetime.fromtimestamp(listarrayfiles['ffilelist'][lcfi]['fmtime'])
9814-
VerbosePrintOut(PrintPermissionString(listarrayfiles['ffilelist'][lcfi]['fmode'], listarrayfiles['ffilelist'][lcfi]['ftype']) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
9815-
listarrayfiles['ffilelist'][lcfi]['fsize']).rjust(15) + "\t" + dt.strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
9814+
VerbosePrintOut(PrintPermissionString(listarrayfiles['ffilelist'][lcfi]['fmode'], listarrayfiles['ffilelist'][lcfi]['ftype']) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(
9815+
listarrayfiles['ffilelist'][lcfi]['fsize']).rjust(15) + " " + dt.strftime('%Y-%m-%d %H:%M') + " " + printfname)
98169816
lcfi = lcfi + 1
98179817
if(returnfp):
98189818
return listarrayfiles['fp']
@@ -9981,8 +9981,8 @@ def TarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=Fal
99819981
fgprint = member.gname
99829982
if(len(fgprint) <= 0):
99839983
fgprint = member.gid
9984-
VerbosePrintOut(PrintPermissionString(ffullmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
9985-
member.size).rjust(15) + "\t" + datetime.datetime.fromtimestamp(member.mtime).strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
9984+
VerbosePrintOut(PrintPermissionString(ffullmode, ftype) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(
9985+
member.size).rjust(15) + " " + datetime.datetime.fromtimestamp(member.mtime).strftime('%Y-%m-%d %H:%M') + " " + printfname)
99869986
lcfi = lcfi + 1
99879987
if(returnfp):
99889988
return listarrayfiles['fp']
@@ -10110,8 +10110,8 @@ def BSDTarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=
1011010110
fgprint = member.gid
1011110111
else:
1011210112
fgprint = "0"
10113-
VerbosePrintOut(PrintPermissionString(ffullmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
10114-
fsize).rjust(15) + "\t" + datetime.datetime.fromtimestamp(member.mtime).strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
10113+
VerbosePrintOut(PrintPermissionString(ffullmode, ftype) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(
10114+
fsize).rjust(15) + " " + datetime.datetime.fromtimestamp(member.mtime).strftime('%Y-%m-%d %H:%M') + " " + printfname)
1011510115
lcfi = lcfi + 1
1011610116
if(returnfp):
1011710117
return listarrayfiles['fp']
@@ -10268,8 +10268,8 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
1026810268
fgprint = fgname
1026910269
if(len(fgprint) <= 0):
1027010270
fgprint = str(fgid)
10271-
VerbosePrintOut(PrintPermissionString(fmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(member.file_size).rjust(
10272-
15) + "\t" + datetime.datetime.fromtimestamp(int(get_unix_timestamp_zip(zipinfo))).strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
10271+
VerbosePrintOut(PrintPermissionString(fmode, ftype) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(member.file_size).rjust(
10272+
15) + " " + datetime.datetime.fromtimestamp(int(get_unix_timestamp_zip(zipinfo))).strftime('%Y-%m-%d %H:%M') + " " + printfname)
1027310273
lcfi = lcfi + 1
1027410274
if(returnfp):
1027510275
return listarrayfiles['fp']
@@ -10401,8 +10401,8 @@ def RarFileListFiles(infile, verbose=False, returnfp=False):
1040110401
fgprint = fgname
1040210402
if(len(fgprint) <= 0):
1040310403
fgprint = str(fgid)
10404-
VerbosePrintOut(PrintPermissionString(fmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
10405-
member.file_size).rjust(15) + "\t" + member.mtime.strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
10404+
VerbosePrintOut(PrintPermissionString(fmode, ftype) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(
10405+
member.file_size).rjust(15) + " " + member.mtime.strftime('%Y-%m-%d %H:%M') + " " + printfname)
1040610406
lcfi = lcfi + 1
1040710407
if(returnfp):
1040810408
return listarrayfiles['fp']
@@ -10514,8 +10514,8 @@ def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
1051410514
fgprint = fgname
1051510515
if(len(fgprint) <= 0):
1051610516
fgprint = str(fgid)
10517-
VerbosePrintOut(PrintPermissionString(fmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
10518-
fsize).rjust(15) + "\t" + member.creationtime.strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
10517+
VerbosePrintOut(PrintPermissionString(fmode, ftype) + " " + str(fuprint) + "/" + str(fgprint) + " " + str(
10518+
fsize).rjust(15) + " " + member.creationtime.strftime('%Y-%m-%d %H:%M') + " " + printfname)
1051910519
lcfi = lcfi + 1
1052010520
if(returnfp):
1052110521
return listarrayfiles['fp']

0 commit comments

Comments
 (0)