Skip to content

Commit c1d9d1d

Browse files
committed
Small update
1 parent b7ff44c commit c1d9d1d

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

pyarchivefile/pyfile.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ def _wrap(stream):
9090
sys.stderr = _wrap(sys.stderr)
9191

9292
hashlib_guaranteed = False
93+
try:
94+
_ALGORITHMS_AVAILABLE = set(hashlib.algorithms_available)
95+
except AttributeError:
96+
_ALGORITHMS_AVAILABLE = set(getattr(hashlib, "algorithms", []))
9397
# Environment setup
9498
os.environ["PYTHONIOENCODING"] = "UTF-8"
9599

@@ -5962,6 +5966,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
59625966
fcurfid = format(int(curfid), 'x').lower()
59635967
fcurinode = format(int(curfid), 'x').lower()
59645968
curfid = curfid + 1
5969+
flinkcount = format(int(flinkcount), 'x').lower()
59655970
fdev = format(int(0), 'x').lower()
59665971
frdev = format(int(0), 'x').lower()
59675972
if(ftype == 5):
@@ -5995,6 +6000,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
59956000
elif(zipinfo.create_system == 3):
59966001
fwinattributes = format(int(zipinfo.external_attr & 0xFFFF), 'x').lower()
59976002
fmode = format(int((zipinfo.external_attr >> 16) & 0xFFFF), 'x').lower()
6003+
mode = int(zipinfo.external_attr >> 16)
59986004
prefmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
59996005
if(prefmode==0):
60006006
fmode = 0
@@ -6224,6 +6230,7 @@ def AppendFilesWithContentFromRarFileToList(infile, extradata=[], jsondata={}, c
62246230
fcurfid = format(int(curfid), 'x').lower()
62256231
fcurinode = format(int(curfid), 'x').lower()
62266232
curfid = curfid + 1
6233+
flinkcount = format(int(flinkcount), 'x').lower()
62276234
fdev = format(int(0), 'x').lower()
62286235
frdev = format(int(0), 'x').lower()
62296236
if(ftype == 5):
@@ -6482,6 +6489,7 @@ def AppendFilesWithContentFromSevenZipFileToList(infile, extradata=[], jsondata=
64826489
fcurfid = format(int(curfid), 'x').lower()
64836490
fcurinode = format(int(curfid), 'x').lower()
64846491
curfid = curfid + 1
6492+
flinkcount = format(int(flinkcount), 'x').lower()
64856493
fdev = format(int(0), 'x').lower()
64866494
frdev = format(int(0), 'x').lower()
64876495
if(ftype == 5):
@@ -9081,6 +9089,7 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
90819089
elif(zipinfo.create_system == 3):
90829090
fwinattributes = int(zipinfo.external_attr & 0xFFFF)
90839091
fmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
9092+
mode = int(zipinfo.external_attr >> 16)
90849093
prefmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
90859094
if(prefmode==0):
90869095
fmode = 0

0 commit comments

Comments
 (0)