#121: io.read abbreviations removed

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 0d43e34eda44887b6226fa55da3d97b596e56084..6b66f8138f06a2d49395e06602933185adb3ef6f 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 naughty      = require("naughty")
 local wibox        = require("wibox")
 

-local io           = { popen    = io.popen }

 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }

+local math         = { floor    = math.floor }

 local string       = { format   = string.format,
 local string       = { format   = string.format,

+                       match    = string.match,

                        gmatch   = string.gmatch }
 
 local setmetatable = setmetatable
                        gmatch   = string.gmatch }
 
 local setmetatable = setmetatable


@@ -72,7 +73,7 @@ local function worker(args)
                     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 == "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)
+                    elseif k == "elapsed" then mpd_now.elapsed = string.match(v, "%d+")

                     end
                 end
             end
                     end
                 end
             end


@@ -88,12 +89,18 @@ local function worker(args)
                 then
                     helpers.set_map("current mpd track", mpd_now.title)
 
                 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

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

-                        icon = "/tmp/mpdcover.png",
+                        icon = current_icon,

                         replaces_id = mpd.id,
                     }).id
                 end
                         replaces_id = mpd.id,
                     }).id
                 end