@@ -11588,7 +11588,7 @@ def CatFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipcheck
1158811588 return listarrayfiles
1158911589
1159011590
11591- def TarFileListFiles(infile, verbose=False, returnfp=False):
11591+ def TarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
1159211592 if(not isinstance(infile, (list, tuple, )) and infile == "-"):
1159311593 infile = MkTempFile()
1159411594 shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
@@ -11704,6 +11704,10 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
1170411704 return True
1170511705
1170611706
11707+ def TarFileListFile(infile, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
11708+ return TarFileListFiles(infile, formatspecs, verbose, returnfp)
11709+
11710+
1170711711def ZipFileListFiles(infile, verbose=False, returnfp=False):
1170811712 if(not isinstance(infile, (list, tuple, )) and infile == "-"):
1170911713 infile = MkTempFile()
@@ -11824,6 +11828,10 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
1182411828 return True
1182511829
1182611830
11831+ def ZipFileListFile(infile, verbose=False, returnfp=False):
11832+ return ZipFileListFiles(infile, verbose, returnfp)
11833+
11834+
1182711835if(not rarfile_support):
1182811836 def RarFileListFiles(infile, verbose=False, returnfp=False):
1182911837 return False
@@ -11951,6 +11959,11 @@ def RarFileListFiles(infile, verbose=False, returnfp=False):
1195111959 else:
1195211960 return True
1195311961
11962+
11963+ def RarFileListFile(infile, verbose=False, returnfp=False):
11964+ return RarFileListFiles(infile, verbose, returnfp)
11965+
11966+
1195411967if(not py7zr_support):
1195511968 def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
1195611969 return False
@@ -12055,12 +12068,16 @@ def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
1205512068 return True
1205612069
1205712070
12071+ def SevenZipFileListFile(infile, verbose=False, returnfp=False):
12072+ return SevenZipFileListFiles(infile, verbose, returnfp)
12073+
12074+
1205812075def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict__, seektoend=False, newstyle=False, returnfp=False):
1205912076 checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
1206012077 if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
1206112078 formatspecs = formatspecs[checkcompressfile]
1206212079 if(checkcompressfile == "tarfile" and TarFileCheck(infile)):
12063- return TarFileListFiles(infile, verbose, returnfp)
12080+ return TarFileListFiles(infile, formatspecs, verbose, returnfp)
1206412081 elif(checkcompressfile == "zipfile" and zipfile.is_zipfile(infile)):
1206512082 return ZipFileListFiles(infile, verbose, returnfp)
1206612083 elif(rarfile_support and checkcompressfile == "rarfile" and (rarfile.is_rarfile(infile) or rarfile.is_rarfile_sfx(infile))):
@@ -12074,6 +12091,10 @@ def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict_
1207412091 return False
1207512092
1207612093
12094+ def InFileListFile(infile, verbose=False, formatspecs=__file_format_multi_dict__, seektoend=False, newstyle=False, returnfp=False):
12095+ return InFileListFiles(infile, verbose, formatspecs, seektoend, newstyle, returnfp)
12096+
12097+
1207712098def ListDirListFiles(infiles, dirlistfromtxt=False, compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, seekstart=0, seekend=0, skipchecksum=False, checksumtype=["md5", "md5", "md5"], formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
1207812099 outarray = MkTempFile()
1207912100 packform = PackCatFile(infiles, outarray, dirlistfromtxt, compression, compresswholefile,
@@ -12082,6 +12103,11 @@ def ListDirListFiles(infiles, dirlistfromtxt=False, compression="auto", compress
1208212103 outarray, seekstart, seekend, skipchecksum, formatspecs, seektoend, verbose, returnfp)
1208312104 return listarrayfiles
1208412105
12106+
12107+ def ListDirListFiles(infiles, dirlistfromtxt=False, compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, seekstart=0, seekend=0, skipchecksum=False, checksumtype=["md5", "md5", "md5"], formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
12108+ return ListDirListFiles(infiles, dirlistfromtxt, compression, compresswholefile, compressionlevel, followlink, seekstart, seekend, skipchecksum, checksumtype, formatspecs, seektoend, verbose, returnfp)
12109+
12110+
1208512111def detect_cwd(ftp, file_dir):
1208612112 """
1208712113 Test whether cwd into file_dir works. Returns True if it does,
0 commit comments