madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@git.madduck.net.
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged.
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
local os = { execute = os.execute,
getenv = os.getenv }
local math = { floor = math.floor }
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 string = { format = string.format,
match = string.match,
gmatch = string.gmatch }
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 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 followmouse = args.followmouse or false
+ local echo_cmd = args.echo_cmd or "echo"
local settings = args.settings or function() end
local mpdcover = helpers.scripts_dir .. "mpdcover"
local mpdh = "telnet://" .. host .. ":" .. port
local settings = args.settings or function() end
local mpdcover = helpers.scripts_dir .. "mpdcover"
local mpdh = "telnet://" .. host .. ":" .. port
- local echo = "echo 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
+ local echo = echo_cmd .. " 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
mpd.widget = wibox.widget.textbox('')
mpd.widget = wibox.widget.textbox('')
mpd_now = {
state = "N/A",
file = "N/A",
mpd_now = {
state = "N/A",
file = "N/A",
artist = "N/A",
title = "N/A",
album = "N/A",
artist = "N/A",
title = "N/A",
album = "N/A",
- for line in f:lines() do
+ for line in string.gmatch(f, "[^\n]+") 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
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 == "Name" then mpd_now.name = escape_f(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 == "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)
then
helpers.set_map("current mpd track", mpd_now.title)
then
helpers.set_map("current mpd track", mpd_now.title)
- if string.match(mpd_now.file, "http://") == nil
+ 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))
then -- local file
os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir,
mpd_now.file, cover_size, default_art))
current_icon = default_art
end
current_icon = default_art
end
+ if followmouse then
+ mpd_notification_preset.screen = mouse.screen
+ end
+
mpd.id = naughty.notify({
preset = mpd_notification_preset,
icon = current_icon,
mpd.id = naughty.notify({
preset = mpd_notification_preset,
icon = current_icon,