Skip to content

Commit c7f64d8

Browse files
committed
Small update
1 parent 4f64768 commit c7f64d8

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

pyfoxfile/pyfoxfile.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6127,7 +6127,7 @@ def AppendFilesWithContentToList(infiles, dirlistfromtxt=False, extradata=[], js
61276127
data_types = {0, 7}
61286128
sparse_types = {12}
61296129
if ftype in zero_length_types:
6130-
fsize = format(int("0"), 'x').lower()
6130+
fsize = format(int(0), 'x').lower()
61316131
elif ftype in data_types:
61326132
fsize = format(int(fstatinfo.st_size), 'x').lower()
61336133
else:
@@ -6436,7 +6436,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
64366436
curfid = curfid + 1
64376437
if(ftype == 2):
64386438
flinkname = member.linkname
6439-
fdev = format(int("0"), 'x').lower()
6439+
fdev = format(int(0), 'x').lower()
64406440
try:
64416441
frdev = format(int(os.makedev(member.devmajor, member.devminor)), 'x').lower()
64426442
except AttributeError:
@@ -6447,7 +6447,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
64476447
data_types = {0, 7}
64486448
sparse_types = {12}
64496449
if ftype in zero_length_types:
6450-
fsize = format(int("0"), 'x').lower()
6450+
fsize = format(int(0), 'x').lower()
64516451
elif ftype in data_types:
64526452
fsize = format(int(member.size), 'x').lower()
64536453
else:
@@ -6740,17 +6740,20 @@ def AppendFilesWithContentFromBSDTarFileToList(infile, extradata=[], jsondata={}
67406740
curfid = curfid + 1
67416741
if(ftype == 2):
67426742
flinkname = member.linkpath
6743-
fdev = format(int("0"), 'x').lower()
6744-
frdev = format(int(member.rdev), 'x').lower()
6743+
fdev = format(int(0), 'x').lower()
6744+
if(hasattr(member, "rdev")):
6745+
frdev = format(int(member.rdev), 'x').lower()
6746+
else:
6747+
frdev = format(int(0), 'x').lower()
67456748
# Types that should be considered zero-length in the archive context:
67466749
zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
67476750
# Types that have actual data to read:
67486751
data_types = {0, 7}
67496752
sparse_types = {12}
67506753
if ftype in zero_length_types:
6751-
fsize = format(int("0"), 'x').lower()
6754+
fsize = format(int(0), 'x').lower()
67526755
elif member.size is None:
6753-
fsize = format(int("0"), 'x').lower()
6756+
fsize = format(int(0), 'x').lower()
67546757
elif ftype in data_types:
67556758
fsize = format(int(member.size), 'x').lower()
67566759
else:
@@ -6940,7 +6943,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
69406943
fdev = format(int(0), 'x').lower()
69416944
frdev = format(int(0), 'x').lower()
69426945
if(ftype == 5):
6943-
fsize = format(int("0"), 'x').lower()
6946+
fsize = format(int(0), 'x').lower()
69446947
elif(ftype == 0):
69456948
fsize = format(int(member.file_size), 'x').lower()
69466949
else:
@@ -7203,7 +7206,7 @@ def AppendFilesWithContentFromRarFileToList(infile, extradata=[], jsondata={}, c
72037206
fdev = format(int(0), 'x').lower()
72047207
frdev = format(int(0), 'x').lower()
72057208
if(ftype == 5):
7206-
fsize = format(int("0"), 'x').lower()
7209+
fsize = format(int(0), 'x').lower()
72077210
elif(ftype == 0):
72087211
fsize = format(int(member.file_size), 'x').lower()
72097212
else:
@@ -7461,7 +7464,7 @@ def AppendFilesWithContentFromSevenZipFileToList(infile, extradata=[], jsondata=
74617464
fdev = format(int(0), 'x').lower()
74627465
frdev = format(int(0), 'x').lower()
74637466
if(ftype == 5):
7464-
fsize = format(int("0"), 'x').lower()
7467+
fsize = format(int(0), 'x').lower()
74657468
fatime = format(int(to_ns(member.creationtime.timestamp())), 'x').lower()
74667469
fmtime = format(int(to_ns(member.creationtime.timestamp())), 'x').lower()
74677470
fctime = format(int(to_ns(member.creationtime.timestamp())), 'x').lower()
@@ -10408,7 +10411,7 @@ def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
1040810411
for fmodval in str(oct(fmode))[-3:]:
1040910412
permissionstr = permissionstr + \
1041010413
permissions['access'].get(fmodval, '---')
10411-
fsize = int("0")
10414+
fsize = int(0)
1041210415
if(not member.is_directory):
1041310416
ftype = 0
1041410417
permissionstr = "-" + permissionstr

0 commit comments

Comments
 (0)