wiki updated

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 99624a22e6b03059e026c17a5dbe75f16cd541dd..5af898b482ff5dd1f97635fb5ab6e50bf004eced 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -14,10 +14,12 @@ local escape_f     = require("awful.util").escape
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local io           = { popen    = io.popen }
 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 setmetatable = setmetatable
@@ -35,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 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('')
 
@@ -53,26 +57,26 @@ local function worker(args)
     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"
+                state   = "N/A",
+                file    = "N/A",
+                artist  = "N/A",
+                title   = "N/A",
+                album   = "N/A",
+                date    = "N/A",
+                time    = "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
-                    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= math.floor(v)
+                    if     k == "state"   then mpd_now.state   = v
+                    elseif k == "file"    then mpd_now.file    = 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+")
                     end
                 end
             end
@@ -88,12 +92,22 @@ local function worker(args)
                 then
                     helpers.set_map("current mpd track", mpd_now.title)
 
-                    os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir,
-                               mpd_now.file, cover_size, default_art))
+                    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))
+                        current_icon = "/tmp/mpdcover.png"
+                    else -- http stream
+                        current_icon = default_art
+                    end
+
+                    if followmouse then
+                        mpd_notification_preset.screen = mouse.screen
+                    end
 
                     mpd.id = naughty.notify({
                         preset = mpd_notification_preset,
-                        icon = "/tmp/mpdcover.png",
+                        icon = current_icon,
                         replaces_id = mpd.id,
                     }).id
                 end