Update centerfair.lua

[etc/awesome.git] / widgets / yawn / init.lua

diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index 36cdf548f3c07bd98241cb7bb380b91ceba2d1ba..b034395f64681ba64dba40f1dfa2680cc36063f4 100644 (file)
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -1,3 +1,4 @@
+

 --[[
                                                   
      Licensed under GNU General Public License v2 
 --[[
                                                   
      Licensed under GNU General Public License v2 


@@ -6,12 +7,14 @@
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer

+local async        = require("lain.asyncshell")

 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local debug        = { getinfo = debug.getinfo }
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local debug        = { getinfo = debug.getinfo }

-local io           = io
+local io           = { lines   = io.lines,
+                       open    = io.open }

 local os           = { date    = os.date,
                        getenv  = os.getenv }
 local string       = { find    = string.find,
 local os           = { date    = os.date,
                        getenv  = os.getenv }
 local string       = { find    = string.find,


@@ -35,7 +38,7 @@ local localizations_path  = project_path .. 'localizations/'
 local icon_path           = project_path .. 'icons/'
 local api_url             = 'http://weather.yahooapis.com/forecastrss'
 local units_set           = '?u=c&w=' -- Default is Celsius
 local icon_path           = project_path .. 'icons/'
 local api_url             = 'http://weather.yahooapis.com/forecastrss'
 local units_set           = '?u=c&w=' -- Default is Celsius

-local language            = string.match(os.getenv("LANG"), "(%S*$*)[.]")
+local language            = string.match(os.getenv("LANG"), "(%S*$*)[.]") or "en_US" -- if LANG is not set

 local weather_data        = nil
 local notification        = nil
 local city_id             = nil
 local weather_data        = nil
 local notification        = nil
 local city_id             = nil


@@ -46,98 +49,102 @@ yawn_notification_preset = {}
 
 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 3 '" .. url .. "'" )
-    local text = f:read("*all")
-    f:close()
+    local cmd = "curl --connect-timeout 1 -fsm 3 '" .. url .. "'"

 
 

-    -- In case of no connection or invalid city ID
-    -- widgets won't display
-    if text == "" or text:match("City not found")
-    then
-        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")
-        else
-            weather_data = "City not found!\n" ..
-                           "Are you sure " .. city_id ..
-                           " is your Yahoo city ID?"
-            yawn.widget:set_text(" ?")
+    async.request(cmd, function(f)
+        local text = f:read("*a")
+        f:close()
+
+        -- In case of no connection or invalid city ID
+        -- widgets won't display
+        if text == "" or text:match("City not found")
+        then
+            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 ")
+            else
+                weather_data = "City not found!\n" ..
+                               "Are you sure " .. city_id ..
+                               " is your Yahoo city ID?"
+                yawn.widget:set_text(" ? ")
+            end
+            return

         end
         end

-        return
-    end

 
 

-    -- Processing raw data
-    weather_data = text:gsub("<.->", "")
-    weather_data = weather_data:match("Current Conditions:.-Full") or ""
+        -- Processing raw data
+        weather_data = text:gsub("<.->", "")
+        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
+        -- 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("[\n]$", "")
-    weather_data = weather_data:gsub(" [-] " , ": ")
-    weather_data = weather_data:gsub("[.]", ",")
-    weather_data = weather_data:gsub("High: ", "")
-    weather_data = weather_data:gsub(" Low: ", " - ")
-
-    -- Getting info for text widget
-    local now      = weather_data:sub(weather_data:find("Now:")+5,
-                     weather_data:find("\n")-1)
-    forecast       = now:sub(1, now:find(",")-1)
-    units          = now:sub(now:find(",")+2, -2)
-
-    -- Day/Night icon change
-    local hour = tonumber(os.date("%H"))
-    sky = icon_path
-
-    if forecast == "Clear"         or
-       forecast == "Fair"          or
-       forecast == "Partly Cloudy" or
-       forecast == "Mostly Cloudy"
-       then
-           if hour >= 6 and hour <= 18
+        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("[\n]$", "")
+        weather_data = weather_data:gsub(" [-] " , ": ")
+        weather_data = weather_data:gsub("[.]", ",")
+        weather_data = weather_data:gsub("High: ", "")
+        weather_data = weather_data:gsub(" Low: ", " - ")
+
+        -- Getting info for text widget
+        local now      = weather_data:sub(weather_data:find("Now:")+5,
+                         weather_data:find("\n")-1)
+        forecast       = now:sub(1, now:find(",")-1)
+        units          = now:sub(now:find(",")+2, -2)
+
+        -- Day/Night icon change
+        local hour = tonumber(os.date("%H"))
+        sky = icon_path
+
+        if forecast == "Clear"         or
+           forecast == "Fair"          or
+           forecast == "Partly Cloudy" or
+           forecast == "Mostly Cloudy"

            then
            then

-               sky = sky .. "Day"
-           else
-               sky = sky .. "Night"
-           end
-    end
+               if hour >= 6 and hour <= 18
+               then
+                   sky = sky .. "Day"
+               else
+                   sky = sky .. "Night"
+               end
+        end

 
 

-    sky = sky  .. forecast:gsub(" ", ""):gsub("/", "") .. ".png"
+        sky = sky  .. forecast:gsub(" ", ""):gsub("/", "") .. ".png"

 
 

-    -- In case there's no defined icon for current forecast
-    if io.open(sky) == nil then
-        sky = icon_path .. "na.png"
-    end
+        -- In case there's no defined icon for current forecast
+        if io.open(sky) == nil then
+            sky = icon_path .. "na.png"
+        end

 
 

-    -- Localization
-    local f = io.open(localizations_path .. language, "r")
-    if language:find("en_") == nil and f ~= nil
-    then
-        f:close()
-        for line in io.lines(localizations_path .. language)
-        do
-            word = string.sub(line, 1, line:find("|")-1)
-            translation = string.sub(line, line:find("|")+1)
-            weather_data = string.gsub(weather_data, word, translation)
+        -- Localization
+        local f = io.open(localizations_path .. language, "r")
+        if language:find("en_") == nil and f ~= nil
+        then
+            f:close()
+            for line in io.lines(localizations_path .. language)
+            do
+                word = string.sub(line, 1, line:find("|")-1)
+                translation = string.sub(line, line:find("|")+1)
+                weather_data = string.gsub(weather_data, word, translation)
+            end

         end
         end

-    end

 
 

-    -- Finally setting infos
-    yawn.icon:set_image(sky)
-    widget = yawn.widget
+        -- Finally setting infos
+        yawn.icon:set_image(sky)
+        widget = yawn.widget

 
 

-    forecast = weather_data:match(": %S.-,"):gsub(": ", ""):gsub(",", "")
-    units = units:gsub(" ", "")
+        _data = weather_data:match(": %S.-,") or weather_data
+        forecast = _data:gsub(": ", ""):gsub(",", "")
+        units = units:gsub(" ", "")

 
 

-    settings()
+        settings()
+    end)

 end
 
 function yawn.hide()
 end
 
 function yawn.hide()


@@ -159,7 +166,7 @@ function yawn.show(t_out)
         preset = yawn_notification_preset,
         text = weather_data,
         icon = sky,
         preset = yawn_notification_preset,
         text = weather_data,
         icon = sky,

-        timeout = t_out
+        timeout = t_out,

     })
 end
 
     })
 end