@@ -11582,7 +11582,7 @@ def ArchiveFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipc
1158211582 return listarrayfiles
1158311583
1158411584
11585- def TarFileListFiles(infile, verbose=False, returnfp=False):
11585+ def TarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
1158611586 if(not isinstance(infile, (list, tuple, )) and infile == "-"):
1158711587 infile = MkTempFile()
1158811588 shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
@@ -11698,6 +11698,10 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
1169811698 return True
1169911699
1170011700
11701+ def TarFileListFile(infile, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
11702+ return TarFileListFiles(infile, formatspecs, verbose, returnfp)
11703+
11704+
1170111705def ZipFileListFiles(infile, verbose=False, returnfp=False):
1170211706 if(not isinstance(infile, (list, tuple, )) and infile == "-"):
1170311707 infile = MkTempFile()
@@ -11818,6 +11822,10 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
1181811822 return True
1181911823
1182011824
11825+ def ZipFileListFile(infile, verbose=False, returnfp=False):
11826+ return ZipFileListFiles(infile, verbose, returnfp)
11827+
11828+
1182111829if(not rarfile_support):
1182211830 def RarFileListFiles(infile, verbose=False, returnfp=False):
1182311831 return False
@@ -11945,6 +11953,11 @@ def RarFileListFiles(infile, verbose=False, returnfp=False):
1194511953 else:
1194611954 return True
1194711955
11956+
11957+ def RarFileListFile(infile, verbose=False, returnfp=False):
11958+ return RarFileListFiles(infile, verbose, returnfp)
11959+
11960+
1194811961if(not py7zr_support):
1194911962 def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
1195011963 return False
@@ -12049,12 +12062,16 @@ def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
1204912062 return True
1205012063
1205112064
12065+ def SevenZipFileListFile(infile, verbose=False, returnfp=False):
12066+ return SevenZipFileListFiles(infile, verbose, returnfp)
12067+
12068+
1205212069def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict__, seektoend=False, newstyle=False, returnfp=False):
1205312070 checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
1205412071 if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
1205512072 formatspecs = formatspecs[checkcompressfile]
1205612073 if(checkcompressfile == "tarfile" and TarFileCheck(infile)):
12057- return TarFileListFiles(infile, verbose, returnfp)
12074+ return TarFileListFiles(infile, formatspecs, verbose, returnfp)
1205812075 elif(checkcompressfile == "zipfile" and zipfile.is_zipfile(infile)):
1205912076 return ZipFileListFiles(infile, verbose, returnfp)
1206012077 elif(rarfile_support and checkcompressfile == "rarfile" and (rarfile.is_rarfile(infile) or rarfile.is_rarfile_sfx(infile))):
@@ -12068,6 +12085,10 @@ def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict_
1206812085 return False
1206912086
1207012087
12088+ def InFileListFile(infile, verbose=False, formatspecs=__file_format_multi_dict__, seektoend=False, newstyle=False, returnfp=False):
12089+ return InFileListFiles(infile, verbose, formatspecs, seektoend, newstyle, returnfp)
12090+
12091+
1207112092def 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):
1207212093 outarray = MkTempFile()
1207312094 packform = PackArchiveFile(infiles, outarray, dirlistfromtxt, compression, compresswholefile,
@@ -12076,6 +12097,11 @@ def ListDirListFiles(infiles, dirlistfromtxt=False, compression="auto", compress
1207612097 outarray, seekstart, seekend, skipchecksum, formatspecs, seektoend, verbose, returnfp)
1207712098 return listarrayfiles
1207812099
12100+
12101+ 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):
12102+ return ListDirListFiles(infiles, dirlistfromtxt, compression, compresswholefile, compressionlevel, followlink, seekstart, seekend, skipchecksum, checksumtype, formatspecs, seektoend, verbose, returnfp)
12103+
12104+
1207912105def detect_cwd(ftp, file_dir):
1208012106 """
1208112107 Test whether cwd into file_dir works. Returns True if it does,
0 commit comments