Merge branch 'master' of github.com:copycat-killer/lain

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 6b66f8138f06a2d49395e06602933185adb3ef6f..1d2c61737895c27c9c2d7550f3f3ad1636e6215a 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 mouse        = mouse
 local string       = { format   = string.format,
                        match    = string.match,
                        gmatch   = string.gmatch }
@@ -29,27 +30,30 @@ local mpd = {}
 
 local function worker(args)
     local args        = args or {}
-    local timeout     = args.timeout or 2
+    local timeout     = args.timeout or 1
     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 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 echo = "echo 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
+    local echo = echo_cmd .. " 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
 
     mpd.widget = wibox.widget.textbox('')
 
     mpd_notification_preset = {
         title   = "Now playing",
-        timeout = 6
+        timeout = 5
     }
 
-    helpers.set_map("current mpd track", nil)
+    helpers.set_map("current mpd track", "")
+    helpers.set_map("current mpd file", "")
 
     function mpd.update()
         async.request(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh, function (f)
@@ -64,10 +68,11 @@ local function worker(args)
                 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
+                    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)
@@ -80,8 +85,13 @@ local function worker(args)
 
             mpd_notification_preset.text = string.format("%s (%s) - %s\n%s", mpd_now.artist,
                                            mpd_now.album, mpd_now.date, mpd_now.title)
-            widget = mpd.widget
-            settings()
+
+            if mpd_now.file ~= helpers.get_map("current mpd file")
+            then
+                widget = mpd.widget
+                settings()
+                helpers.set_map("current mpd file", mpd_now.file)
+            end
 
             if mpd_now.state == "play"
             then
@@ -89,7 +99,7 @@ local function worker(args)
                 then
                     helpers.set_map("current mpd track", mpd_now.title)
 
-                    if string.match(mpd_now.file, "http://") == nil
+                    if string.match(mpd_now.file, "http.*://") == nil
                     then -- local file
                         os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir,
                                    mpd_now.file, cover_size, default_art))
@@ -98,6 +108,10 @@ local function worker(args)
                         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,