]>
git.madduck.net Git - etc/awesome.git/blobdiff - widgets/weather.lua
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:
local current_call = args.current_call or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"
local forecast_call = args.forecast_call or "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'"
local city_id = args.city_id or 0 -- placeholder
local current_call = args.current_call or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"
local forecast_call = args.forecast_call or "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'"
local city_id = args.city_id or 0 -- placeholder
- local utc = args.utc or 0
+ local utc = args.utc or 0
local units = args.units or "metric"
local lang = args.lang or "en"
local cnt = args.cnt or 5
local units = args.units or "metric"
local lang = args.lang or "en"
local cnt = args.cnt or 5
weather.forecast_update()
end
weather.forecast_update()
end
weather.notification = naughty.notify({
weather.notification = naughty.notify({
- text = weather.notification_text,
+ text = weather.current_text .. weather. notification_text,
icon = weather.icon_path,
timeout = t_out,
preset = notification_preset
icon = weather.icon_path,
timeout = t_out,
preset = notification_preset
async.request(cmd, function(f)
local pos, err, icon
weather_now, pos, err = json.decode(f, 1, nil)
async.request(cmd, function(f)
local pos, err, icon
weather_now, pos, err = json.decode(f, 1, nil)
+ weather.current_text=''
if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
-- weather icon based on localtime
now = os.time() - (utc * 3600)
sunrise = tonumber(weather_now["sys"]["sunrise"])
-- weather icon based on localtime
now = os.time() - (utc * 3600)
sunrise = tonumber(weather_now["sys"]["sunrise"])
if sunrise <= now and now <= sunset then
icon = string.gsub(icon, "n", "d")
if sunrise <= now and now <= sunset then
icon = string.gsub(icon, "n", "d")
+=======
+ current_dt = os.time()
+ sunrise = weather_now["sys"]["sunrise"]
+ sunset = weather_now["sys"]["sunset"]
+ if current_dt> sunrise and current_dt> sunset then current_dt = current_dt - 86400 end
+ if current_dt > sunrise and current_dt < sunset then
+ datetime="d"
+>>>>>>> e3a5dd623700b2cad423c8179141124e6e9b9027
else
icon = string.gsub(icon, "d", "n")
end
else
icon = string.gsub(icon, "d", "n")
end
weather.icon_path = icons_path .. icon .. ".png"
weather.icon_path = icons_path .. icon .. ".png"
+=======
+ -- error("dt sr:" .. sunrise .. "ss: " .. sunset .. "dt: " .. current_dt .. "d/n: " .. datetime .. "hehe")
+ icon = weather_now["weather"][1]["icon"]
+ weather.icon_path = icons_path .. icon:sub(1,2) .. datetime .. ".png"
+>>>>>>> e3a5dd623700b2cad423c8179141124e6e9b9027
+ weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"
settings()
else
weather.icon_path = icons_path .. "na.png"
settings()
else
weather.icon_path = icons_path .. "na.png"