Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-02 16:09:24 +01:00
Code Issues Projects Releases Wiki Activity

Add supybot.plugins.Weather.convert, which determines weather or not whether

Browse Source 
will convert temperature to the configured unit.
This commit is contained in:
James Vega 2004-04-14 00:26:08 +00:00
parent 5d8f0156fb
commit 403a561671
2 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/Weather.py
View File

@ -226,9 +226,13 @@ class Weather(callbacks.Privmsg):
city = city.strip() city = city.strip()
state = state.strip() state = state.strip()
temp = self._tempregex.search(html) temp = self._tempregex.search(html)
convert = self.registryValue('convert', msg.args[0])
if temp is not None: if temp is not None:
(temp, deg, unit) = temp.groups() (temp, deg, unit) = temp.groups()
temp = self._getTemp(int(temp), deg, unit, msg.args[0]) if convert:
temp = self._getTemp(int(temp), deg, unit, msg.args[0])
else:
temp = deg.join((temp, unit))
conds = self._condregex.search(html) conds = self._condregex.search(html)
if conds is not None: if conds is not None:
conds = conds.group(1) conds = conds.group(1)
@ -237,20 +241,23 @@ class Weather(callbacks.Privmsg):
if chill is not None: if chill is not None:
chill = chill.group(1) chill = chill.group(1)
chill = utils.htmlToText(chill) chill = utils.htmlToText(chill)
tempsplit = self._temp.search(chill) if convert:
if tempsplit: tempsplit = self._temp.search(chill)
(chill, deg, unit) = tempsplit.groups() if tempsplit:
chill = self._getTemp(int(chill), deg, unit,msg.args[0]) (chill, deg, unit) = tempsplit.groups()
chill = self._getTemp(int(chill), deg, unit,msg.args[0])
if float(chill[:-2]) < float(temp[:-2]): if float(chill[:-2]) < float(temp[:-2]):
index = ' (Wind Chill: %s)' % chill index = ' (Wind Chill: %s)' % chill
heat = self._heatregex.search(html) heat = self._heatregex.search(html)
if heat is not None: if heat is not None:
heat = heat.group(1) heat = heat.group(1)
heat = utils.htmlToText(heat) heat = utils.htmlToText(heat)
tempsplit = self._temp.search(heat) if convert:
if tempsplit: tempsplit = self._temp.search(heat)
(heat, deg, unit) = tempsplit.groups() if tempsplit:
heat = self._getTemp(int(heat), deg, unit,msg.args[0]) (heat, deg, unit) = tempsplit.groups()
if convert:
heat = self._getTemp(int(heat), deg, unit,msg.args[0])
if float(heat[:-2]) > float(temp[:-2]): if float(heat[:-2]) > float(temp[:-2]):
index = ' (Heat Index: %s)' % heat index = ' (Heat Index: %s)' % heat
if temp and conds and city and state: if temp and conds and city and state:
@ -304,11 +311,15 @@ class Weather(callbacks.Privmsg):
conds = self._conds.search(text) conds = self._conds.search(text)
humidity = self._humidity.search(text) humidity = self._humidity.search(text)
wind = self._wind.search(text) wind = self._wind.search(text)
convert = self.registryValue('convert', msg.args[0])
if location and temp: if location and temp:
location = location.group(1) location = location.group(1)
location = location.split('-')[-1].strip() location = location.split('-')[-1].strip()
(temp, deg, unit) = temp.groups() (temp, deg, unit) = temp.groups()
temp = self._getTemp(int(temp), deg, unit, msg.args[0]) if convert:
temp = self._getTemp(int(temp), deg, unit, msg.args[0])
else:
temp = deg.join((temp, unit))
resp = 'The current temperature in %s is %s.' % (location, temp) resp = 'The current temperature in %s is %s.' % (location, temp)
resp = [resp] resp = [resp]
if conds is not None: if conds is not None:
@ -330,6 +341,10 @@ conf.registerChannelValue(conf.supybot.plugins.Weather, 'command',
WeatherCommand('cnn', """Sets the default command to use when retrieving WeatherCommand('cnn', """Sets the default command to use when retrieving
the weather. Command must be one of %s.""" % the weather. Command must be one of %s.""" %
utils.commaAndify(Weather.weatherCommands, And='or'))) utils.commaAndify(Weather.weatherCommands, And='or')))
conf.registerChannelValue(conf.supybot.plugins.Weather, 'convert',
registry.Boolean(True, """Determines whether the weather commands will
automatically convert weather units to the unit specified in
supybot.plugins.Weather.temperatureUnit."""))
Class = Weather Class = Weather

22
test/test_Weather.py
View File

@ -73,5 +73,27 @@ if network:
def testNoEscapingWebError(self): def testNoEscapingWebError(self):
self.assertNotRegexp('ham "buenos aires"', 'WebError') self.assertNotRegexp('ham "buenos aires"', 'WebError')
def testConvertConfig(self):
try:
convert = conf.supybot.plugins.Weather.convert()
unit = conf.supybot.plugins.Weather.temperatureUnit()
conf.supybot.plugins.Weather.convert.setValue(False)
conf.supybot.plugins.Weather.temperatureUnit.setValue('C')
self.assertRegexp('ham london, gb', r'-?\d+.C')
self.assertRegexp('ham 02115', r'-?\d+.F')
conf.supybot.plugins.Weather.temperatureUnit.setValue('F')
self.assertRegexp('ham london, gb', r'-?\d+.C')
self.assertRegexp('ham 02115', r'-?\d+.F')
conf.supybot.plugins.Weather.convert.setValue(True)
conf.supybot.plugins.Weather.temperatureUnit.setValue('C')
self.assertRegexp('ham london, gb', r'-?\d+.C')
self.assertRegexp('ham 02115', r'-?\d+.C')
conf.supybot.plugins.Weather.temperatureUnit.setValue('F')
self.assertRegexp('ham london, gb', r'-?\d+.F')
self.assertRegexp('ham 02115', r'-?\d+.F')
finally:
conf.supybot.plugins.Weather.convert.setValue(convert)
conf.supybot.plugins.Weather.temperatureUnit.setValue(unit)
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: