@@ -9064,8 +9064,8 @@ def TarFileToArray(infile, fmttype=__file_format_default__, seekstart=0, seekend
90649064 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
90659065 ckformatspecs = formatspecs [checkcompressfile ]
90669066 fp = MkTempFile ()
9067- fp = PackArchiveFileFromTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9068- listarrayfiles = ArchiveFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
9067+ fp = PackNeoFileFromTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9068+ listarrayfiles = NeoFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
90699069 return listarrayfiles
90709070
90719071
@@ -9078,8 +9078,8 @@ def BSDTarFileToArray(infile, fmttype=__file_format_default__, seekstart=0, seek
90789078 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
90799079 ckformatspecs = formatspecs [checkcompressfile ]
90809080 fp = MkTempFile ()
9081- fp = PackArchiveFileFromBSDTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9082- listarrayfiles = ArchiveFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
9081+ fp = PackNeoFileFromBSDTarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9082+ listarrayfiles = NeoFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
90839083 return listarrayfiles
90849084
90859085
@@ -9088,8 +9088,8 @@ def ZipFileToArray(infile, fmttype=__file_format_default__, seekstart=0, seekend
90889088 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
90899089 ckformatspecs = formatspecs [checkcompressfile ]
90909090 fp = MkTempFile ()
9091- fp = PackArchiveFileFromZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9092- listarrayfiles = ArchiveFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
9091+ fp = PackNeoFileFromZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9092+ listarrayfiles = NeoFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
90939093 return listarrayfiles
90949094
90959095
@@ -9102,8 +9102,8 @@ def RarFileToArray(infile, fmttype=__file_format_default__, seekstart=0, seekend
91029102 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
91039103 ckformatspecs = formatspecs [checkcompressfile ]
91049104 fp = MkTempFile ()
9105- fp = PackArchiveFileFromRarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9106- listarrayfiles = ArchiveFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
9105+ fp = PackNeoFileFromRarFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9106+ listarrayfiles = NeoFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
91079107 return listarrayfiles
91089108
91099109if (not py7zr_support ):
@@ -9115,45 +9115,45 @@ def SevenZipFileToArray(infile, fmttype=__file_format_default__, seekstart=0, se
91159115 if (IsNestedDict (formatspecs ) and checkcompressfile in formatspecs ):
91169116 ckformatspecs = formatspecs [checkcompressfile ]
91179117 fp = MkTempFile ()
9118- fp = PackArchiveFileFromSevenZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9119- listarrayfiles = ArchiveFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
9118+ fp = PackNeoFileFromSevenZipFile (infile , fp , "auto" , "auto" , True , None , compressionlistalt , ["md5" , "md5" , "md5" , "md5" , "md5" ], [], {}, ckformatspecs , None , False , True )
9119+ listarrayfiles = NeoFileToArray (fp , "auto" , 0 , seekstart , seekend , listonly , contentasfile , True , skipchecksum , formatspecs , None , seektoend , returnfp )
91209120 return listarrayfiles
91219121
9122- 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 ):
9122+ def PackNeoFileFromTarFileAlt (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 ):
91239123 inarrayfile = TarFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9124- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9124+ return RePackNeoFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91259125
91269126if (not libarchive_support ):
9127- 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 ):
9127+ def PackNeoFileFromBSDTarFileAlt (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 ):
91289128 return False
91299129else :
9130- 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 ):
9130+ def PackNeoFileFromBSDTarFileAlt (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 ):
91319131 inarrayfile = BSDTarFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9132- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9132+ return RePackNeoFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91339133
9134- 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 ):
9134+ def PackNeoFileFromZipFileAlt (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 inarrayfile = ZipFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9136- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9136+ return RePackNeoFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91379137
91389138if (not rarfile_support ):
9139- 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 ):
9139+ def PackNeoFileFromRarFileAlt (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 ):
91409140 return False
91419141else :
9142- 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 ):
9142+ def PackNeoFileFromRarFileAlt (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 ):
91439143 inarrayfile = RarFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9144- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9144+ return RePackNeoFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91459145
91469146if (not py7zr_support ):
9147- 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 ):
9147+ def PackNeoFileFromSevenZipFileAlt (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 ):
91489148 return False
91499149else :
9150- 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 ):
9150+ def PackNeoFileFromSevenZipFileAlt (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 ):
91519151 inarrayfile = SevenZipFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9152- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9152+ return RePackNeoFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91539153
9154- 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 ):
9154+ def PackNeoFileFromInFileAlt (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 ):
91559155 inarrayfile = InFileToArray (infile , fmttype , 0 , 0 , False , True , False , formatspecs , False , False )
9156- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9156+ return RePackNeoFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91579157
91589158def 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 ):
91599159 checkcompressfile = CheckCompressionSubType (infile , formatspecs , filestart , True )
@@ -9178,13 +9178,13 @@ def InFileToArray(infile, fmttype=__file_format_default__, filestart=0, seekstar
91789178
91799179def 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 ):
91809180 outarray = MkTempFile ()
9181- packform = PackArchiveFile (infiles , outarray , dirlistfromtxt , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , followlink , checksumtype , extradata , jsondata , formatspecs , saltkey , verbose , True )
9182- listarrayfiles = ArchiveFileToArray (outarray , "auto" , filestart , seekstart , seekend , listonly , True , True , skipchecksum , formatspecs , saltkey , seektoend , returnfp )
9181+ packform = PackNeoFile (infiles , outarray , dirlistfromtxt , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , followlink , checksumtype , extradata , jsondata , formatspecs , saltkey , verbose , True )
9182+ listarrayfiles = NeoFileToArray (outarray , "auto" , filestart , seekstart , seekend , listonly , True , True , skipchecksum , formatspecs , saltkey , seektoend , returnfp )
91839183 return listarrayfiles
91849184
91859185def PackNeoFromDirListAlt (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 ):
91869186 inarrayfile = ListDirToArray (infiles , dirlistfromtxt , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , followlink , 0 , 0 , 0 , False , None , False , checksumtype , extradata , jsondata , formatspecs , False , False , False )
9187- return RePackArchiveFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
9187+ return RePackNeoFile (inarrayfile , outfile , fmttype , compression , compresswholefile , compressionlevel , compressionuselist , False , 0 , 0 , 0 , checksumtype , False , extradata , jsondata , formatspecs , None , saltkey , False , verbose , returnfp )
91889188
91899189# ===== Function (keeps inarray schema; returns entries + indexes) =====
91909190
@@ -10016,7 +10016,7 @@ def NeoFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0
1001610016 else :
1001710017 if (infile != "-" and not hasattr (infile , "read" ) and not hasattr (infile , "write" ) and not isinstance (infile , bytes )):
1001810018 infile = RemoveWindowsPath (infile )
10019- listarrayfileslist = ArchiveFileToArray (infile , fmttype , filestart , seekstart , seekend , True , False , False , skipchecksum , formatspecs , saltkey , seektoend , returnfp )
10019+ listarrayfileslist = NeoFileToArray (infile , fmttype , filestart , seekstart , seekend , True , False , False , skipchecksum , formatspecs , saltkey , seektoend , returnfp )
1002010020 if (not listarrayfileslist ):
1002110021 return False
1002210022 for listarrayfiles in listarrayfileslist :
0 commit comments