remove old screenshots

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

diff --git a/widget/mpd.lua b/widget/mpd.lua
index 88b993711d51bb569df73e51be5e70b66514454f..d0b37d7db0daaef3f3a97fa4ab83912bdd4c52e0 100644 (file)
--- a/widget/mpd.lua
+++ b/widget/mpd.lua
@@ -17,13 +17,12 @@ local os           = { getenv = os.getenv }
 local string       = { format = string.format,
                        gmatch = string.gmatch,
                        match  = string.match }
 local string       = { format = string.format,
                        gmatch = string.gmatch,
                        match  = string.match }

-local setmetatable = setmetatable

 
 -- MPD infos
 -- lain.widget.mpd
 
 -- MPD infos
 -- lain.widget.mpd

-local mpd = {}

 
 local function factory(args)
 
 local function factory(args)

+    local mpd           = { widget = wibox.widget.textbox() }

     local args          = args or {}
     local timeout       = args.timeout or 2
     local password      = (args.password and #args.password > 0 and string.format("password %s\\n", args.password)) or ""
     local args          = args or {}
     local timeout       = args.timeout or 2
     local password      = (args.password and #args.password > 0 and string.format("password %s\\n", args.password)) or ""


@@ -41,8 +40,6 @@ local function factory(args)
     local echo = string.format("printf \"%sstatus\\ncurrentsong\\nclose\\n\"", password)
     local cmd  = string.format("%s | curl --connect-timeout 1 -fsm 3 %s", echo, mpdh)
 
     local echo = string.format("printf \"%sstatus\\ncurrentsong\\nclose\\n\"", password)
     local cmd  = string.format("%s | curl --connect-timeout 1 -fsm 3 %s", echo, mpdh)
 

-    mpd.widget = wibox.widget.textbox()
-

     mpd_notification_preset = { title = "Now playing", timeout = 6 }
 
     helpers.set_map("current mpd track", nil)
     mpd_notification_preset = { title = "Now playing", timeout = 6 }
 
     helpers.set_map("current mpd track", nil)


@@ -112,7 +109,8 @@ local function factory(args)
 
                     if not string.match(mpd_now.file, "http.*://") then -- local file instead of http stream
                         local path   = string.format("%s/%s", music_dir, string.match(mpd_now.file, ".*/"))
 
                     if not string.match(mpd_now.file, "http.*://") then -- local file instead of http stream
                         local path   = string.format("%s/%s", music_dir, string.match(mpd_now.file, ".*/"))

-                        local cover  = string.format("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", path:gsub("'", "'\\''"), cover_pattern)
+                        local cover  = string.format("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'",
+                                       path:gsub("'", "'\\''"), cover_pattern)

                         helpers.async({ shell, "-c", cover }, function(current_icon)
                             common.icon = current_icon:gsub("\n", "")
                             if #common.icon == 0 then common.icon = nil end
                         helpers.async({ shell, "-c", cover }, function(current_icon)
                             common.icon = current_icon:gsub("\n", "")
                             if #common.icon == 0 then common.icon = nil end


@@ -134,4 +132,4 @@ local function factory(args)
     return mpd
 end
 
     return mpd
 end
 

-return setmetatable(mpd, { __call = function(_, ...) return factory(...) end })
+return factory