Merge pull request #2 from copycat-killer/master

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index ac4fd5f459e2d31ef8e831bff5488180e9fd44a3..ddedf243a9f3176f47d0620668528c9e3c01e17d 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -21,7 +21,7 @@ local setmetatable = setmetatable
 
 -- MPD infos
 -- lain.widgets.mpd
 
 -- 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 {}


@@ -32,7 +32,7 @@ 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 notify        = args.notify or "on"
     local followtag     = args.followtag or false
     local settings      = args.settings or function() end


@@ -41,6 +41,8 @@ local function worker(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)


@@ -105,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("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", path, 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", "")
                         helpers.async({ shell, "-c", cover }, function(current_icon)
                             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