Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 05:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Http.weather: Cleaned up some regexes and added proper checking to re.search

Browse Source 
result assignments. Added reporting of Heat Index/Wind Chill if they are
different than the actual temperature.
This commit is contained in:
James Vega 2003-12-08 15:38:49 +00:00
parent d59b3022fc
commit 946d9b234c
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/Http.py
View File

@ -201,13 +201,19 @@ class Http(callbacks.Privmsg):
r'(.*?), (.*?),(.*?)</b></font></td>', re.IGNORECASE) r'(.*?), (.*?),(.*?)</b></font></td>', re.IGNORECASE)
_interregex = re.compile( _interregex = re.compile(
r'<td><font size="4" face="arial"><b>'\ r'<td><font size="4" face="arial"><b>'\
r'(.*?), (.*?)</b></font></td>', re.IGNORECASE) r'([^,]+), ([^<]+)</b></font></td>', re.IGNORECASE)
_condregex = re.compile( _condregex = re.compile(
r'<td width="100%" colspan="2" align="center"><strong>'\ r'<td width="100%" colspan="2" align="center"><strong>'\
r'<font face="arial">(.*?)</font></strong></td>', re.IGNORECASE) r'<font face="arial">([^<]+)</font></strong></td>', re.IGNORECASE)
_tempregex = re.compile( _tempregex = re.compile(
r'<td valign="top" align="right"><strong><font face="arial">'\ r'<td valign="top" align="right"><strong><font face="arial">'\
r'(.*?)</font></strong></td>', re.IGNORECASE) r'([^<]+)</font></strong></td>', re.IGNORECASE)
_chillregex = re.compile(
r'Wind Chill</font></strong>:</small></a></td>\s+<td align="right">'\
r'<small><font face="arial">([^<]+)</font></small></td>', re.I | re.S)
_heatregex = re.compile(
r'Heat Index</font></strong>:</small></a></td>\s+<td align="right">'\
r'<small><font face="arial">([^<]+)</font></small></td>', re.I | re.S)
# States # States
_realStates = sets.Set(['ak', 'al', 'ar', 'az', 'ca', 'co', 'ct', _realStates = sets.Set(['ak', 'al', 'ar', 'az', 'ca', 'co', 'ct',
'dc', 'de', 'fl', 'ga', 'hi', 'ia', 'id', 'dc', 'de', 'fl', 'ga', 'hi', 'ia', 'id',
@ -291,14 +297,32 @@ class Http(callbacks.Privmsg):
irc.error(msg, 'No such location could be found.') irc.error(msg, 'No such location could be found.')
return return
temp = self._tempregex.search(html).group(1) city = city.strip()
conds = self._condregex.search(html).group(1) state = state.strip()
temp = self._tempregex.search(html)
if temp:
temp = temp.group(1)
conds = self._condregex.search(html)
if conds:
conds = conds.group(1)
chill = self._chillregex.search(html)
if chill:
chill = chill.group(1)
heat = self._heatregex.search(html)
if heat:
heat = heat.group(1)
if heat[:-2] > temp[:-2]:
index = ' (Heat Index: %s)' % heat
elif chill[:-2] < temp[:-2]:
index = ' (Wind Chill: %s)' % chill
else:
index = ''
if temp and conds and city and state: if temp and conds and city and state:
conds = conds.replace('Tsra', 'Thunder Storms') conds = conds.replace('Tsra', 'Thunder Storms')
s = 'The current temperature in %s, %s is %s. ' \ s = 'The current temperature in %s, %s is %s%s. Conditions: %s' % \
'Conditions: %s.' % \ (city, state, temp, index, conds)
(city.strip(), state.strip(), temp, conds)
irc.reply(msg, s) irc.reply(msg, s)
else: else:
irc.error(msg, 'The format of the page was odd.') irc.error(msg, 'The format of the page was odd.')