X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6cce5b6fe11fe8c69b08140d645c604fef59e42a..622203e9c72e8ece969ee9d897ae6dd9b84cf637:/widgets/contrib/moc.lua?ds=inline

diff --git a/widgets/contrib/moc.lua b/widgets/contrib/moc.lua
index 44f46a6..6fe96a1 100644
--- a/widgets/contrib/moc.lua
+++ b/widgets/contrib/moc.lua
@@ -19,7 +19,7 @@ local setmetatable = setmetatable
 
 -- MOC audio player
 -- lain.widgets.contrib.moc
-local moc = helpers.make_widget_textbox()
+local moc = {}
 
 local function worker(args)
     local args          = args or {}
@@ -31,6 +31,8 @@ local function worker(args)
     local followtag     = args.followtag or false
     local settings      = args.settings or function() end
 
+    moc.widget = wibox.widget.textbox()
+
     moc_notification_preset = { title = "Now playing", timeout = 6 }
 
     helpers.set_map("current moc track", nil)
@@ -79,8 +81,8 @@ local function worker(args)
                     }
 
                     local path   = string.format("%s/%s", music_dir, string.match(moc_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", "")
                         moc.id = naughty.notify(common).id
                     end)
@@ -91,9 +93,9 @@ local function worker(args)
         end)
     end
 
-    helpers.newtimer("moc", timeout, moc.update)
+    moc.timer = helpers.newtimer("moc", timeout, moc.update, true, true)
 
-    return setmetatable(moc, { __index = moc.widget })
+    return moc
 end
 
 return setmetatable(moc, { __call = function(_, ...) return worker(...) end })