X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/fe32af5f4343a117d6ac3553095a9c3aefb98587..f2fd571bee7cd5aa0a38f0649868ab042023698d:/widgets/mpd.lua?ds=sidebyside diff --git a/widgets/mpd.lua b/widgets/mpd.lua index 3ebc761..1749b57 100644 --- a/widgets/mpd.lua +++ b/widgets/mpd.lua @@ -16,7 +16,7 @@ local wibox = require("wibox") local io = { popen = io.popen } local os = { execute = os.execute, getenv = os.getenv } -local string = { format = string.format, +local string = { format = string.format, gmatch = string.gmatch } local setmetatable = setmetatable @@ -26,14 +26,15 @@ local setmetatable = setmetatable local mpd = {} local function worker(args) - local args = args or {} - local timeout = args.timeout or 2 - local password = args.password or "" - local host = args.host or "127.0.0.1" - local port = args.port or "6600" - local music_dir = args.music_dir or os.getenv("HOME") .. "/Music" - local cover_size = args.cover_size or 100 - local settings = args.settings or function() end + local args = args or {} + local timeout = args.timeout or 2 + local password = args.password or "" + local host = args.host or "127.0.0.1" + local port = args.port or "6600" + local music_dir = args.music_dir or os.getenv("HOME") .. "/Music" + local cover_size = args.cover_size or 100 + local default_art = args.default_art or "" + local settings = args.settings or function() end local mpdcover = helpers.scripts_dir .. "mpdcover" local mpdh = "telnet://" .. host .. ":" .. port @@ -58,7 +59,7 @@ local function worker(args) date = "N/A" } - local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 1 " .. mpdh) + local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh) for line in f:lines() do for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do @@ -85,8 +86,8 @@ local function worker(args) then helpers.set_map("current mpd track", mpd_now.title) - os.execute(string.format("%s %q %q %d", mpdcover, music_dir, - mpd_now.file, cover_size)) + os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir, + mpd_now.file, cover_size, default_art)) mpd.id = naughty.notify({ preset = mpd_notification_preset,