Skip to content

Commit e1d14dc

Browse files
committed
Small update
1 parent 2492276 commit e1d14dc

1 file changed

Lines changed: 12 additions & 13 deletions

File tree

pyfoxfile/pyfoxfile.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8735,37 +8735,36 @@ def MultipleFoxFilesToArray(infile, fmttype="auto", filestart=0, seekstart=0, se
87358735

87368736

87378737
def TarFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8738-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
8738+
checkcompressfile = __file_format_default__
87398739
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
87408740
formatspecs = formatspecs[checkcompressfile]
87418741
fp = MkTempFile()
8742-
fp = PackFoxFileFromTarFile(infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, None, False, True)
8742+
fp = PackFoxFileFromTarFile(infile, fp, "auto", "auto", True, None, compressionlistalt, ["md5", "md5", "md5", "md5", "md5"], [], {}, formatspecs, None, False, True)
87438743
listarrayfiles = FoxFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
87448744
return listarrayfiles
87458745

87468746

87478747
if(not libarchive_support):
87488748
def BSDTarFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8749-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True):
87508749
return False
87518750

87528751
if(libarchive_support):
87538752
def BSDTarFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8754-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True):
8753+
checkcompressfile = __file_format_default__
87558754
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
87568755
formatspecs = formatspecs[checkcompressfile]
87578756
fp = MkTempFile()
8758-
fp = PackArchiveFileFromBSDTarFile(infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, None, False, True)
8759-
listarrayfiles = ArchiveFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
8757+
fp = PackFoxFileFromBSDTarFile(infile, fp, "auto", "auto", True, None, compressionlistalt, ["md5", "md5", "md5", "md5", "md5"], [], {}, formatspecs, None, False, True)
8758+
listarrayfiles = FoxFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
87608759
return listarrayfiles
87618760

87628761

87638762
def ZipFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8764-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
8763+
checkcompressfile = __file_format_default__
87658764
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
87668765
formatspecs = formatspecs[checkcompressfile]
87678766
fp = MkTempFile()
8768-
fp = PackFoxFileFromZipFile(infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, None, False, True)
8767+
fp = PackFoxFileFromZipFile(infile, fp, "auto", "auto", True, None, compressionlistalt, ["md5", "md5", "md5", "md5", "md5"], [], {}, formatspecs, None, False, True)
87698768
listarrayfiles = FoxFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
87708769
return listarrayfiles
87718770

@@ -8776,11 +8775,11 @@ def RarFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile
87768775

87778776
if(rarfile_support):
87788777
def RarFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8779-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
8778+
checkcompressfile = __file_format_default__
87808779
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
87818780
formatspecs = formatspecs[checkcompressfile]
87828781
fp = MkTempFile()
8783-
fp = PackFoxFileFromRarFile(infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, None, False, True)
8782+
fp = PackFoxFileFromRarFile(infile, fp, "auto", "auto", True, None, compressionlistalt, ["md5", "md5", "md5", "md5", "md5"], [], {}, formatspecs, None, False, True)
87848783
listarrayfiles = FoxFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
87858784
return listarrayfiles
87868785

@@ -8790,11 +8789,11 @@ def SevenZipFileToArray(infile, seekstart=0, seekend=0, listonly=False, contenta
87908789

87918790
if(py7zr_support):
87928791
def SevenZipFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8793-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
8792+
checkcompressfile = __file_format_default__
87948793
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
87958794
formatspecs = formatspecs[checkcompressfile]
87968795
fp = MkTempFile()
8797-
fp = PackFoxFileFromSevenZipFile(infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, None, False, True)
8796+
fp = PackFoxFileFromSevenZipFile(infile, fp, "auto", "auto", True, None, compressionlistalt, ["md5", "md5", "md5", "md5", "md5"], [], {}, formatspecs, None, False, True)
87988797
listarrayfiles = FoxFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
87998798
return listarrayfiles
88008799

@@ -9643,7 +9642,7 @@ def FoxFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0
96439642
else:
96449643
if(infile != "-" and not hasattr(infile, "read") and not hasattr(infile, "write") and not isinstance(infile, bytes)):
96459644
infile = RemoveWindowsPath(infile)
9646-
listarrayfileslist = ArchiveFileToArray(infile, fmttype, filestart, seekstart, seekend, True, False, False, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
9645+
listarrayfileslist = FoxFileToArray(infile, fmttype, filestart, seekstart, seekend, True, False, False, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
96479646
if(not listarrayfileslist):
96489647
return False
96499648
for listarrayfiles in listarrayfileslist:

0 commit comments

Comments
 (0)