Merge pull request #190 from aajjbb/master

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index a0b71924e7e34cbde33ee26b94fb4157322a5988..19720509c8d247a955aad076360974ef22841d92 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -17,6 +17,7 @@ local wibox        = require("wibox")
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
 local math         = { floor    = math.floor }
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
 local math         = { floor    = math.floor }

+local mouse        = mouse

 local string       = { format   = string.format,
                        match    = string.match,
                        gmatch   = string.gmatch }
 local string       = { format   = string.format,
                        match    = string.match,
                        gmatch   = string.gmatch }


@@ -36,11 +37,13 @@ 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 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('')
 


@@ -56,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",


@@ -64,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)


@@ -98,6 +103,10 @@ local function worker(args)
                         current_icon = default_art
                     end
 
                         current_icon = default_art
                     end
 

+                    if followmouse then
+                        mpd_notification_preset.screen = mouse.screen
+                    end
+

                     mpd.id = naughty.notify({
                         preset = mpd_notification_preset,
                         icon = current_icon,
                     mpd.id = naughty.notify({
                         preset = mpd_notification_preset,
                         icon = current_icon,