Skip to content

Commit fe21071

Browse files
Add files via upload
1 parent 5b67d79 commit fe21071

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

pyarchivefile.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11417,7 +11417,7 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, filestart=0, seekst
1141711417
listarrayfiles = ArchiveFileToArray(infile, "auto", filestart, seekstart, seekend, False, True, True, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
1141811418
if(not listarrayfilespre):
1141911419
return False
11420-
if(not isinstance(infile, list)):
11420+
if(not isinstance(listarrayfilespre, list)):
1142111421
listarrayfilespre = [listarrayfilespre]
1142211422
fplist = []
1142311423
if os.path.exists(outdir) and os.path.isdir(outdir):
@@ -11653,8 +11653,9 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, filestart=0, seekst
1165311653
if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 6 and hasattr(os, "mkfifo")):
1165411654
os.mkfifo(PrependPath(
1165511655
outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
11656+
if(returnfp):
11657+
fplist.append(listarrayfiles['ffilelist'][lcfi]['fp'])
1165611658
lcfi = lcfi + 1
11657-
fplist.append(listarrayfiles['ffilelist']['fp'])
1165811659
if(returnfp):
1165911660
return fplist
1166011661
else:

pyarchivefile_py3.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10683,7 +10683,7 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, filestart=0, seekst
1068310683
listarrayfilespre = ArchiveFileToArray(infile, "auto", filestart, seekstart, seekend, False, True, True, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
1068410684
if(not listarrayfilespre):
1068510685
return False
10686-
if(not isinstance(infile, list)):
10686+
if(not isinstance(listarrayfilespre, list)):
1068710687
listarrayfilespre = [listarrayfilespre]
1068810688
fplist = []
1068910689
if os.path.exists(outdir) and os.path.isdir(outdir):
@@ -10693,6 +10693,7 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, filestart=0, seekst
1069310693
elif not os.path.exists(outdir):
1069410694
os.makedirs(outdir)
1069510695
for listarrayfiles in listarrayfilespre:
10696+
print(type(listarrayfiles))
1069610697
lenlist = len(listarrayfiles['ffilelist'])
1069710698
fnumfiles = int(listarrayfiles['fnumfiles'])
1069810699
lcfi = 0
@@ -10919,8 +10920,9 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, filestart=0, seekst
1091910920
if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 6 and hasattr(os, "mkfifo")):
1092010921
os.mkfifo(PrependPath(
1092110922
outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
10923+
if(returnfp):
10924+
fplist.append(listarrayfiles['ffilelist'][lcfi]['fp'])
1092210925
lcfi = lcfi + 1
10923-
fplist.append(listarrayfiles['ffilelist']['fp'])
1092410926
if(returnfp):
1092510927
return fplist
1092610928
else:

0 commit comments

Comments
 (0)