]> git.madduck.net Git - etc/awesome.git/commitdiff

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:

modified: widgets/weather.lua - test if the tomorrow came
authorAleksandr Beliaev <trap000d@gmail.com>
Mon, 30 May 2016 00:50:42 +0000 (12:50 +1200)
committerAleksandr Beliaev <trap000d@gmail.com>
Mon, 30 May 2016 00:50:42 +0000 (12:50 +1200)
widgets/weather.lua

index c684fe22583f51494ebf6d46b1ef8e4384cb693d..3512f229ad7cb89b0d57bb725c85c510b24ff8c2 100644 (file)
@@ -73,8 +73,9 @@ local function worker(args)
             weather.forecast_update()
         end
 
             weather.forecast_update()
         end
 
+
         weather.notification = naughty.notify({
         weather.notification = naughty.notify({
-            text    = weather.current_text .. weather.notification_text,
+            text    = weather.notification_text,
             icon    = weather.icon_path,
             timeout = t_out,
             preset  = notification_preset
             icon    = weather.icon_path,
             timeout = t_out,
             preset  = notification_preset
@@ -122,39 +123,25 @@ local function worker(args)
         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
-<<<<<<< HEAD
                 -- weather icon based on localtime
                 -- weather icon based on localtime
-                now     = os.time() - (utc * 3600)
+                now     = os.time()
                 sunrise = tonumber(weather_now["sys"]["sunrise"])
                 sunset  = tonumber(weather_now["sys"]["sunset"])
                 icon    = weather_now["weather"][1]["icon"]
 
                 sunrise = tonumber(weather_now["sys"]["sunrise"])
                 sunset  = tonumber(weather_now["sys"]["sunset"])
                 icon    = weather_now["weather"][1]["icon"]
 
+                if sunrise <= (now-86400) then now = now - 86400 end
+
                 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
-<<<<<<< HEAD
 
                 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
                 widget = weather.widget
                 widget = weather.widget
-                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"