@@ -7967,7 +7967,7 @@ def ListDirToArray(infiles, dirlistfromtxt=False, fmttype=__file_format_default_
79677967 outarray = MkTempFile ()
79687968 packform = PackFoxFile (infiles , outarray , dirlistfromtxt , fmttype , compression , compresswholefile ,
79697969 compressionlevel , followlink , checksumtype , extradata , formatspecs , verbose , True )
7970- listarrayfiles = FoxFileToArray (outarray , "auto" , filestart , seekstart , seekend , listonly , True , skipchecksum , formatspecs , seektoend , returnfp )
7970+ listarrayfiles = FoxFileToArray (outarray , "auto" , filestart , seekstart , seekend , listonly , True , True , skipchecksum , formatspecs , seektoend , returnfp )
79717971 return listarrayfiles
79727972
79737973
@@ -8095,7 +8095,7 @@ def RePackFoxFile(infile, outfile, fmttype="auto", compression="auto", compressw
80958095 else :
80968096 if (infile != "-" and not isinstance (infile , bytes ) and not hasattr (infile , "read" ) and not hasattr (infile , "write" )):
80978097 infile = RemoveWindowsPath (infile )
8098- listarrayfiles = FoxFileToArray (infile , "auto" , filestart , seekstart , seekend , False , True , skipchecksum , formatspecs , seektoend , returnfp )
8098+ listarrayfiles = FoxFileToArray (infile , "auto" , filestart , seekstart , seekend , False , True , True , skipchecksum , formatspecs , seektoend , returnfp )
80998099 if (IsNestedDict (formatspecs ) and fmttype in formatspecs ):
81008100 formatspecs = formatspecs [fmttype ]
81018101 elif (IsNestedDict (formatspecs ) and fmttype not in formatspecs ):
@@ -8208,11 +8208,11 @@ def RePackFoxFile(infile, outfile, fmttype="auto", compression="auto", compressw
82088208 fdev_major = format (
82098209 int (listarrayfiles ['ffilelist' ][reallcfi ]['fmajor' ]), 'x' ).lower ()
82108210 fseeknextfile = listarrayfiles ['ffilelist' ][reallcfi ]['fseeknextfile' ]
8211- if (len (listarrayfiles ['ffilelist' ][reallcfi ]['fextralist ' ]) > listarrayfiles ['ffilelist' ][reallcfi ]['fextrafields' ] and len (listarrayfiles ['ffilelist' ][reallcfi ]['fextralist ' ]) > 0 ):
8211+ if (len (listarrayfiles ['ffilelist' ][reallcfi ]['fextradata ' ]) > listarrayfiles ['ffilelist' ][reallcfi ]['fextrafields' ] and len (listarrayfiles ['ffilelist' ][reallcfi ]['fextradata ' ]) > 0 ):
82128212 listarrayfiles ['ffilelist' ][reallcfi ]['fextrafields' ] = len (
8213- listarrayfiles ['ffilelist' ][reallcfi ]['fextralist ' ])
8213+ listarrayfiles ['ffilelist' ][reallcfi ]['fextradata ' ])
82148214 if (not followlink and len (extradata ) <= 0 ):
8215- extradata = listarrayfiles ['ffilelist' ][reallcfi ]['fextralist ' ]
8215+ extradata = listarrayfiles ['ffilelist' ][reallcfi ]['fextradata ' ]
82168216 if (not followlink and len (jsondata ) <= 0 ):
82178217 jsondata = listarrayfiles ['ffilelist' ][reallcfi ]['fjsondata' ]
82188218 fcontents = listarrayfiles ['ffilelist' ][reallcfi ]['fcontents' ]
@@ -8291,10 +8291,10 @@ def RePackFoxFile(infile, outfile, fmttype="auto", compression="auto", compressw
82918291 fdev_minor = format (int (flinkinfo ['fminor' ]), 'x' ).lower ()
82928292 fdev_major = format (int (flinkinfo ['fmajor' ]), 'x' ).lower ()
82938293 fseeknextfile = flinkinfo ['fseeknextfile' ]
8294- if (len (flinkinfo ['fextralist ' ]) > flinkinfo ['fextrafields' ] and len (flinkinfo ['fextralist ' ]) > 0 ):
8295- flinkinfo ['fextrafields' ] = len (flinkinfo ['fextralist ' ])
8294+ if (len (flinkinfo ['fextradata ' ]) > flinkinfo ['fextrafields' ] and len (flinkinfo ['fextradata ' ]) > 0 ):
8295+ flinkinfo ['fextrafields' ] = len (flinkinfo ['fextradata ' ])
82968296 if (len (extradata ) < 0 ):
8297- extradata = flinkinfo ['fextralist ' ]
8297+ extradata = flinkinfo ['fextradata ' ]
82988298 if (len (jsondata ) < 0 ):
82998299 extradata = flinkinfo ['fjsondata' ]
83008300 fcontents = flinkinfo ['fcontents' ]
@@ -8389,7 +8389,7 @@ def UnPackFoxFile(infile, outdir=None, followlink=False, filestart=0, seekstart=
83898389 else :
83908390 if (infile != "-" and not hasattr (infile , "read" ) and not hasattr (infile , "write" ) and not (sys .version_info [0 ] >= 3 and isinstance (infile , bytes ))):
83918391 infile = RemoveWindowsPath (infile )
8392- listarrayfiles = FoxFileToArray (infile , "auto" , filestart , seekstart , seekend , False , True , skipchecksum , formatspecs , seektoend , returnfp )
8392+ listarrayfiles = FoxFileToArray (infile , "auto" , filestart , seekstart , seekend , False , True , True , skipchecksum , formatspecs , seektoend , returnfp )
83938393 if (not listarrayfiles ):
83948394 return False
83958395 lenlist = len (listarrayfiles ['ffilelist' ])
0 commit comments