#308 fix

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index defa710ac602b5013a15d0d052f20e50c7e11ad1..ddedf243a9f3176f47d0620668528c9e3c01e17d 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -8,23 +8,20 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")

-

 local shell        = require("awful.util").shell
 local escape_f     = require("awful.util").escape
 local focused      = require("awful.screen").focused
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local shell        = require("awful.util").shell
 local escape_f     = require("awful.util").escape
 local focused      = require("awful.screen").focused
 local naughty      = require("naughty")
 local wibox        = require("wibox")

-

 local os           = { getenv = os.getenv }
 local string       = { format = string.format,
                        gmatch = string.gmatch,
                        match  = string.match }
 local os           = { getenv = os.getenv }
 local string       = { format = string.format,
                        gmatch = string.gmatch,
                        match  = string.match }

-

 local setmetatable = setmetatable
 
 -- MPD infos
 -- lain.widgets.mpd
 local setmetatable = setmetatable
 
 -- MPD infos
 -- lain.widgets.mpd

-local mpd = helpers.make_widget_textbox()
+local mpd = {}

 
 local function worker(args)
     local args          = args or {}
 
 local function worker(args)
     local args          = args or {}


@@ -35,21 +32,23 @@ local function worker(args)
     local music_dir     = args.music_dir or os.getenv("HOME") .. "/Music"
     local cover_pattern = args.cover_pattern or "*\\.(jpg|jpeg|png|gif)$"
     local cover_size    = args.cover_size or 100
     local music_dir     = args.music_dir or os.getenv("HOME") .. "/Music"
     local cover_pattern = args.cover_pattern or "*\\.(jpg|jpeg|png|gif)$"
     local cover_size    = args.cover_size or 100

-    local default_art   = args.default_art or ""
+    local default_art   = args.default_art

     local notify        = args.notify or "on"
     local followtag     = args.followtag or false
     local settings      = args.settings or function() end
 
     local mpdh = string.format("telnet://%s:%s", host, port)
     local echo = string.format("printf \"%sstatus\\ncurrentsong\\nclose\\n\"", password)
     local notify        = args.notify or "on"
     local followtag     = args.followtag or false
     local settings      = args.settings or function() end
 
     local mpdh = string.format("telnet://%s:%s", host, port)
     local echo = string.format("printf \"%sstatus\\ncurrentsong\\nclose\\n\"", password)

-    local cmd  = string.format("%s -c '%s | curl --connect-timeout 1 -fsm 3 %s'", shell, echo, mpdh)
+    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)
 
     function mpd.update()
 
     mpd_notification_preset = { title = "Now playing", timeout = 6 }
 
     helpers.set_map("current mpd track", nil)
 
     function mpd.update()

-        helpers.async(cmd, function(f)
+        helpers.async({ shell, "-c", cmd }, function(f)

             mpd_now = {
                 random_mode  = false,
                 single_mode  = false,
             mpd_now = {
                 random_mode  = false,
                 single_mode  = false,


@@ -108,14 +107,15 @@ local function worker(args)
                         preset      = mpd_notification_preset,
                         icon        = default_art,
                         icon_size   = cover_size,
                         preset      = mpd_notification_preset,
                         icon        = default_art,
                         icon_size   = cover_size,

-                        replaces_id = mpd.id,
+                        replaces_id = mpd.id

                     }
 
                     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("%s -c \"find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'\"", shell, path, cover_pattern)
-                        helpers.async(cover, function(current_icon)
+                        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", "")
                             common.icon = current_icon:gsub("\n", "")

+                            if #common.icon == 0 then common.icon = nil end

                             mpd.id = naughty.notify(common).id
                         end)
                     else
                             mpd.id = naughty.notify(common).id
                         end)
                     else


@@ -129,7 +129,7 @@ local function worker(args)
         end)
     end
 
         end)
     end
 

-    helpers.newtimer("mpd", timeout, mpd.update)
+    mpd.timer = helpers.newtimer("mpd", timeout, mpd.update, true, true)

 
     return mpd
 end
 
     return mpd
 end