@@ -6861,7 +6861,9 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
68616861 inodetofile = {}
68626862 filetoinode = {}
68636863 inodetoforminode = {}
6864- if(not isinstance(infile, (list, tuple, )) and infile == "-"):
6864+ if(isinstance(infile, (list, tuple, ))):
6865+ infile = infile[0]
6866+ if(infile == "-"):
68656867 infile = MkTempFile()
68666868 shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
68676869 infile.seek(0, 0)
@@ -7087,7 +7089,9 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
70877089 inodetofile = {}
70887090 filetoinode = {}
70897091 inodetoforminode = {}
7090- if(not isinstance(infile, (list, tuple, )) and infile == "-"):
7092+ if(isinstance(infile, (list, tuple, ))):
7093+ infile = infile[0]
7094+ if(infile == "-"):
70917095 infile = MkTempFile()
70927096 shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
70937097 infile.seek(0, 0)
@@ -7336,6 +7340,8 @@ def AppendFilesWithContentFromRarFileToList(infile, extradata=[], jsondata={}, c
73367340 inodetofile = {}
73377341 filetoinode = {}
73387342 inodetoforminode = {}
7343+ if(isinstance(infile, (list, tuple, ))):
7344+ infile = infile[0]
73397345 if(not os.path.exists(infile) or not os.path.isfile(infile)):
73407346 return False
73417347 if(not rarfile.is_rarfile(infile) and not rarfile.is_rarfile_sfx(infile)):
@@ -7617,6 +7623,8 @@ def AppendFilesWithContentFromSevenZipFileToList(infile, extradata=[], jsondata=
76177623 inodetofile = {}
76187624 filetoinode = {}
76197625 inodetoforminode = {}
7626+ if(isinstance(infile, (list, tuple, ))):
7627+ infile = infile[0]
76207628 if(not os.path.exists(infile) or not os.path.isfile(infile)):
76217629 return False
76227630 szpfp = py7zr.SevenZipFile(infile, mode="r")
@@ -10246,7 +10254,7 @@ def CatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
1024610254 if(not fp):
1024710255 return False
1024810256 fp.seek(filestart, 0)
10249- elif(not isinstance(infile, (list, tuple, )) and infile == "-"):
10257+ elif(infile == "-"):
1025010258 fp = MkTempFile()
1025110259 shutil.copyfileobj(PY_STDIN_BUF, fp, length=__filebuff_size__)
1025210260 fp.seek(filestart, 0)
@@ -11625,7 +11633,9 @@ def CatFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipcheck
1162511633
1162611634
1162711635def TarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
11628- if(not isinstance(infile, (list, tuple, )) and infile == "-"):
11636+ if(isinstance(infile, (list, tuple, ))):
11637+ infile = infile[0]
11638+ if(infile == "-"):
1162911639 infile = MkTempFile()
1163011640 shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
1163111641 infile.seek(0, 0)
@@ -11745,7 +11755,9 @@ def TarFileListFile(infile, formatspecs=__file_format_multi_dict__, verbose=Fals
1174511755
1174611756
1174711757def ZipFileListFiles(infile, verbose=False, returnfp=False):
11748- if(not isinstance(infile, (list, tuple, )) and infile == "-"):
11758+ if(isinstance(infile, (list, tuple, ))):
11759+ infile = infile[0]
11760+ if(infile == "-"):
1174911761 infile = MkTempFile()
1175011762 shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
1175111763 infile.seek(0, 0)
@@ -11902,9 +11914,10 @@ def ZipFileListFile(infile, verbose=False, returnfp=False):
1190211914if(not rarfile_support):
1190311915 def RarFileListFiles(infile, verbose=False, returnfp=False):
1190411916 return False
11905-
11906- if(rarfile_support):
11917+ else:
1190711918 def RarFileListFiles(infile, verbose=False, returnfp=False):
11919+ if(isinstance(infile, (list, tuple, ))):
11920+ infile = infile[0]
1190811921 if(not os.path.exists(infile) or not os.path.isfile(infile)):
1190911922 return False
1191011923 if(not rarfile.is_rarfile(infile) and not rarfile.is_rarfile_sfx(infile)):
@@ -12034,9 +12047,10 @@ def RarFileListFile(infile, verbose=False, returnfp=False):
1203412047if(not py7zr_support):
1203512048 def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
1203612049 return False
12037-
12038- if(py7zr_support):
12050+ else:
1203912051 def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
12052+ if(isinstance(infile, (list, tuple, ))):
12053+ infile = infile[0]
1204012054 if(not os.path.exists(infile) or not os.path.isfile(infile)):
1204112055 return False
1204212056 lcfi = 0
0 commit comments