Skip to content

Commit f03c7ab

Browse files
committed
Small update
1 parent a955690 commit f03c7ab

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

pycatfile/pycatfile.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6126,7 +6126,7 @@ def AppendFilesWithContentToList(infiles, dirlistfromtxt=False, extradata=[], js
61266126
data_types = {0, 7}
61276127
sparse_types = {12}
61286128
if ftype in zero_length_types:
6129-
fsize = format(int("0"), 'x').lower()
6129+
fsize = format(int(0), 'x').lower()
61306130
elif ftype in data_types:
61316131
fsize = format(int(fstatinfo.st_size), 'x').lower()
61326132
else:
@@ -6435,7 +6435,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
64356435
curfid = curfid + 1
64366436
if(ftype == 2):
64376437
flinkname = member.linkname
6438-
fdev = format(int("0"), 'x').lower()
6438+
fdev = format(int(0), 'x').lower()
64396439
try:
64406440
frdev = format(int(os.makedev(member.devmajor, member.devminor)), 'x').lower()
64416441
except AttributeError:
@@ -6446,7 +6446,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
64466446
data_types = {0, 7}
64476447
sparse_types = {12}
64486448
if ftype in zero_length_types:
6449-
fsize = format(int("0"), 'x').lower()
6449+
fsize = format(int(0), 'x').lower()
64506450
elif ftype in data_types:
64516451
fsize = format(int(member.size), 'x').lower()
64526452
else:
@@ -6739,17 +6739,20 @@ def AppendFilesWithContentFromBSDTarFileToList(infile, extradata=[], jsondata={}
67396739
curfid = curfid + 1
67406740
if(ftype == 2):
67416741
flinkname = member.linkpath
6742-
fdev = format(int("0"), 'x').lower()
6743-
frdev = format(int(member.rdev), 'x').lower()
6742+
fdev = format(int(0), 'x').lower()
6743+
if(hasattr(member, "rdev")):
6744+
frdev = format(int(member.rdev), 'x').lower()
6745+
else:
6746+
frdev = format(int(0), 'x').lower()
67446747
# Types that should be considered zero-length in the archive context:
67456748
zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
67466749
# Types that have actual data to read:
67476750
data_types = {0, 7}
67486751
sparse_types = {12}
67496752
if ftype in zero_length_types:
6750-
fsize = format(int("0"), 'x').lower()
6753+
fsize = format(int(0), 'x').lower()
67516754
elif member.size is None:
6752-
fsize = format(int("0"), 'x').lower()
6755+
fsize = format(int(0), 'x').lower()
67536756
elif ftype in data_types:
67546757
fsize = format(int(member.size), 'x').lower()
67556758
else:
@@ -6939,7 +6942,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
69396942
fdev = format(int(0), 'x').lower()
69406943
frdev = format(int(0), 'x').lower()
69416944
if(ftype == 5):
6942-
fsize = format(int("0"), 'x').lower()
6945+
fsize = format(int(0), 'x').lower()
69436946
elif(ftype == 0):
69446947
fsize = format(int(member.file_size), 'x').lower()
69456948
else:
@@ -7202,7 +7205,7 @@ def AppendFilesWithContentFromRarFileToList(infile, extradata=[], jsondata={}, c
72027205
fdev = format(int(0), 'x').lower()
72037206
frdev = format(int(0), 'x').lower()
72047207
if(ftype == 5):
7205-
fsize = format(int("0"), 'x').lower()
7208+
fsize = format(int(0), 'x').lower()
72067209
elif(ftype == 0):
72077210
fsize = format(int(member.file_size), 'x').lower()
72087211
else:
@@ -7460,7 +7463,7 @@ def AppendFilesWithContentFromSevenZipFileToList(infile, extradata=[], jsondata=
74607463
fdev = format(int(0), 'x').lower()
74617464
frdev = format(int(0), 'x').lower()
74627465
if(ftype == 5):
7463-
fsize = format(int("0"), 'x').lower()
7466+
fsize = format(int(0), 'x').lower()
74647467
fatime = format(int(to_ns(member.creationtime.timestamp())), 'x').lower()
74657468
fmtime = format(int(to_ns(member.creationtime.timestamp())), 'x').lower()
74667469
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)