@@ -6855,7 +6855,9 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
68556855 inodetofile = {}
68566856 filetoinode = {}
68576857 inodetoforminode = {}
6858- if(not isinstance(infile, (list, tuple, )) and infile == "-"):
6858+ if(isinstance(infile, (list, tuple, ))):
6859+ infile = infile[0]
6860+ if(infile == "-"):
68596861 infile = MkTempFile()
68606862 shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
68616863 infile.seek(0, 0)
@@ -7081,7 +7083,9 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
70817083 inodetofile = {}
70827084 filetoinode = {}
70837085 inodetoforminode = {}
7084- if(not isinstance(infile, (list, tuple, )) and infile == "-"):
7086+ if(isinstance(infile, (list, tuple, ))):
7087+ infile = infile[0]
7088+ if(infile == "-"):
70857089 infile = MkTempFile()
70867090 shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
70877091 infile.seek(0, 0)
@@ -7330,6 +7334,8 @@ def AppendFilesWithContentFromRarFileToList(infile, extradata=[], jsondata={}, c
73307334 inodetofile = {}
73317335 filetoinode = {}
73327336 inodetoforminode = {}
7337+ if(isinstance(infile, (list, tuple, ))):
7338+ infile = infile[0]
73337339 if(not os.path.exists(infile) or not os.path.isfile(infile)):
73347340 return False
73357341 if(not rarfile.is_rarfile(infile) and not rarfile.is_rarfile_sfx(infile)):
@@ -7611,6 +7617,8 @@ def AppendFilesWithContentFromSevenZipFileToList(infile, extradata=[], jsondata=
76117617 inodetofile = {}
76127618 filetoinode = {}
76137619 inodetoforminode = {}
7620+ if(isinstance(infile, (list, tuple, ))):
7621+ infile = infile[0]
76147622 if(not os.path.exists(infile) or not os.path.isfile(infile)):
76157623 return False
76167624 szpfp = py7zr.SevenZipFile(infile, mode="r")
@@ -10240,7 +10248,7 @@ def NeoFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
1024010248 if(not fp):
1024110249 return False
1024210250 fp.seek(filestart, 0)
10243- elif(not isinstance(infile, (list, tuple, )) and infile == "-"):
10251+ elif(infile == "-"):
1024410252 fp = MkTempFile()
1024510253 shutil.copyfileobj(PY_STDIN_BUF, fp, length=__filebuff_size__)
1024610254 fp.seek(filestart, 0)
@@ -11619,7 +11627,9 @@ def NeoFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipcheck
1161911627
1162011628
1162111629def TarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
11622- if(not isinstance(infile, (list, tuple, )) and infile == "-"):
11630+ if(isinstance(infile, (list, tuple, ))):
11631+ infile = infile[0]
11632+ if(infile == "-"):
1162311633 infile = MkTempFile()
1162411634 shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
1162511635 infile.seek(0, 0)
@@ -11739,7 +11749,9 @@ def TarFileListFile(infile, formatspecs=__file_format_multi_dict__, verbose=Fals
1173911749
1174011750
1174111751def ZipFileListFiles(infile, verbose=False, returnfp=False):
11742- if(not isinstance(infile, (list, tuple, )) and infile == "-"):
11752+ if(isinstance(infile, (list, tuple, ))):
11753+ infile = infile[0]
11754+ if(infile == "-"):
1174311755 infile = MkTempFile()
1174411756 shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
1174511757 infile.seek(0, 0)
@@ -11896,9 +11908,10 @@ def ZipFileListFile(infile, verbose=False, returnfp=False):
1189611908if(not rarfile_support):
1189711909 def RarFileListFiles(infile, verbose=False, returnfp=False):
1189811910 return False
11899-
11900- if(rarfile_support):
11911+ else:
1190111912 def RarFileListFiles(infile, verbose=False, returnfp=False):
11913+ if(isinstance(infile, (list, tuple, ))):
11914+ infile = infile[0]
1190211915 if(not os.path.exists(infile) or not os.path.isfile(infile)):
1190311916 return False
1190411917 if(not rarfile.is_rarfile(infile) and not rarfile.is_rarfile_sfx(infile)):
@@ -12028,9 +12041,10 @@ def RarFileListFile(infile, verbose=False, returnfp=False):
1202812041if(not py7zr_support):
1202912042 def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
1203012043 return False
12031-
12032- if(py7zr_support):
12044+ else:
1203312045 def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
12046+ if(isinstance(infile, (list, tuple, ))):
12047+ infile = infile[0]
1203412048 if(not os.path.exists(infile) or not os.path.isfile(infile)):
1203512049 return False
1203612050 lcfi = 0
0 commit comments