#199 #203 fix attempt 2

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index d5f07a800c6dd2dd787f51bb794d05019ccfe3d6..b0ab28f253fe32d8a3773cecc654bf7d87f6203b 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -37,6 +37,7 @@ local function worker(args)
     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 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 notify      = args.notify or "on"

     local followmouse = args.followmouse or false
     local echo_cmd    = args.echo_cmd or "echo"
     local settings    = args.settings or function() end
     local followmouse = args.followmouse or false
     local echo_cmd    = args.echo_cmd or "echo"
     local settings    = args.settings or function() end


@@ -59,6 +60,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",


@@ -67,10 +69,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)


@@ -88,7 +91,7 @@ local function worker(args)
 
             if mpd_now.state == "play"
             then
 
             if mpd_now.state == "play"
             then

-                if mpd_now.title ~= helpers.get_map("current mpd track")
+                if notify == "on" and mpd_now.title ~= helpers.get_map("current mpd track")

                 then
                     helpers.set_map("current mpd track", mpd_now.title)
 
                 then
                     helpers.set_map("current mpd track", mpd_now.title)