better weather module: OpenWeatherMap; #105

[etc/awesome.git] / widgets / alsabar.lua

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index d233b288c4a7c13d9a90b03bb489fc565be694ec..1421975571993b8a173262e5a804c19c58b8f3d3 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -70,9 +70,11 @@ function alsabar.notify()
         preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%"
     end
 
         preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%"
     end
 

-    local int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size)
-    preset.text = string.format("[%s%s]", string.rep("|", int), 
-                  string.rep(" ", alsabar.notifications.bar_size - int))
+    int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size)
+    preset.text = "["
+                .. string.rep("|", int)
+                .. string.rep(" ", alsabar.notifications.bar_size - int)
+                .. "]"

 
     if alsabar._notify ~= nil then
         alsabar._notify = naughty.notify ({
 
     if alsabar._notify ~= nil then
         alsabar._notify = naughty.notify ({


@@ -87,19 +89,19 @@ function alsabar.notify()
 end
 
 local function worker(args)
 end
 
 local function worker(args)

-    local args = args or {}
-    local timeout = args.timeout or 4
-    local settings = args.settings or function() end
-    local width = args.width or 63
-    local height = args.heigth or 1
-    local ticks = args.ticks or false
+    local args       = args or {}
+    local timeout    = args.timeout or 4
+    local settings   = args.settings or function() end
+    local width      = args.width or 63
+    local height     = args.heigth or 1
+    local ticks      = args.ticks or false

     local ticks_size = args.ticks_size or 7
     local ticks_size = args.ticks_size or 7

-    local vertical = args.vertical or false
+    local vertical   = args.vertical or false

 
 

-    alsabar.card = args.card or alsabar.card
-    alsabar.channel = args.channel or alsabar.channel
-    alsabar.step = args.step or alsabar.step
-    alsabar.colors = args.colors or alsabar.colors
+    alsabar.cmd           = args.cmd or "amixer"
+    alsabar.channel       = args.channel or alsabar.channel
+    alsabar.step          = args.step or alsabar.step
+    alsabar.colors        = args.colors or alsabar.colors

     alsabar.notifications = args.notifications or alsabar.notifications
 
     alsabar.bar = awful.widget.progressbar()
     alsabar.notifications = args.notifications or alsabar.notifications
 
     alsabar.bar = awful.widget.progressbar()


@@ -115,7 +117,7 @@ local function worker(args)
 
     function alsabar.update()
         -- Get mixer control contents
 
     function alsabar.update()
         -- Get mixer control contents

-        local f = assert(io.popen(string.format("amixer -c %s -M get %s", alsabar.card, alsabar.channel)))
+        local f = assert(io.popen(string.format("%s get %s", alsabar.cmd, alsabar.channel)))

         local mixer = f:read("*a")
         f:close()
 
         local mixer = f:read("*a")
         f:close()