X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/5e25b100b2db132857fd9b9b447630a29bb2efcf..87d3fb525e841b5648e360a926d90c11d9a0a56b:/awesome/widgets/mpd_widget.lua

diff --git a/awesome/widgets/mpd_widget.lua b/awesome/widgets/mpd_widget.lua
index e71e087..9da5152 100644
--- a/awesome/widgets/mpd_widget.lua
+++ b/awesome/widgets/mpd_widget.lua
@@ -43,50 +43,50 @@ local function song_duration(elapsed, duration)
     return sec_to_min(elapsed) .. "/" .. sec_to_min(duration)
 end
 
-function widget:get_info(callback)
-    local status = nil
-    self._connection:send("status", function(_, s) status = s end)
-
-    local song = nil
-
-    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
-
-            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)
+local dbg = require("gears.debug")
+function widget:get_albumart()
+    local art = self._albumart
+    -- dbg.dump(art)
+    -- dbg.dump(self._albumart.binary)
+    if art and art.binary then
+        local path = '/tmp/test.jpg'
+        local f = io.open(path, 'w')
+        f:write(art.binary)
+        f:close()
+        return path
+    else
+        return beautiful.mpd_default_album
+    end
+end
+
+function widget:get_info()
+    local info = {}
+    local status, song = self._status, self._currentsong
+    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
+
+    return info
 end
 
 function widget:popup_show()
-    self:get_info(function(table)
-        if self._notification then return end
-        self._notification = naughty.notify(
-            { title = table.title
-            , icon = table.icon or beautiful.mpd_default_album
-            , icon_size = 64
-            , text = table.text
-            , timeout = 0
-            , destroy = function() self._timer:stop(); self._notification = nil end
-            })
-        self._timer:start()
-    end)
+    if self._notification then return end
+    local table = self:get_info()
+    self._timer:start()
+    self._notification = naughty.notify(
+        { title = table.title
+        , icon = self:get_albumart()
+        , icon_size = 64
+        , text = table.text
+        , timeout = 0
+        , destroy = function() self._timer:stop(); self._notification = nil end
+        })
 end
 
 function widget:popup_hide(delay)
@@ -116,7 +116,10 @@ function widget:popup_hide(delay)
 end
 
 function widget:popup_update()
-    self:get_info(function(table)
+    if not self._notification then return end
+    self._connection:send("status", function(_, status)
+        self._status = status
+        local table = self:get_info()
         if not self._notification then return end
         naughty.replace_text(self._notification, table.title, table.text)
     end)
@@ -140,20 +143,28 @@ function widget:error_handler(err)
 end
 
 function widget:run()
+    self._status = {}
+    self._status.songid = nil
+
     self._connection = mpc.new(nil, nil, nil, function(err) self:error_handler(err) end,
-        "status", function(_, result)
-            if not self._status or result.state ~= self._status.state then 
-                self._status = result
-                self:update_widget()
-                self:popup_oneshot(5)
-            end
-        end,
-        "currentsong", function(_, result)
-            if not self._currentsong or result.id ~= self._currentsong.id then 
-                self._currentsong = result
-                self:update_widget()
-                self:popup_oneshot(5)
-            end
+        "player", function(conn)
+            conn:send("status", function(err, status)
+                local songchanged = self._status.songid ~= status.songid
+                self._status = status
+                if not songchanged then
+                    self:update_widget()
+                    return
+                end
+
+                conn:send("currentsong", function(_, song)
+                    self._currentsong = song
+                    conn:albumart(song.file, function(_, art)
+                        self._albumart = art
+                        self:update_widget()
+                        self:popup_oneshot(5)
+                    end)
+                end)
+            end)
         end
     )