@@ -9071,8 +9071,8 @@ def TarFileToArray(infile, fmttype=__file_format_default__, seekstart=0, seekend
90719071 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
90729072 ckformatspecs = formatspecs [checkcompressfile ]
90739073 fp = MkTempFile ()
9074- fp = PackArchiveFileFromTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9075- listarrayfiles = ArchiveFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
9074+ fp = PackFoxFileFromTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9075+ listarrayfiles = FoxFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
90769076 return listarrayfiles
90779077
90789078
@@ -9085,8 +9085,8 @@ def BSDTarFileToArray(infile, fmttype=__file_format_default__, seekstart=0, seek
90859085 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
90869086 ckformatspecs = formatspecs [checkcompressfile ]
90879087 fp = MkTempFile ()
9088- fp = PackArchiveFileFromBSDTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9089- listarrayfiles = ArchiveFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
9088+ fp = PackFoxFileFromBSDTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9089+ listarrayfiles = FoxFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
90909090 return listarrayfiles
90919091
90929092
@@ -9095,8 +9095,8 @@ def ZipFileToArray(infile, fmttype=__file_format_default__, seekstart=0, seekend
90959095 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
90969096 ckformatspecs = formatspecs [checkcompressfile ]
90979097 fp = MkTempFile ()
9098- fp = PackArchiveFileFromZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9099- listarrayfiles = ArchiveFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
9098+ fp = PackFoxFileFromZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9099+ listarrayfiles = FoxFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
91009100 return listarrayfiles
91019101
91029102
@@ -9109,8 +9109,8 @@ def RarFileToArray(infile, fmttype=__file_format_default__, seekstart=0, seekend
91099109 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
91109110 ckformatspecs = formatspecs [checkcompressfile ]
91119111 fp = MkTempFile ()
9112- fp = PackArchiveFileFromRarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9113- listarrayfiles = ArchiveFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
9112+ fp = PackFoxFileFromRarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9113+ listarrayfiles = FoxFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
91149114 return listarrayfiles
91159115
91169116if (not py7zr_support ):
@@ -9122,45 +9122,45 @@ def SevenZipFileToArray(infile, fmttype=__file_format_default__, seekstart=0, se
91229122 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
91239123 ckformatspecs = formatspecs [checkcompressfile ]
91249124 fp = MkTempFile ()
9125- fp = PackArchiveFileFromSevenZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9126- listarrayfiles = ArchiveFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
9125+ fp = PackFoxFileFromSevenZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9126+ listarrayfiles = FoxFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
91279127 return listarrayfiles
91289128
9129- def PackArchiveFileFromTarFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
9129+ def PackFoxFileFromTarFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
91309130 inarrayfile = TarFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9131- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9131+ return RePackFoxFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91329132
91339133if (not libarchive_support ):
9134- def PackArchiveFileFromBSDTarFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
9134+ def PackFoxFileFromBSDTarFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
91359135 return False
91369136else :
9137- def PackArchiveFileFromBSDTarFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
9137+ def PackFoxFileFromBSDTarFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
91389138 inarrayfile = BSDTarFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9139- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9139+ return RePackFoxFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91409140
9141- def PackArchiveFileFromZipFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
9141+ def PackFoxFileFromZipFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
91429142 inarrayfile = ZipFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9143- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9143+ return RePackFoxFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91449144
91459145if (not rarfile_support ):
9146- def PackArchiveFileFromRarFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
9146+ def PackFoxFileFromRarFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
91479147 return False
91489148else :
9149- def PackArchiveFileFromRarFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
9149+ def PackFoxFileFromRarFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
91509150 inarrayfile = RarFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9151- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9151+ return RePackFoxFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91529152
91539153if (not py7zr_support ):
9154- def PackArchiveFileFromSevenZipFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
9154+ def PackFoxFileFromSevenZipFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
91559155 return False
91569156else :
9157- def PackArchiveFileFromSevenZipFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
9157+ def PackFoxFileFromSevenZipFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
91589158 inarrayfile = SevenZipFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9159- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9159+ return RePackFoxFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91609160
9161- def PackArchiveFileFromInFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
9161+ def PackFoxFileFromInFileAlt (infile , outfile , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , saltkey = None , verbose = False , returnfp = False ):
91629162 inarrayfile = InFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9163- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9163+ return RePackFoxFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91649164
91659165def InFileToArray (infile , fmttype = __file_format_default__ , filestart = 0 , seekstart = 0 , seekend = 0 , listonly = False , contentasfile = True , skipchecksum = False , formatspecs = __file_format_multi_dict__ , saltkey = None , seektoend = False , returnfp = False ):
91669166 checkcompressfile = CheckCompressionSubType (infile , formatspecs , filestart , True )
@@ -9185,13 +9185,13 @@ def InFileToArray(infile, fmttype=__file_format_default__, filestart=0, seekstar
91859185
91869186def ListDirToArray (infiles , dirlistfromtxt = False , fmttype = __file_format_default__ , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , followlink = False , filestart = 0 , seekstart = 0 , seekend = 0 , listonly = False , saltkey = None , skipchecksum = False , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_dict__ , verbose = False , seektoend = False , returnfp = False ):
91879187 outarray = MkTempFile ()
9188- packform = PackArchiveFile (infiles , outarray , dirlistfromtxt , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , followlink , checksumtype , extradata , jsondata , formatspecs , saltkey , verbose , True )
9189- listarrayfiles = ArchiveFileToArray (outarray , "auto" , filestart , seekstart , seekend , listonly , True , True , skipchecksum , formatspecs , saltkey , seektoend , returnfp )
9188+ packform = PackFoxFile (infiles , outarray , dirlistfromtxt , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , followlink , checksumtype , extradata , jsondata , formatspecs , saltkey , verbose , True )
9189+ listarrayfiles = FoxFileToArray (outarray , "auto" , filestart , seekstart , seekend , listonly , True , True , skipchecksum , formatspecs , saltkey , seektoend , returnfp )
91909190 return listarrayfiles
91919191
91929192def PackFoxFromDirListAlt (infiles , outfile , dirlistfromtxt = False , fmttype = "auto" , compression = "auto" , compresswholefile = True , compressionlevel = None , compressionuselist = compressionlistalt , followlink = False , checksumtype = ["md5" , "md5" , "md5" , "md5" , "md5" ], extradata = [], jsondata = {}, formatspecs = __file_format_multi_dict__ , saltkey = None , verbose = False , returnfp = False ):
91939193 inarrayfile = ListDirToArray (infiles , dirlistfromtxt , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , followlink , 0 , 0 , 0 , False , None , False , checksumtype , extradata , jsondata , formatspecs , False , False , False )
9194- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9194+ return RePackFoxFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91959195
91969196# ===== Function (keeps inarray schema; returns entries + indexes) =====
91979197
@@ -10023,7 +10023,7 @@ def FoxFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0
1002310023 else :
1002410024 if (infile != "-" and not hasattr (infile , "read" ) and not hasattr (infile , "write" ) and not isinstance (infile , bytes )):
1002510025 infile = RemoveWindowsPath (infile )
10026- listarrayfileslist = ArchiveFileToArray (infile , fmttype , filestart , seekstart , seekend , True , False , False , skipchecksum , formatspecs , saltkey , seektoend , returnfp )
10026+ listarrayfileslist = FoxFileToArray (infile , fmttype , filestart , seekstart , seekend , True , False , False , skipchecksum , formatspecs , saltkey , seektoend , returnfp )
1002710027 if (not listarrayfileslist ):
1002810028 return False
1002910029 for listarrayfiles in listarrayfileslist :
0 commit comments