X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/046b0279b0f3eb827bcc2b2e395e6ea69c019733..c155301459aa73a1b5e9a1b674be12f03021c4fe:/widgets/mpd.lua?ds=sidebyside diff --git a/widgets/mpd.lua b/widgets/mpd.lua index dcb7101..ddedf24 100644 --- a/widgets/mpd.lua +++ b/widgets/mpd.lua @@ -7,132 +7,131 @@ --]] -local markup = require("lain.util.markup") local helpers = require("lain.helpers") - -local awful = require("awful") -local beautiful = require("beautiful") +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 io = io -local os = { execute = os.execute, - getenv = os.getenv } -local string = { 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 = { id = nil } - -function worker(args) - local args = args or {} - 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 refresh_timeout = args.refresh_timeout or 1 - local notify_timeout = args.notify_timeout or 5 - local color_artist = args.color_artist or beautiful.fg_normal or "#FFFFFF" - local color_song = args.color_song or beautiful.fg_focus or "#FFFFFF" - local spr = args.spr or "" - local musicplr = args.musicplr or "ncmpcpp" - local shadow = args.shadow or false - - local mpdcover = helpers.scripts_dir .. "mpdcover" - local mpdh = "telnet://"..host..":"..port - local echo = "echo 'password "..password.."\nstatus\ncurrentsong\nclose'" - - local mympd = wibox.widget.textbox() +local mpd = {} + +local function worker(args) + 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 + 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.widget = wibox.widget.textbox() + + mpd_notification_preset = { title = "Now playing", timeout = 6 } helpers.set_map("current mpd track", nil) - local mympdupdate = function() - local function set_nompd() - if shadow - then - mympd:set_text('') - else - mympd:set_markup(markup(color_artist, " mpd "), markup(color_song , "off ")) - end - end - - local mpd_state = { - ["{state}"] = "N/A", - ["{file}"] = "N/A", - ["{Artist}"] = "N/A", - ["{Title}"] = "N/A", - ["{Album}"] = "N/A", - ["{Date}"] = "N/A" - } - - -- Get data from MPD server - 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_state["{"..k.."}"] = v - elseif k == "file" then mpd_state["{"..k.."}"] = v - elseif k == "Artist" then mpd_state["{"..k.."}"] = awful.util.escape(v) - elseif k == "Title" then mpd_state["{"..k.."}"] = awful.util.escape(v) - elseif k == "Album" then mpd_state["{"..k.."}"] = awful.util.escape(v) - elseif k == "Date" then mpd_state["{"..k.."}"] = awful.util.escape(v) + function mpd.update() + helpers.async({ shell, "-c", cmd }, function(f) + mpd_now = { + 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 == "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 - end - - f:close() - - if mpd_state["{state}"] == "play" - then - if mpd_state["{Title}"] ~= helpers.get_map("current mpd track") - then - helpers.set_map("current mpd track", mpd_state["{Title}"]) - os.execute(mpdcover .. " '" .. music_dir .. "' '" - .. mpd_state["{file}"] .. "'") - mpd.id = naughty.notify({ - title = "Now playing", - text = mpd_state["{Artist}"] .. " (" .. - mpd_state["{Album}"] .. ") - " .. - mpd_state["{Date}"] .. "\n" .. - mpd_state["{Title}"], - icon = "/tmp/mpdcover.png", - fg = beautiful.fg_focus or "#FFFFFF", - bg = beautiful.bg_normal or "#000000" , - timeout = notify_timeout, - replaces_id = mpd.id - }).id - end - mympd:set_markup(markup(color_artist, " " .. mpd_state["{Artist}"]) - .. spr .. - markup(color_song, " " .. mpd_state["{Title}"] .. " ")) - elseif mpd_state["{state}"] == "pause" - then - mympd:set_markup(markup(color_artist, " mpd") - .. spr .. - markup(color_song, " paused ")) - else - helpers.set_map("current mpd track", nil) - set_nompd() - end - end - local mympdtimer = timer({ timeout = refresh_timeout }) - mympdtimer:connect_signal("timeout", mympdupdate) - mympdtimer:start() - mympdtimer:emit_signal("timeout") + mpd_notification_preset.text = string.format("%s (%s) - %s\n%s", mpd_now.artist, + mpd_now.album, mpd_now.date, mpd_now.title) + widget = mpd.widget + settings() + + 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 followtag then mpd_notification_preset.screen = focused() end + + 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:gsub("'", "'\\''"), cover_pattern) + helpers.async({ shell, "-c", cover }, function(current_icon) + common.icon = current_icon:gsub("\n", "") + if #common.icon == 0 then common.icon = nil end + mpd.id = naughty.notify(common).id + end) + else + mpd.id = naughty.notify(common).id + end - mympd:buttons(awful.util.table.join( - awful.button({}, 0, - function() - helpers.run_in_terminal(musicplr) - end) - )) + end + elseif mpd_now.state ~= "pause" then + helpers.set_map("current mpd track", nil) + end + end) + end - local mpd_out = { widget = mympd, notify = mympdupdate } + mpd.timer = helpers.newtimer("mpd", timeout, mpd.update, true, true) - return setmetatable(mpd_out, { __index = mpd_out.widget }) + return mpd end return setmetatable(mpd, { __call = function(_, ...) return worker(...) end })