X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/4cf1dd73c6e29fa102a8c6e4dee93ca608f31b95..e0f52edab239cc479d296f039c1ecf8d1b01de33:/awesome/widgets/mpd_widget.lua

diff --git a/awesome/widgets/mpd_widget.lua b/awesome/widgets/mpd_widget.lua
index 7f96b24..e71e087 100644
--- a/awesome/widgets/mpd_widget.lua
+++ b/awesome/widgets/mpd_widget.lua
@@ -48,21 +48,29 @@ function widget:get_info(callback)
     self._connection:send("status", function(_, s) status = s end)
 
     local song = nil
-    self._connection:send("currentsong", function(_, s) song = s end)
 
-    self._connection:send("ping", function()
+    self._connection:send("currentsong", function(_, s)
+        song = s
+        self._connection:albumart(song.file, function(_, art)
+            local info = {}
+            if art and art.binary then
+                info.icon = '/tmp/test.jpg'
+                local f = io.open(info.icon, 'w')
+                f:write(art.binary)
+                f:close()
+            end
 
-        local info = {}
-        info.title = status.state .. " " .. status.song .. "/" .. status.playlistlength .. " " .. song_duration(status.elapsed, status.duration)
-        if not song.artist then
-            info.text = string.format("%s", song.title or song.file)
-        else
-            info.text = string.format("%s - %s", song.artist, song.title)
-        end
-        if song.album then
-            info.text = info.text .. "\n" .. tostring(song.album or "")
-        end
-        callback(info)
+            info.title = status.state .. " " .. status.song .. "/" .. status.playlistlength .. " " .. song_duration(status.elapsed, status.duration)
+            if not song.artist then
+                info.text = string.format("%s", song.title or song.file)
+            else
+                info.text = string.format("%s - %s", song.artist, song.title)
+            end
+            if song.album then
+                info.text = info.text .. "\n" .. tostring(song.album or "")
+            end
+            callback(info)
+        end)
     end)
 end
 
@@ -71,29 +79,38 @@ function widget:popup_show()
         if self._notification then return end
         self._notification = naughty.notify(
             { title = table.title
-            -- , icon = img
+            , icon = table.icon or beautiful.mpd_default_album
+            , icon_size = 64
             , text = table.text
             , timeout = 0
-            , destroy = function() self._timer:stop() end
+            , destroy = function() self._timer:stop(); self._notification = nil end
             })
         self._timer:start()
     end)
 end
 
 function widget:popup_hide(delay)
+    local function destroy()
+        if self._hover then return end
+        if not self._notification then return end
+        naughty.destroy(self._notification)
+        self._notification = nil
+    end
+
+    if not delay then
+        destroy()
+        return
+    end
+
     if self._hide_timer and self._hide_timer.started then
+        self._hide_timer.timeout = delay
         self._hide_timer:again()
     else
         self._hide_timer = timer(
             { timeout = delay
             , autostart = true
             , single_shot = true
-            , callback = function()
-                if self._hover then return end
-                if not self._notification then return end
-                naughty.destroy(self._notification)
-                self._notification = nil
-                end
+            , callback = destroy
             })
     end
 end
@@ -107,12 +124,12 @@ end
 
 function widget:popup_oneshot(timeout)
     if self._notification then
-        self:popup_update()
-        self:popup_hide(5)
+        self:popup_hide()
+        self:popup_show()
     else
         self:popup_show()
-        self:popup_hide(5)
     end
+    self:popup_hide(5)
 end
 
 function widget:error_handler(err)