storm
/
talking-clock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yahoo weather api went stupid. Sorry if this screwes over your temperature alerts, but I had to switch away from it. Now using weatherunderground.

This commit is contained in:
Storm dragon 2016-03-26 09:54:09 -04:00
parent 02cac8c619
commit 1fe52f1da7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/talking-clock
View File

@ -359,9 +359,9 @@ if [ "$speakTime" == "true" ] ; then
#Add temperature if zipcode is set
if [ -n "$zipcode" ] ; then
if [ "$torify" == "true" ] ; then
temperature="$(torify curl -s "http://weather.yahooapis.com/forecastrss?p=${zipcode}&u=f" | grep -A 1 "Current Conditions:" | tr -Cd '[:digit:]-')"
temperature="$(torify curl -s "http://mobile.wunderground.com/cgi-bin/findweather/getForecast?brand=mobile&query=${zipcode}" | grep -A 2 '<tr><td>Temperature</td>' | tr -cd '[:digit:]-.' | cut -d . -f1)"
else
temperature="$(curl -s "http://weather.yahooapis.com/forecastrss?p=${zipcode}&u=f" | grep -A 1 "Current Conditions:" | tr -Cd '[:digit:]-')"
temperature="$(curl -s "http://mobile.wunderground.com/cgi-bin/findweather/getForecast?brand=mobile&query=${zipcode}" | grep -A 2 '<tr><td>Temperature</td>' | tr -cd '[:digit:]-.' | cut -d . -f1)"
fi
if [ -n "$temperature" ] ; then
if [ "$format" = "24" ]; then
@ -425,7 +425,7 @@ fi
#There will be a slight gap between the prepended sound and the actual chiming.
#This is to simulate real clocks based on my experience.
if [ "$minute" -eq "0" ]; then
if [[ -f "$soundPack/prepend.ogg" -a "$chime" = "true" ]]; then
if [[ -f "$soundPack/prepend.ogg" && "$chime" = "true" ]]; then
$soundCommand "$soundPack/prepend.ogg"
fi
fi