X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/912bd26ede8901c98fd8d7a35f8493ee448109ad..9e78c8d1219c7406d0cd8a3394fec4c4f27134e0:/widgets/mpd.lua

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 1d2c617..8568764 100644
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -14,13 +14,13 @@ local escape_f     = require("awful.util").escape
 local naughty      = require("naughty")
 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 }
 
 local setmetatable = setmetatable
 
@@ -30,13 +30,14 @@ local mpd = {}
 
 local function worker(args)
     local args        = args or {}
-    local timeout     = args.timeout or 1
+    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 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
@@ -49,53 +50,60 @@ local function worker(args)
 
     mpd_notification_preset = {
         title   = "Now playing",
-        timeout = 5
+        timeout = 6
     }
 
-    helpers.set_map("current mpd track", "")
-    helpers.set_map("current mpd file", "")
+    helpers.set_map("current mpd track", nil)
 
     function mpd.update()
         async.request(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh, function (f)
             mpd_now = {
-                state   = "N/A",
-                file    = "N/A",
-                artist  = "N/A",
-                title   = "N/A",
-                album   = "N/A",
-                date    = "N/A",
-                time    = "N/A",
-                elapsed = "N/A"
+                random_mode  = false,
+                single_mode  = false,
+                repeat_mode  = false,
+                consume_mode = false,
+                pls_pos      = "N/A",
+                pls_len      = "N/A",
+                state        = "N/A",
+                file         = "N/A",
+                name         = "N/A",
+                artist       = "N/A",
+                title        = "N/A",
+                album        = "N/A",
+                date         = "N/A",
+                time         = "N/A",
+                elapsed      = "N/A"
             }
 
             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)
-                    elseif k == "Date"    then mpd_now.date    = escape_f(v)
-                    elseif k == "Time"    then mpd_now.time    = v
-                    elseif k == "elapsed" then mpd_now.elapsed = string.match(v, "%d+")
+                    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 == "Date"           then mpd_now.date         = escape_f(v)
+                    elseif k == "Time"           then mpd_now.time         = v
+                    elseif k == "elapsed"        then mpd_now.elapsed      = string.match(v, "%d+")
+                    elseif k == "song"           then mpd_now.pls_pos      = v
+                    elseif k == "playlistlength" then mpd_now.pls_len      = v
+                    elseif k == "repeat"         then mpd_now.repeat_mode  = v ~= "0"
+                    elseif k == "single"         then mpd_now.single_mode  = v ~= "0"
+                    elseif k == "random"         then mpd_now.random_mode  = v ~= "0"
+                    elseif k == "consume"        then mpd_now.consume_mode = v ~= "0"
                     end
                 end
             end
 
             mpd_notification_preset.text = string.format("%s (%s) - %s\n%s", mpd_now.artist,
                                            mpd_now.album, mpd_now.date, mpd_now.title)
-
-            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
+            widget = mpd.widget
+            settings()
 
             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)