@@ -8728,66 +8728,66 @@ def MultipleNeoFilesToArray(infile, fmttype="auto", filestart=0, seekstart=0, se
87288728 return MultipleNeoFileToArray (infile , fmttype , filestart , seekstart , seekend , listonly , contentasfile , uncompress , skipchecksum , formatspecs , saltkey , seektoend , returnfp )
87298729
87308730
8731- def TarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8731+ def TarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87328732 checkcompressfile = __file_format_default__
87338733 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
8734- formatspecs = formatspecs [checkcompressfile ]
8734+ ckformatspecs = formatspecs [checkcompressfile ]
87358735 fp = MkTempFile ()
8736- fp = PackNeoFileFromTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, formatspecs , None , False , True )
8736+ fp = PackNeoFileFromTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
87378737 listarrayfiles = NeoFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
87388738 return listarrayfiles
87398739
87408740
87418741if (not libarchive_support ):
8742- def BSDTarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8742+ def BSDTarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87438743 return False
87448744
87458745if (libarchive_support ):
8746- def BSDTarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8746+ def BSDTarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87478747 checkcompressfile = __file_format_default__
87488748 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
8749- formatspecs = formatspecs [checkcompressfile ]
8749+ ckformatspecs = formatspecs [checkcompressfile ]
87508750 fp = MkTempFile ()
8751- fp = PackNeoFileFromBSDTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, formatspecs , None , False , True )
8751+ fp = PackNeoFileFromBSDTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
87528752 listarrayfiles = NeoFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
87538753 return listarrayfiles
87548754
87558755
8756- def ZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8756+ def ZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87578757 checkcompressfile = __file_format_default__
87588758 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
8759- formatspecs = formatspecs [checkcompressfile ]
8759+ ckformatspecs = formatspecs [checkcompressfile ]
87608760 fp = MkTempFile ()
8761- fp = PackNeoFileFromZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, formatspecs , None , False , True )
8761+ fp = PackNeoFileFromZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
87628762 listarrayfiles = NeoFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
87638763 return listarrayfiles
87648764
87658765
87668766if (not rarfile_support ):
8767- def RarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8767+ def RarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87688768 return False
87698769
87708770if (rarfile_support ):
8771- def RarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8771+ def RarFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87728772 checkcompressfile = __file_format_default__
87738773 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
8774- formatspecs = formatspecs [checkcompressfile ]
8774+ ckformatspecs = formatspecs [checkcompressfile ]
87758775 fp = MkTempFile ()
8776- fp = PackNeoFileFromRarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, formatspecs , None , False , True )
8776+ fp = PackNeoFileFromRarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
87778777 listarrayfiles = NeoFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
87788778 return listarrayfiles
87798779
87808780if (not py7zr_support ):
8781- def SevenZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8781+ def SevenZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87828782 return False
87838783
87848784if (py7zr_support ):
8785- def SevenZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_dict__ , seektoend = False , returnfp = False ):
8785+ def SevenZipFileToArray (infile , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , seektoend = False , returnfp = False ):
87868786 checkcompressfile = __file_format_default__
87878787 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
8788- formatspecs = formatspecs [checkcompressfile ]
8788+ ckformatspecs = formatspecs [checkcompressfile ]
87898789 fp = MkTempFile ()
8790- fp = PackNeoFileFromSevenZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, formatspecs , None , False , True )
8790+ fp = PackNeoFileFromSevenZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
87918791 listarrayfiles = NeoFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
87928792 return listarrayfiles
87938793
0 commit comments