ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

And... done! (until I find some huge horrible bug, that is)

Browse source
This commit is contained in:
Luke Rogers 2012-09-12 07:18:06 +12:00
parent 99cd93ae8f
commit 2995e3b758
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
plugins/weather.py
View file

@ -98,15 +98,30 @@ def weather(inp, nick="", reply=None, db=None, notice=None):
# now, to get the actual weather # now, to get the actual weather
try: try:
d = get_weather(location) data = get_weather(location)
except KeyError: except KeyError:
return "Could not get weather for that location." return "Could not get weather for that location."
reply("\x02{}\x02 - \x02Current Conditions:\x02 {}, {}F/{}C, {}%, " \ # put all the stuff we want to use in a dictionary for easy formatting of the output
"Wind: {}KPH/{}MPH {}, \x02Todays Forecast:\x02 N/A".format(d['location']['city'], \ weather = {
d['item']['condition']['text'], d['item']['condition']['temp'], \ "place": data['location']['city'],
d['item']['condition']['temp_c'], d['atmosphere']['humidity'], \ "conditions": data['item']['condition']['text'],
d['wind']['speed_kph'], d['wind']['speed'], d['wind']['text'])) "temp_f": data['item']['condition']['temp'],
"temp_c": data['item']['condition']['temp_c'],
"humidity": data['atmosphere']['humidity'],
"wind_kph": data['wind']['speed_kph'],
"wind_mph": data['wind']['speed'],
"wind_text": data['wind']['text'],
"forecast": data['item']['forecast'][0]['text'],
"high_f": data['item']['forecast'][0]['high'],
"high_c": data['item']['forecast'][0]['high_c'],
"low_f": data['item']['forecast'][0]['low'],
"low_c": data['item']['forecast'][0]['low_c']
}
reply("\x02{place}\x02 - \x02Current Conditions:\x02 {conditions}, {temp_f}F/{temp_c}C, Humidity: {humidity}%, " \
"Wind: {wind_kph}KPH/{wind_mph}MPH {wind_text}, \x02Todays Forecast:\x02 {forecast}, " \
"High: {high_f}F/{low_c}C, Low: {low_f}F/{low_c}C.".format(**weather))
if location and not dontsave: if location and not dontsave:
db.execute("insert or replace into weather(nick, loc) values (?,?)", db.execute("insert or replace into weather(nick, loc) values (?,?)",