X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/bbe0b1903dbf0edfa996a2ef5225f00698643edc..f291bd62b75e4d18b6e96fff845c3597640d92a7:/widgets/mpd.lua?ds=inline diff --git a/widgets/mpd.lua b/widgets/mpd.lua index 9054c22..a0b7192 100644 --- a/widgets/mpd.lua +++ b/widgets/mpd.lua @@ -14,10 +14,11 @@ local escape_f = require("awful.util").escape local naughty = require("naughty") local wibox = require("wibox") -local io = { popen = io.popen } local os = { execute = os.execute, getenv = os.getenv } +local math = { floor = math.floor } local string = { format = string.format, + match = string.match, gmatch = string.gmatch } local setmetatable = setmetatable @@ -39,7 +40,7 @@ local function worker(args) local mpdcover = helpers.scripts_dir .. "mpdcover" local mpdh = "telnet://" .. host .. ":" .. port - local echo = "echo 'password " .. password .. "\nstatus\ncurrentsong\nclose'" + local echo = "/bin/echo -e 'password " .. password .. "\nstatus\ncurrentsong\nclose'" mpd.widget = wibox.widget.textbox('') @@ -65,14 +66,14 @@ local function worker(args) for line in f:lines() do for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do - if k = = "state" then mpd_now.state = v - elseif k = = "file" then mpd_now.file = v - elseif k = = "Artist" then mpd_now.artist = escape_f(v) - elseif k = = "Title" then mpd_now.title = escape_f(v) - elseif k = = "Album" then mpd_now.album = escape_f(v) - elseif k = = "Date" then mpd_now.date = escape_f(v) - elseif k = = "Time" then mpd_now.time = v - elseif k = = "elapsed" then mpd_now.elapsed = math.floor(v) + if k == "state" then mpd_now.state = v + elseif k == "file" then mpd_now.file = v + elseif k == "Artist" then mpd_now.artist = escape_f(v) + elseif k == "Title" then mpd_now.title = escape_f(v) + elseif k == "Album" then mpd_now.album = escape_f(v) + elseif k == "Date" then mpd_now.date = escape_f(v) + elseif k == "Time" then mpd_now.time = v + elseif k == "elapsed" then mpd_now.elapsed = string.match(v, "%d+") end end end @@ -88,12 +89,18 @@ local function worker(args) then helpers.set_map("current mpd track", mpd_now.title) - os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir, - mpd_now.file, cover_size, default_art)) + if string.match(mpd_now.file, "http.*://") == nil + then -- local file + os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir, + mpd_now.file, cover_size, default_art)) + current_icon = "/tmp/mpdcover.png" + else -- http stream + current_icon = default_art + end mpd.id = naughty.notify({ preset = mpd_notification_preset, - icon = "/tmp/mpdcover.png", + icon = current_icon, replaces_id = mpd.id, }).id end