awesome/mpc: react to subsystem changes to idle

[dotfiles.git] / awesome / widgets / mpd_widget.lua

diff --git a/awesome/widgets/mpd_widget.lua b/awesome/widgets/mpd_widget.lua
index 4673929f7e4641d397f3aeebf252f676e603ab51..9da5152e69a38bf1c6aed974f17d6d4f954d6959 100644 (file)
--- a/awesome/widgets/mpd_widget.lua
+++ b/awesome/widgets/mpd_widget.lua
@@ -43,57 +43,83 @@ local function song_duration(elapsed, duration)
     return sec_to_min(elapsed) .. "/" .. sec_to_min(duration)
 end
 
     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 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

 
 

-    self._connection:send("ping", function()
+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

 
 

-        local info = {}
-        info.title = status.state .. " " .. status.song .. "/" .. status.playlistlength .. " " .. song_duration(status.elapsed, status.duration)
-        info.text = tostring(song.artist or "") .. " - " .. tostring(song.title or "") .. "\n"
-            .. tostring(song.album or "")
-        callback(info)
-    end)
+    return info

 end
 
 function widget:popup_show()
 end
 
 function widget:popup_show()

-    self:get_info(function(table)
-        if self._notification then return end
-        self._notification = naughty.notify(
-            { title = table.title
-            -- , icon = img
-            , text = table.text
-            , timeout = 0
-            , destroy = function() self._timer:stop() 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)
 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
     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
         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
 
 function widget:popup_update()
             })
     end
 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)
         if not self._notification then return end
         naughty.replace_text(self._notification, table.title, table.text)
     end)


@@ -101,12 +127,12 @@ end
 
 function widget:popup_oneshot(timeout)
     if self._notification then
 
 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()
     else
         self:popup_show()

-        self:popup_hide(5)

     end
     end

+    self:popup_hide(5)

 end
 
 function widget:error_handler(err)
 end
 
 function widget:error_handler(err)


@@ -117,20 +143,28 @@ function widget:error_handler(err)
 end
 
 function widget:run()
 end
 
 function widget:run()

+    self._status = {}
+    self._status.songid = nil
+

     self._connection = mpc.new(nil, nil, nil, function(err) self:error_handler(err) end,
     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
     )
 
         end
     )