local helpers = require("lain.helpers")
-local util = require("awful.util")
+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 string = { format = string.format,
+local string = { format = string.format,
gmatch = string.gmatch }
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 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
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
if k == "state" then mpd_now.state = v
elseif k == "file" then mpd_now.file = v
- elseif k == "Artist" then mpd_now.artist = util.escape(v)
- elseif k == "Title" then mpd_now.title = util.escape(v)
- elseif k == "Album" then mpd_now.album = util.escape(v)
- elseif k == "Date" then mpd_now.date = util.escape(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)
end
end
end
then
helpers.set_map("current mpd track", mpd_now.title)
- os.execute(string.format("%s %q %q", mpdcover, music_dir, mpd_now.file))
+ 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,