X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0279482eeb5867f49b4efc83d591393f9c3d0adb..d9877c4bedca550478507f268f43e137e4454c24:/widgets/mpd.lua?ds=sidebyside

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index defa710..df26422 100644
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -8,18 +8,15 @@
 --]]
 
 local helpers      = require("lain.helpers")
-
 local shell        = require("awful.util").shell
 local escape_f     = require("awful.util").escape
 local focused      = require("awful.screen").focused
 local naughty      = require("naughty")
 local wibox        = require("wibox")
-
 local os           = { getenv = os.getenv }
 local string       = { format = string.format,
                        gmatch = string.gmatch,
                        match  = string.match }
-
 local setmetatable = setmetatable
 
 -- MPD infos
@@ -42,14 +39,14 @@ local function worker(args)
 
     local mpdh = string.format("telnet://%s:%s", host, port)
     local echo = string.format("printf \"%sstatus\\ncurrentsong\\nclose\\n\"", password)
-    local cmd  = string.format("%s -c '%s | curl --connect-timeout 1 -fsm 3 %s'", shell, echo, mpdh)
+    local cmd  = string.format("%s | curl --connect-timeout 1 -fsm 3 %s", echo, mpdh)
 
     mpd_notification_preset = { title = "Now playing", timeout = 6 }
 
     helpers.set_map("current mpd track", nil)
 
     function mpd.update()
-        helpers.async(cmd, function(f)
+        helpers.async({ shell, "-c", cmd }, function(f)
             mpd_now = {
                 random_mode  = false,
                 single_mode  = false,
@@ -113,8 +110,8 @@ local function worker(args)
 
                     if not string.match(mpd_now.file, "http.*://") then -- local file instead of http stream
                         local path   = string.format("%s/%s", music_dir, string.match(mpd_now.file, ".*/"))
-                        local cover  = string.format("%s -c \"find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'\"", shell, path, cover_pattern)
-                        helpers.async(cover, function(current_icon)
+                        local cover  = string.format("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", path, cover_pattern)
+                        helpers.async({ shell, "-c", cover }, function(current_icon)
                             common.icon = current_icon:gsub("\n", "")
                             mpd.id = naughty.notify(common).id
                         end)
@@ -129,9 +126,9 @@ local function worker(args)
         end)
     end
 
-    helpers.newtimer("mpd", timeout, mpd.update)
+    mpd.timer = helpers.newtimer("mpd", timeout, mpd.update, true, true)
 
-    return mpd
+    return setmetatable(mpd, { __index = imap.widget })
 end
 
 return setmetatable(mpd, { __call = function(_, ...) return worker(...) end })