aaron
/
noaacap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved check for expired alerts

This commit is contained in:
Dan Srebnick 2018-01-29 20:29:50 -05:00
parent f301d8d2e9
commit d2efa8d1e8
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
noaacap/usr/local/bin/noaacap.py
View File

@ -95,6 +95,7 @@ if r.status_code != 200:
soup = BeautifulSoup(r.text, 'xml') soup = BeautifulSoup(r.text, 'xml')
entries = soup.find_all('entry') entries = soup.find_all('entry')
count = len(entries) count = len(entries)
log.debug("Entry count: " + str(count))
dbfile = '/dev/shm/noaaconf.db' dbfile = '/dev/shm/noaaconf.db'
ppmap = '/usr/local/share/noaacap/ppmap.db' ppmap = '/usr/local/share/noaacap/ppmap.db'
@ -115,6 +116,7 @@ def vtecparse(value):
ProductClass, Action, Office, Phenomena, Significance, ETN, DTGroup = \ ProductClass, Action, Office, Phenomena, Significance, ETN, DTGroup = \
line.split('.') line.split('.')
EventBegin, EventEnd = DTGroup.split('-') EventBegin, EventEnd = DTGroup.split('-')
EventEnd = EventEnd.rstrip('/')
return ProductClass, Action, Office, Phenomena, Significance, ETN, \ return ProductClass, Action, Office, Phenomena, Significance, ETN, \
EventBegin, EventEnd EventBegin, EventEnd
@ -164,6 +166,7 @@ def parsezcs(zcs):
hit = 0 hit = 0
for i in range(0, count): for i in range(0, count):
log.debug("Processing entry: " + str(count))
if ("no active" in entries[i].title.string): if ("no active" in entries[i].title.string):
if os.path.isfile(dbfile): if os.path.isfile(dbfile):
os.remove(dbfile) os.remove(dbfile)
@ -187,11 +190,23 @@ for i in range(0, count):
try: try:
ProductClass, Action, Office, Phenomena, Significance, ETN, \ ProductClass, Action, Office, Phenomena, Significance, ETN, \
EventBegin, EventEnd = vtecparse(VTEC['VTEC'].string) EventBegin, EventEnd = vtecparse(VTEC['VTEC'].string)
if (ProductClass != "/O"): #Loop if not operational
continue
except: except:
continue #Loop if error parsing P-VTEC continue #Loop if error parsing P-VTEC
if (ProductClass != "/O"): #Loop if not operational
continue
# Is alert expired?
now = datetime.datetime.utcnow()
exp = datetime.datetime.strptime(EventEnd,'%y%m%dT%H%MZ')
log.debug('Now: ' + datetime.datetime.strftime(now,"%y-%m-%d %H:%M") + \
' Exp: ' + datetime.datetime.strftime(exp,"%y-%m-%d %H:%M"))
if now > exp:
log.debug("Alert Expired")
continue
else:
log.debug("Alert Valid")
id = bytes(str(Office + Phenomena + Significance + ETN), 'utf-8') id = bytes(str(Office + Phenomena + Significance + ETN), 'utf-8')
# Do we have this alert? # Do we have this alert?
@ -245,15 +260,16 @@ for i in range(0, count):
soup2 = BeautifulSoup(rs.text, 'xml') soup2 = BeautifulSoup(rs.text, 'xml')
parms = soup2.find_all('parameter') parms = soup2.find_all('parameter')
j = len(parms) j = len(parms)
zcs = ''
for j in range(0, len(parms)): for j in range(0, len(parms)):
if parms[j].valueName.string == 'UGC': if parms[j].valueName.string == 'UGC':
zcs = parms[j].value.string zcs = parms[j].value.string
# This handles expired messages found to contain no UGC log.debug('Parameters follow\n' + str(parms))
try:
zcs # This handles messages found to contain empty UGC list
except: if zcs == '':
log.debug('No zcs in message') log.debug('No UGC list in message')
continue continue
type = pp[bytes(Phenomena, 'utf-8')].decode('utf-8') type = pp[bytes(Phenomena, 'utf-8')].decode('utf-8')