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.
4 Licensed under GNU General Public License v2
5 * (c) 2013, Luke Bonham
6 * (c) 2010, Adrian C. <anrxc@sysphere.org>
10 local helpers = require("lain.helpers")
11 local async = require("lain.asyncshell")
13 local escape_f = require("awful.util").escape
14 local naughty = require("naughty")
15 local wibox = require("wibox")
17 local os = { execute = os.execute,
19 local math = { floor = math.floor }
23 >>>>>>> upstream/master
24 local string = { format = string.format,
26 gmatch = string.gmatch }
28 local setmetatable = setmetatable
34 local function worker(args)
35 local args = args or {}
36 local timeout = args.timeout or 2
37 local password = args.password or ""
38 local host = args.host or "127.0.0.1"
39 local port = args.port or "6600"
40 local music_dir = args.music_dir or os.getenv("HOME") .. "/Music"
41 local cover_size = args.cover_size or 100
42 local default_art = args.default_art or ""
45 local followmouse = args.followmouse or false
46 local echo_cmd = args.echo_cmd or "echo"
47 >>>>>>> upstream/master
48 local settings = args.settings or function() end
50 local mpdcover = helpers.scripts_dir .. "mpdcover"
51 local mpdh = "telnet://" .. host .. ":" .. port
53 local echo = "echo 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
55 local echo = echo_cmd .. " 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
56 >>>>>>> upstream/master
58 mpd.widget = wibox.widget.textbox('')
60 mpd_notification_preset = {
61 title = "Now playing",
65 helpers.set_map("current mpd track", nil)
68 async.request(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh, function (f)
81 for line in f:lines() do
83 for line in string.gmatch(f, "[^\n]+") do
84 >>>>>>> upstream/master
85 for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do
86 if k == "state" then mpd_now.state = v
87 elseif k == "file" then mpd_now.file = v
88 elseif k == "Artist" then mpd_now.artist = escape_f(v)
89 elseif k == "Title" then mpd_now.title = escape_f(v)
90 elseif k == "Album" then mpd_now.album = escape_f(v)
91 elseif k == "Date" then mpd_now.date = escape_f(v)
92 elseif k == "Time" then mpd_now.time = v
93 elseif k == "elapsed" then mpd_now.elapsed = string.match(v, "%d+")
98 mpd_notification_preset.text = string.format("%s (%s) - %s\n%s", mpd_now.artist,
99 mpd_now.album, mpd_now.date, mpd_now.title)
103 if mpd_now.state == "play"
105 if mpd_now.title ~= helpers.get_map("current mpd track")
107 helpers.set_map("current mpd track", mpd_now.title)
110 if string.match(mpd_now.file, "http://") == nil
112 if string.match(mpd_now.file, "http.*://") == nil
113 >>>>>>> upstream/master
115 os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir,
116 mpd_now.file, cover_size, default_art))
117 current_icon = "/tmp/mpdcover.png"
119 current_icon = default_art
125 mpd_notification_preset.screen = mouse.screen
128 >>>>>>> upstream/master
129 mpd.id = naughty.notify({
130 preset = mpd_notification_preset,
132 replaces_id = mpd.id,
135 elseif mpd_now.state ~= "pause"
137 helpers.set_map("current mpd track", nil)
142 helpers.newtimer("mpd", timeout, mpd.update)
144 return setmetatable(mpd, { __index = mpd.widget })
147 return setmetatable(mpd, { __call = function(_, ...) return worker(...) end })