X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/66dde90206fe181cbe49d236925a8d4e6a86ec54..c75eff7fc0f24d80f9b7a97e87149c199fbb7cec:/widgets/mpd.lua?ds=sidebyside diff --git a/widgets/mpd.lua b/widgets/mpd.lua index e3ed50d..d8bcd78 100644 --- a/widgets/mpd.lua +++ b/widgets/mpd.lua @@ -10,13 +10,14 @@ local helpers = require("lain.helpers") local escape_f = require("awful.util").escape +local surface = require("gears").surface 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 @@ -28,7 +29,7 @@ local mpd = {} local function worker(args) local args = args or {} local timeout = args.timeout or 2 - local password = args.password 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" @@ -59,7 +60,7 @@ local function worker(args) 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 @@ -91,7 +92,7 @@ local function worker(args) mpd.id = naughty.notify({ preset = mpd_notification_preset, - icon = "/tmp/mpdcover.png", + icon = surface.load_uncached("/tmp/mpdcover.png"), replaces_id = mpd.id }).id end