Merge pull request #96 from worron/master

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 9054c2249c82512e3caf1b67010c1e764cb63a6d..c10eb7804f77130ec9796cb8062f72e75961448f 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -14,10 +14,11 @@ 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 string       = { format   = string.format,
+                       match    = string.match,
                        gmatch   = string.gmatch }
 
 local setmetatable = setmetatable
@@ -65,14 +66,14 @@ local function worker(args)
 
             for line in f:lines() 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