widgets fix

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 8ba1cde3c690ea100e0209ece5d8df8ea1c1db4a..cd97b37cb5fee86377b85d2bca9e218ecbddbdc2 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -10,24 +10,24 @@
 local helpers      = require("lain.helpers")
 
 local util         = require("awful.util")
-local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local io           = io
+local io           = { popen    = io.popen }
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
-local string       = { gmatch   = string.gmatch }
+local string       = { format   = string.format, 
+                       gmatch   = string.gmatch }
 
 local setmetatable = setmetatable
 
 -- MPD infos
 -- lain.widgets.mpd
-local mpd = { id = nil }
+local mpd = {}
 
-function worker(args)
+local function worker(args)
     local args      = args or {}
-    local timeout   = args.timeout or 1
+    local timeout   = args.timeout or 2
     local password  = args.password or ""
     local host      = args.host or "127.0.0.1"
     local port      = args.port or "6600"
@@ -38,11 +38,16 @@ function worker(args)
     local mpdh = "telnet://" .. host .. ":" .. port
     local echo = "echo 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
 
-    widget = wibox.widget.textbox('')
+    mpd.widget = wibox.widget.textbox('')
+
+    mpd_notification_preset = {
+        title   = "Now playing",
+        timeout = 6
+    }
 
     helpers.set_map("current mpd track", nil)
 
-    function update()
+    function mpd.update()
         mpd_now = {
             state  = "N/A",
             file   = "N/A",
@@ -52,7 +57,7 @@ function worker(args)
             date   = "N/A"
         }
 
-        local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh)
+        local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 1 " .. mpdh)
 
         for line in f:lines() do
             for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do
@@ -68,17 +73,9 @@ function worker(args)
 
         f:close()
 
-        notification_preset = {
-            title   = "Now playing",
-            text    = mpd_now.artist .. " ("   ..
-                      mpd_now.album  .. ") - " ..
-                      mpd_now.date   .. "\n"   ..
-                      mpd_now.title,
-            fg      = beautiful.fg_normal or "#FFFFFF",
-            bg      = beautiful.bg_normal or "#000000",
-            timeout = 6
-        }
-
+        mpd_notification_preset.text = string.format("%s (%s) - %s\n%s", mpd_now.artist,
+                                       mpd_now.album, mpd_now.date, mpd_now.title)
+        widget = mpd.widget
         settings()
 
         if mpd_now.state == "play"
@@ -87,11 +84,10 @@ function worker(args)
             then
                 helpers.set_map("current mpd track", mpd_now.title)
 
-                os.execute(mpdcover .. " '" .. music_dir .. "' '"
-                           .. mpd_now.file .. "'")
+                os.execute(string.format("%s %q %q", mpdcover, music_dir, mpd_now.file))
 
                 mpd.id = naughty.notify({
-                    preset = notification_preset,
+                    preset = mpd_notification_preset,
                     icon = "/tmp/mpdcover.png",
                     replaces_id = mpd.id
                 }).id
@@ -102,11 +98,9 @@ function worker(args)
              end
     end
 
-    helpers.newtimer("mpd", timeout, update)
-
-    output = { widget = widget, notify = update }
+    helpers.newtimer("mpd", timeout, mpd.update)
 
-    return setmetatable(output, { __index = output.widget })
+    return setmetatable(mpd, { __index = mpd.widget })
 end
 
 return setmetatable(mpd, { __call = function(_, ...) return worker(...) end })