--]]
local helpers = require("lain.helpers")
-local async = require("lain.asyncshell")
-
+local shell = require("awful.util").shell
local escape_f = require("awful.util").escape
+local focused = require("awful.screen").focused
local naughty = require("naughty")
local wibox = require("wibox")
-
-local os = { execute = os.execute,
- getenv = os.getenv }
-local math = { floor = math.floor }
-local mouse = mouse
-local string = { format = string.format,
- match = string.match,
- gmatch = string.gmatch }
-
+local os = { getenv = os.getenv }
+local string = { format = string.format,
+ gmatch = string.gmatch,
+ match = string.match }
local setmetatable = setmetatable
-- MPD infos
-- lain.widgets.mpd
-local mpd = {}
+local mpd = helpers.make_widget_textbox()
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 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 echo = echo_cmd .. " 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
-
- mpd.widget = wibox.widget.textbox('')
-
- mpd_notification_preset = {
- title = "Now playing",
- timeout = 6
- }
+ local args = args or {}
+ local timeout = args.timeout or 2
+ local password = (args.password and #args.password > 0 and string.format("password %s\\n", 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_pattern = args.cover_pattern or "*\\.(jpg|jpeg|png|gif)$"
+ local cover_size = args.cover_size or 100
+ local default_art = args.default_art or ""
+ local notify = args.notify or "on"
+ local followtag = args.followtag or false
+ local settings = args.settings or function() end
+
+ local mpdh = string.format("telnet://%s:%s", host, port)
+ local echo = string.format("printf \"%sstatus\\ncurrentsong\\nclose\\n\"", password)
+ local cmd = string.format("%s | curl --connect-timeout 1 -fsm 3 %s", echo, mpdh)
+
+ mpd_notification_preset = { title = "Now playing", timeout = 6 }
helpers.set_map("current mpd track", nil)
function mpd.update()
- async.request(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh, function (f)
+ helpers.async({ shell, "-c", cmd }, function(f)
mpd_now = {
- state = "N/A",
- file = "N/A",
- artist = "N/A",
- title = "N/A",
- album = "N/A",
- date = "N/A",
- time = "N/A",
- elapsed = "N/A"
+ random_mode = false,
+ single_mode = false,
+ repeat_mode = false,
+ consume_mode = false,
+ pls_pos = "N/A",
+ pls_len = "N/A",
+ state = "N/A",
+ file = "N/A",
+ name = "N/A",
+ artist = "N/A",
+ title = "N/A",
+ album = "N/A",
+ genre = "N/A",
+ track = "N/A",
+ date = "N/A",
+ time = "N/A",
+ elapsed = "N/A"
}
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
- 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+")
+ 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 == "Genre" then mpd_now.genre = escape_f(v)
+ elseif k == "Track" then mpd_now.track = 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+")
+ elseif k == "song" then mpd_now.pls_pos = v
+ elseif k == "playlistlength" then mpd_now.pls_len = v
+ elseif k == "repeat" then mpd_now.repeat_mode = v ~= "0"
+ elseif k == "single" then mpd_now.single_mode = v ~= "0"
+ elseif k == "random" then mpd_now.random_mode = v ~= "0"
+ elseif k == "consume" then mpd_now.consume_mode = v ~= "0"
end
end
end
widget = mpd.widget
settings()
- if mpd_now.state == "play"
- then
- if mpd_now.title ~= helpers.get_map("current mpd track")
- then
+ if mpd_now.state == "play" then
+ if notify == "on" and mpd_now.title ~= helpers.get_map("current mpd track") then
helpers.set_map("current mpd track", mpd_now.title)
- 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
+ if followtag then mpd_notification_preset.screen = focused() end
- if followmouse then
- mpd_notification_preset.screen = mouse.screen
+ local common = {
+ preset = mpd_notification_preset,
+ icon = default_art,
+ icon_size = cover_size,
+ replaces_id = mpd.id,
+ }
+
+ if not string.match(mpd_now.file, "http.*://") then -- local file instead of http stream
+ local path = string.format("%s/%s", music_dir, string.match(mpd_now.file, ".*/"))
+ local cover = string.format("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", path, cover_pattern)
+ helpers.async({ shell, "-c", cover }, function(current_icon)
+ common.icon = current_icon:gsub("\n", "")
+ mpd.id = naughty.notify(common).id
+ end)
+ else
+ mpd.id = naughty.notify(common).id
end
- mpd.id = naughty.notify({
- preset = mpd_notification_preset,
- icon = current_icon,
- replaces_id = mpd.id,
- }).id
end
- elseif mpd_now.state ~= "pause"
- then
+ elseif mpd_now.state ~= "pause" then
helpers.set_map("current mpd track", nil)
end
end)
end
- helpers.newtimer("mpd", timeout, mpd.update)
+ mpd.timer = helpers.newtimer("mpd", timeout, mpd.update, true, true)
- return setmetatable(mpd, { __index = mpd.widget })
+ return mpd
end
return setmetatable(mpd, { __call = function(_, ...) return worker(...) end })
projects / etc / awesome.git / blobdiff