X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/c2d27aec72f3db1a795b9fce4828049cbf91dacd..2c2899893d7367071242c6339321987777320f54:/widgets/mpd.lua?ds=sidebyside

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 3ebc761..36c3ed7 100644
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -16,7 +16,7 @@ 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
@@ -26,18 +26,31 @@ local setmetatable = setmetatable
 local mpd = {}
 
 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 settings   = args.settings or function() end
+    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 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 = nil
+
+    if password == "" then
+        echo = "(echo -e 'status'; sleep 0.1;" ..
+               "echo -e 'currentsong'; sleep 0.1;" ..
+               "echo -e 'close')"
+    else
+        echo = "(echo -e 'password " .. password .. "'" ..
+               "echo -e 'status'; sleep 0.1;" ..
+               "echo -e 'currentsong'; sleep 0.1;" ..
+               "echo -e 'close')"
+    end
 
     mpd.widget = wibox.widget.textbox('')
 
@@ -85,8 +98,8 @@ local function worker(args)
             then
                 helpers.set_map("current mpd track", mpd_now.title)
 
-                os.execute(string.format("%s %q %q %d", mpdcover, music_dir,
-                           mpd_now.file, cover_size))
+                os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir,
+                           mpd_now.file, cover_size, default_art))
 
                 mpd.id = naughty.notify({
                     preset = mpd_notification_preset,