@@ -8734,66 +8734,66 @@ def MultipleFoxFilesToArray(infile, fmttype="auto", filestart=0, seekstart=0, se
87348734 return MultipleFoxFileToArray (infile , fmttype , filestart , seekstart , seekend , listonly , contentasfile , uncompress , skipchecksum , formatspecs , saltkey , seektoend , returnfp )
87358735
87368736
8737- def TarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8737+ def TarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87388738 checkcompressfile = __file_format_default__
87398739 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
8740- formatspecs = formatspecs [checkcompressfile ]
8740+ ckformatspecs = formatspecs [checkcompressfile ]
87418741 fp = MkTempFile ()
8742- fp = PackFoxFileFromTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, formatspecs , None , False , True )
8742+ fp = PackFoxFileFromTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
87438743 listarrayfiles = FoxFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
87448744 return listarrayfiles
87458745
87468746
87478747if (not libarchive_support ):
8748- def BSDTarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8748+ def BSDTarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87498749 return False
87508750
87518751if (libarchive_support ):
8752- def BSDTarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8752+ def BSDTarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87538753 checkcompressfile = __file_format_default__
87548754 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
8755- formatspecs = formatspecs [checkcompressfile ]
8755+ ckformatspecs = formatspecs [checkcompressfile ]
87568756 fp = MkTempFile ()
8757- fp = PackFoxFileFromBSDTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, formatspecs , None , False , True )
8757+ fp = PackFoxFileFromBSDTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
87588758 listarrayfiles = FoxFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
87598759 return listarrayfiles
87608760
87618761
8762- def ZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8762+ def ZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87638763 checkcompressfile = __file_format_default__
87648764 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
8765- formatspecs = formatspecs [checkcompressfile ]
8765+ ckformatspecs = formatspecs [checkcompressfile ]
87668766 fp = MkTempFile ()
8767- fp = PackFoxFileFromZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, formatspecs , None , False , True )
8767+ fp = PackFoxFileFromZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
87688768 listarrayfiles = FoxFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
87698769 return listarrayfiles
87708770
87718771
87728772if (not rarfile_support ):
8773- def RarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8773+ def RarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87748774 return False
87758775
87768776if (rarfile_support ):
8777- def RarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8777+ def RarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87788778 checkcompressfile = __file_format_default__
87798779 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
8780- formatspecs = formatspecs [checkcompressfile ]
8780+ ckformatspecs = formatspecs [checkcompressfile ]
87818781 fp = MkTempFile ()
8782- fp = PackFoxFileFromRarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, formatspecs , None , False , True )
8782+ fp = PackFoxFileFromRarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
87838783 listarrayfiles = FoxFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
87848784 return listarrayfiles
87858785
87868786if (not py7zr_support ):
8787- def SevenZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8787+ def SevenZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87888788 return False
87898789
87908790if (py7zr_support ):
8791- def SevenZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8791+ def SevenZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87928792 checkcompressfile = __file_format_default__
87938793 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
8794- formatspecs = formatspecs [checkcompressfile ]
8794+ ckformatspecs = formatspecs [checkcompressfile ]
87958795 fp = MkTempFile ()
8796- fp = PackFoxFileFromSevenZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, formatspecs , None , False , True )
8796+ fp = PackFoxFileFromSevenZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
87978797 listarrayfiles = FoxFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
87988798 return listarrayfiles
87998799
0 commit comments