X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0279482eeb5867f49b4efc83d591393f9c3d0adb..43cd98510a33e9f2d50d315a9bfc31ff8d3062c9:/widgets/contrib/moc.lua diff --git a/widgets/contrib/moc.lua b/widgets/contrib/moc.lua index f19b0d3..3566985 100644 --- a/widgets/contrib/moc.lua +++ b/widgets/contrib/moc.lua @@ -7,17 +7,14 @@ --]] local helpers = require("lain.helpers") - local shell = require("awful.util").shell local focused = require("awful.screen").focused local escape_f = require("awful.util").escape local naughty = require("naughty") local wibox = require("wibox") - local os = { getenv = os.getenv } local string = { format = string.format, gmatch = string.gmatch } - local setmetatable = setmetatable -- MOC audio player @@ -82,8 +79,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) @@ -94,9 +91,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 })