madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@git.madduck.net.
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged.
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
--[[
Licensed under GNU General Public License v2
--[[
Licensed under GNU General Public License v2
local function fetch_weather()
local url = api_url .. units_set .. city_id
local function fetch_weather()
local url = api_url .. units_set .. city_id
- local f = io.popen("curl --connect-timeout 1 -fsm 1 '"
- .. url .. "'" )
+ local f = io.popen("curl --connect-timeout 1 -fsm 3 '" .. url .. "'" )
local text = f:read("*all")
f:close()
local text = f:read("*all")
f:close()
yawn.icon:set_image(icon_path .. "na.png")
if text == "" then
weather_data = "Service not available at the moment."
yawn.icon:set_image(icon_path .. "na.png")
if text == "" then
weather_data = "Service not available at the moment."
- yawn.widget:set_text("N/A")
+ yawn.widget:set_text(" N/A")
else
weather_data = "City not found!\n" ..
"Are you sure " .. city_id ..
" is your Yahoo city ID?"
else
weather_data = "City not found!\n" ..
"Are you sure " .. city_id ..
" is your Yahoo city ID?"
- yawn.widget:set_text("?")
+ yawn.widget:set_text(" ?")
end
return
end
-- Processing raw data
weather_data = text:gsub("<.->", "")
end
return
end
-- Processing raw data
weather_data = text:gsub("<.->", "")
- weather_data = weather_data:match("Current Conditions:.-Full")
+ weather_data = weather_data:match("Current Conditions:.-Full") or ""
+
+ -- may still happens in case of bad connectivity
+ if weather_data == "" then
+ yawn.icon:set_image(icon_path .. "na.png")
+ yawn.widget:set_text(" ?")
+ return
+ end
+
weather_data = weather_data:gsub("Current Conditions:.-\n", "Now: ")
weather_data = weather_data:gsub("Forecast:.-\n", "")
weather_data = weather_data:gsub("\nFull", "")
weather_data = weather_data:gsub("Current Conditions:.-\n", "Now: ")
weather_data = weather_data:gsub("Forecast:.-\n", "")
weather_data = weather_data:gsub("\nFull", "")
sky = sky .. forecast:gsub(" ", ""):gsub("/", "") .. ".png"
-- In case there's no defined icon for current forecast
sky = sky .. forecast:gsub(" ", ""):gsub("/", "") .. ".png"
-- In case there's no defined icon for current forecast
- f = io.popen(sky)
- if f == nil then
+ if io.open(sky) == nil then
sky = icon_path .. "na.png"
sky = icon_path .. "na.png"
forecast = weather_data:match(": %S.-,"):gsub(": ", ""):gsub(",", "")
units = units:gsub(" ", "")
forecast = weather_data:match(": %S.-,"):gsub(": ", ""):gsub(",", "")
units = units:gsub(" ", "")
- naughty.notify({text=forecast, timeout=10})
- naughty.notify({text=units, timeout=10})
end
function yawn.show(t_out)
end
function yawn.show(t_out)
- if yawn.widget._layout.text == "?"
+ if yawn.widget._layout.text:match("?")
then
fetch_weather(settings)
end
then
fetch_weather(settings)
end