X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8c2e1df0c3f648ed70e52fab38a176e2f924407b..2c1eb09080947d4f587e001497f12c6084babffa:/widgets/mpd.lua?ds=inline

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index aad4dc8..ddedf24 100644
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -21,7 +21,7 @@ local setmetatable = setmetatable
 
 -- MPD infos
 -- lain.widgets.mpd
-local mpd = helpers.make_widget_textbox()
+local mpd = {}
 
 local function worker(args)
     local args          = args or {}
@@ -41,6 +41,8 @@ local function worker(args)
     local echo = string.format("printf \"%sstatus\\ncurrentsong\\nclose\\n\"", password)
     local cmd  = string.format("%s | curl --connect-timeout 1 -fsm 3 %s", echo, mpdh)
 
+    mpd.widget = wibox.widget.textbox()
+
     mpd_notification_preset = { title = "Now playing", timeout = 6 }
 
     helpers.set_map("current mpd track", nil)
@@ -110,7 +112,7 @@ 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("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", path, cover_pattern)
+                        local cover  = string.format("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", path:gsub("'", "'\\''"), cover_pattern)
                         helpers.async({ shell, "-c", cover }, function(current_icon)
                             common.icon = current_icon:gsub("\n", "")
                             if #common.icon == 0 then common.icon = nil end
@@ -129,7 +131,7 @@ local function worker(args)
 
     mpd.timer = helpers.newtimer("mpd", timeout, mpd.update, true, true)
 
-    return setmetatable(mpd, { __index = mpd.widget })
+    return mpd
 end
 
 return setmetatable(mpd, { __call = function(_, ...) return worker(...) end })