From 52e19e09d5b88907b8ef317d0078e5d50895e36b 2016-01-15 00:05:38 From: Miguel Valdez Date: 2016-01-15 00:05:38 Subject: [PATCH] jroIO_base: File size is verified --- diff --git a/schainpy/model/io/jroIO_base.py b/schainpy/model/io/jroIO_base.py index 573e3fa..28ff38d 100644 --- a/schainpy/model/io/jroIO_base.py +++ b/schainpy/model/io/jroIO_base.py @@ -136,30 +136,36 @@ def isFileInTimeRange(filename, startDate, endDate, startTime, endTime): lastBasicHeaderObj = BasicHeader(LOCALTIME) sts = firstBasicHeaderObj.read(fp) + + if not(sts): + print "[Reading] Skipping the file %s because it has not a valid header" %(filename) + return None + sts = systemHeaderObj.read(fp) sts = radarControllerHeaderObj.read(fp) sts = processingHeaderObj.read(fp) + filesize = os.path.getsize(filename) + offset = processingHeaderObj.blockSize + 24 #header size + if filesize <= offset: + print "[Reading] %s: This file has not enough data" %filename + return None + fp.seek(-offset, 2) sts = lastBasicHeaderObj.read(fp) fp.close() - if not(sts): - print "Skipping the file %s because it has not a valid header" %(filename) - return None + thisDatetime = lastBasicHeaderObj.datatime + thisTime_last_block = thisDatetime.time() thisDatetime = firstBasicHeaderObj.datatime thisDate = thisDatetime.date() thisTime_first_block = thisDatetime.time() - thisDatetime = lastBasicHeaderObj.datatime - thisTime_last_block = thisDatetime.time() - - #General case # o>>>>>>>>>>>>>><<<<<<<<<<<<<