@@ -4510,7 +4510,7 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
45104510 fcontents .seek (0 , 0 )
45114511 if (not contentasfile ):
45124512 fcontents = fcontents .read ()
4513- outlist = {'fheadersize' : fheadsize , 'fhstart' : fheaderstart , 'fhend' : fhend , 'ftype' : ftype , 'fencoding' : fencoding , 'fcencoding' : fcencoding , 'fname' : fname , 'fbasedir' : fbasedir , 'flinkname' : flinkname , 'fsize' : fsize , 'fblksize' : fblksize , 'fblocks' : fblocks , 'fflags' : fflags , 'fatime' : fatime , 'fmtime' : fmtime , 'fctime' : fctime , 'fbtime' : fbtime , ' fmode' : fmode , 'fchmode' : fchmode , 'ftypemod' : ftypemod , 'fwinattributes' : fwinattributes , 'fcompression' : fcompression , 'fcsize' : fcsize , 'fuid' : fuid , 'funame' : funame , 'fgid' : fgid , 'fgname' : fgname , 'finode' : finode , 'flinkcount' : flinkcount ,
4513+ outlist = {'fheadersize' : fheadsize , 'fhstart' : fheaderstart , 'fhend' : fhend , 'ftype' : ftype , 'fencoding' : fencoding , 'fcencoding' : fcencoding , 'fname' : fname , 'fbasedir' : fbasedir , 'flinkname' : flinkname , 'fsize' : fsize , 'fblksize' : fblksize , 'fblocks' : fblocks , 'fflags' : fflags , 'fatime' : divmod ( int ( fatime ), 10 ** 9 ), 'fmtime' : divmod ( int ( fmtime ), 10 ** 9 ), 'fctime' : divmod ( int ( fctime ), 10 ** 9 ), 'fbtime' : divmod ( int ( fbtime ), 10 ** 9 ), 'fatime_ns' : fatime , 'fmtime_ns' : fmtime , 'fctime_ns' : fctime , 'fbtime_ns' : fbtime , ' fmode' : fmode , 'fchmode' : fchmode , 'fstrmode' : PrintPermissionString ( fchmode , ftype ) , 'ftypemod' : ftypemod , 'fwinattributes' : fwinattributes , 'fcompression' : fcompression , 'fcsize' : fcsize , 'fuid' : fuid , 'funame' : funame , 'fgid' : fgid , 'fgname' : fgname , 'finode' : finode , 'flinkcount' : flinkcount ,
45144514 'fdev' : fdev , 'frdev' : frdev , 'fseeknextfile' : fseeknextfile , 'fheaderchecksumtype' : HeaderOut [- 4 ], 'fjsonchecksumtype' : fjsonchecksumtype , 'fcontentchecksumtype' : HeaderOut [- 3 ], 'fnumfields' : fnumfields + 2 , 'frawheader' : HeaderOut , 'fvendorfields' : fvendorfields , 'fvendordata' : fvendorfieldslist , 'fextrafields' : fextrafields , 'fextrafieldsize' : fextrasize , 'fextradata' : fextrafieldslist , 'fjsontype' : fjsontype , 'fjsonlen' : fjsonlen , 'fjsonsize' : fjsonsize , 'fjsonrawdata' : fjsonrawcontent , 'fjsondata' : fjsoncontent , 'fjstart' : fjstart , 'fjend' : fjend , 'fheaderchecksum' : fcs , 'fjsonchecksum' : fjsonchecksum , 'fcontentchecksum' : fccs , 'fhascontents' : pyhascontents , 'fcontentstart' : fcontentstart , 'fcontentend' : fcontentend , 'fcontentasfile' : contentasfile , 'fcontents' : fcontents }
45154515 return outlist
45164516
@@ -8720,10 +8720,10 @@ def RePackNeoFile(infile, outfile, fmttype="auto", compression="auto", compressw
87208720 fblocks = format (int (cur_entry ['fblocks' ]), 'x' ).lower ()
87218721 fflags = format (int (cur_entry ['fflags' ]), 'x' ).lower ()
87228722 flinkname = cur_entry ['flinkname' ]
8723- fatime = format (int (cur_entry ['fatime ' ]), 'x' ).lower ()
8724- fmtime = format (int (cur_entry ['fmtime ' ]), 'x' ).lower ()
8725- fctime = format (int (cur_entry ['fctime ' ]), 'x' ).lower ()
8726- fbtime = format (int (cur_entry ['fbtime ' ]), 'x' ).lower ()
8723+ fatime = format (int (cur_entry ['fatime_ns ' ]), 'x' ).lower ()
8724+ fmtime = format (int (cur_entry ['fmtime_ns ' ]), 'x' ).lower ()
8725+ fctime = format (int (cur_entry ['fctime_ns ' ]), 'x' ).lower ()
8726+ fbtime = format (int (cur_entry ['fbtime_ns ' ]), 'x' ).lower ()
87278727 fmode = format (int (cur_entry ['fmode' ]), 'x' ).lower ()
87288728 fchmode = format (int (cur_entry ['fchmode' ]), 'x' ).lower ()
87298729 fuid = format (int (cur_entry ['fuid' ]), 'x' ).lower ()
@@ -9334,9 +9334,7 @@ def NeoFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0
93349334 VerbosePrintOut (ftype_to_str (listarrayfiles ['ffilelist' ][lcfi ]['ftype' ]) + "\t " + listarrayfiles ['ffilelist' ][lcfi ]['fcompression' ] + compratio + "\t " + str (
93359335 listarrayfiles ['ffilelist' ][lcfi ]['fsize' ]).rjust (15 ) + "\t " + compressprint + printfname )
93369336 else :
9337- ts_ns = listarrayfiles ['ffilelist' ][lcfi ]['fmtime' ]
9338- sec , ns = divmod (int (ts_ns ), 10 ** 9 )
9339- dt = datetime .datetime .fromtimestamp (sec ).replace (microsecond = ns // 1000 )
9337+ dt = datetime .datetime .fromtimestamp (listarrayfiles ['ffilelist' ][lcfi ]['fmtime' ][0 ])
93409338 VerbosePrintOut (PrintPermissionString (listarrayfiles ['ffilelist' ][lcfi ]['fmode' ], listarrayfiles ['ffilelist' ][lcfi ]['ftype' ]) + "\t " + str (fuprint ) + "/" + str (fgprint ) + "\t " + str (
93419339 listarrayfiles ['ffilelist' ][lcfi ]['fsize' ]).rjust (15 ) + "\t " + dt .strftime ('%Y-%m-%d %H:%M' ) + "\t " + printfname )
93429340 lcfi = lcfi + 1
0 commit comments