@@ -4950,7 +4950,9 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
49504950 fcontents = fcontents .read ()
49514951 iecsize = get_readable_size (fsize , unit = "IEC" )
49524952 sisize = get_readable_size (fsize , unit = "SI" )
4953- outlist = {'fheadersize' : fheadsize , 'fhstart' : fheaderstart , 'fhend' : fhend , 'ftype' : ftype , 'fencoding' : fencoding , 'fcencoding' : fcencoding , 'fname' : fname , 'fbasedir' : fbasedir , 'flinkname' : flinkname , 'fsize' : fsize , 'fsize_si' : sisize , 'fsize_iec' : iecsize , 'fblksize' : fblksize , 'fblocks' : fblocks , 'fflags' : fflags , 'fatime' : divmod (int (fatime ), 10 ** 9 )[0 ], 'fmtime' : divmod (int (fmtime ), 10 ** 9 )[0 ], 'fctime' : divmod (int (fctime ), 10 ** 9 )[0 ], 'fbtime' : divmod (int (fbtime ), 10 ** 9 )[0 ], 'fatime_ns' : fatime , 'fmtime_ns' : fmtime , 'fctime_ns' : fctime , 'fbtime_ns' : fbtime , 'fmode' : fmode , 'fchmode' : fchmode , 'fstrmode' : PrintPermissionString (fmode , ftype ), 'ftypemod' : ftypemod , 'fwinattributes' : fwinattributes , 'fcompression' : fcompression , 'fcsize' : fcsize , 'fuid' : fuid , 'funame' : funame , 'fgid' : fgid , 'fgname' : fgname , 'finode' : finode , 'flinkcount' : flinkcount ,
4953+ ieccsize = get_readable_size (fcsize , unit = "IEC" )
4954+ sicsize = get_readable_size (fcsize , unit = "SI" )
4955+ outlist = {'fheadersize' : fheadsize , 'fhstart' : fheaderstart , 'fhend' : fhend , 'ftype' : ftype , 'fencoding' : fencoding , 'fcencoding' : fcencoding , 'fname' : fname , 'fbasedir' : fbasedir , 'flinkname' : flinkname , 'fsize' : fsize , 'fsize_si' : sisize , 'fsize_iec' : iecsize , 'fblksize' : fblksize , 'fblocks' : fblocks , 'fflags' : fflags , 'fatime' : divmod (int (fatime ), 10 ** 9 )[0 ], 'fmtime' : divmod (int (fmtime ), 10 ** 9 )[0 ], 'fctime' : divmod (int (fctime ), 10 ** 9 )[0 ], 'fbtime' : divmod (int (fbtime ), 10 ** 9 )[0 ], 'fatime_ns' : fatime , 'fmtime_ns' : fmtime , 'fctime_ns' : fctime , 'fbtime_ns' : fbtime , 'fmode' : fmode , 'fchmode' : fchmode , 'fstrmode' : PrintPermissionString (fmode , ftype ), 'ftypemod' : ftypemod , 'fwinattributes' : fwinattributes , 'fcompression' : fcompression , 'fcsize' : fcsize , 'fcsize_si' : sicsize , 'fcsize_iec' : ieccsize , 'fuid' : fuid , 'funame' : funame , 'fgid' : fgid , 'fgname' : fgname , 'finode' : finode , 'flinkcount' : flinkcount ,
49544956 'fdev' : fdev , 'frdev' : frdev , 'fseektojson' : fseektojson , 'fseektocontent' : fseektocontent , '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 }
49554957 return outlist
49564958
0 commit comments