Skip to content

Commit 4f9312e

Browse files
committed
Small update
1 parent 801ed6e commit 4f9312e

1 file changed

Lines changed: 10 additions & 11 deletions

File tree

pyarchivefile/pyarchivefile.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8730,37 +8730,36 @@ def MultipleArchiveFilesToArray(infile, fmttype="auto", filestart=0, seekstart=0
87308730

87318731

87328732
def TarFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8733-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
8733+
checkcompressfile = __file_format_default__
87348734
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
87358735
formatspecs = formatspecs[checkcompressfile]
87368736
fp = MkTempFile()
8737-
fp = PackArchiveFileFromTarFile(infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, None, False, True)
8737+
fp = PackArchiveFileFromTarFile(infile, fp, "auto", "auto", True, None, compressionlistalt, ["md5", "md5", "md5", "md5", "md5"], [], {}, formatspecs, None, False, True)
87388738
listarrayfiles = ArchiveFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
87398739
return listarrayfiles
87408740

87418741

87428742
if(not libarchive_support):
87438743
def BSDTarFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8744-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True):
87458744
return False
87468745

87478746
if(libarchive_support):
87488747
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):
8748+
checkcompressfile = __file_format_default__
87508749
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
87518750
formatspecs = formatspecs[checkcompressfile]
87528751
fp = MkTempFile()
8753-
fp = PackArchiveFileFromBSDTarFile(infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, None, False, True)
8752+
fp = PackArchiveFileFromBSDTarFile(infile, fp, "auto", "auto", True, None, compressionlistalt, ["md5", "md5", "md5", "md5", "md5"], [], {}, formatspecs, None, False, True)
87548753
listarrayfiles = ArchiveFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
87558754
return listarrayfiles
87568755

87578756

87588757
def ZipFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8759-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
8758+
checkcompressfile = __file_format_default__
87608759
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
87618760
formatspecs = formatspecs[checkcompressfile]
87628761
fp = MkTempFile()
8763-
fp = PackArchiveFileFromZipFile(infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, None, False, True)
8762+
fp = PackArchiveFileFromZipFile(infile, fp, "auto", "auto", True, None, compressionlistalt, ["md5", "md5", "md5", "md5", "md5"], [], {}, formatspecs, None, False, True)
87648763
listarrayfiles = ArchiveFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
87658764
return listarrayfiles
87668765

@@ -8771,11 +8770,11 @@ def RarFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile
87718770

87728771
if(rarfile_support):
87738772
def RarFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8774-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
8773+
checkcompressfile = __file_format_default__
87758774
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
87768775
formatspecs = formatspecs[checkcompressfile]
87778776
fp = MkTempFile()
8778-
fp = PackArchiveFileFromRarFile(infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, None, False, True)
8777+
fp = PackArchiveFileFromRarFile(infile, fp, "auto", "auto", True, None, compressionlistalt, ["md5", "md5", "md5", "md5", "md5"], [], {}, formatspecs, None, False, True)
87798778
listarrayfiles = ArchiveFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
87808779
return listarrayfiles
87818780

@@ -8785,11 +8784,11 @@ def SevenZipFileToArray(infile, seekstart=0, seekend=0, listonly=False, contenta
87858784

87868785
if(py7zr_support):
87878786
def SevenZipFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_dict__, seektoend=False, returnfp=False):
8788-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
8787+
checkcompressfile = __file_format_default__
87898788
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
87908789
formatspecs = formatspecs[checkcompressfile]
87918790
fp = MkTempFile()
8792-
fp = PackArchiveFileFromSevenZipFile(infile, fp, "auto", True, None, compressionlistalt, "md5", [], formatspecs, None, False, True)
8791+
fp = PackArchiveFileFromSevenZipFile(infile, fp, "auto", "auto", True, None, compressionlistalt, ["md5", "md5", "md5", "md5", "md5"], [], {}, formatspecs, None, False, True)
87938792
listarrayfiles = ArchiveFileToArray(fp, "auto", 0, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, None, seektoend, returnfp)
87948793
return listarrayfiles
87958794

0 commit comments

Comments
 (0)