summaryrefslogtreecommitdiff
path: root/client/modules/Weather.py
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2014-04-09 23:09:23 -0400
committerschneefux <schneefux+commit@schneefux.xyz>2014-04-09 23:09:23 -0400
commit16e7c8dddb2b0449143241f0212c18b98df733a6 (patch)
treec0fc8723e57d8ac1894d86900fee258557650f92 /client/modules/Weather.py
parent658f13304f51543188e5a2ca2a4850a1901d1dde (diff)
parent2b129def696ac5ef6cc28f6c8d7b3dea86442337 (diff)
downloadjasper-client-16e7c8dddb2b0449143241f0212c18b98df733a6.tar.gz
jasper-client-16e7c8dddb2b0449143241f0212c18b98df733a6.zip
Merge pull request #9 from alexbate/master
International weather
Diffstat (limited to 'client/modules/Weather.py')
-rw-r--r--client/modules/Weather.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/client/modules/Weather.py b/client/modules/Weather.py
index 85a8f1d..7bb86ec 100644
--- a/client/modules/Weather.py
+++ b/client/modules/Weather.py
@@ -76,12 +76,18 @@ def handle(text, mic, profile):
for entry in forecast:
try:
date_desc = entry['title'].split()[0].strip().lower()
+ if date_desc == 'forecast': #For global forecasts
+ date_desc = entry['title'].split()[2].strip().lower()
+ weather_desc = entry['summary']
- weather_desc = entry['summary'].split('-')[1]
+ elif date_desc == 'current': #For first item of global forecasts
+ continue
+ else:
+ weather_desc = entry['summary'].split('-')[1] #US forecasts
if weekday == date_desc:
output = date_keyword + \
- ", the weather will be" + weather_desc + "."
+ ", the weather will be " + weather_desc + "."
break
except:
continue