pull #201 fixes

[etc/awesome.git] / widgets / mpd.lua

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 642a556b4e760f4fa4b7983d9592a17f6881913f..19720509c8d247a955aad076360974ef22841d92 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -38,11 +38,12 @@ local function worker(args)
     local cover_size  = args.cover_size or 100
     local default_art = args.default_art or ""
     local followmouse = args.followmouse or false
     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 settings    = args.settings or function() end
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
     local mpdh = "telnet://" .. host .. ":" .. port

-    local echo = "/bin/echo -e 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
+    local echo = echo_cmd .. " 'password " .. password .. "\nstatus\ncurrentsong\nclose'"

 
     mpd.widget = wibox.widget.textbox('')
 
 
     mpd.widget = wibox.widget.textbox('')
 


@@ -58,6 +59,7 @@ local function worker(args)
             mpd_now = {
                 state   = "N/A",
                 file    = "N/A",
             mpd_now = {
                 state   = "N/A",
                 file    = "N/A",

+                name    = "N/A",

                 artist  = "N/A",
                 title   = "N/A",
                 album   = "N/A",
                 artist  = "N/A",
                 title   = "N/A",
                 album   = "N/A",


@@ -66,10 +68,11 @@ local function worker(args)
                 elapsed = "N/A"
             }
 
                 elapsed = "N/A"
             }
 

-            for line in f:lines() do
+            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
                 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 == "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)