X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/97ac5f3183850ca04f7db935f2a7220618005953..f8c02273484224b9133f77606f0016fb6cdaff4b:/awesome/widgets/mpd_widget.lua

diff --git a/awesome/widgets/mpd_widget.lua b/awesome/widgets/mpd_widget.lua
index 1807054..2c6ab78 100644
--- a/awesome/widgets/mpd_widget.lua
+++ b/awesome/widgets/mpd_widget.lua
@@ -1,13 +1,10 @@
-local mpc = require("widgets/mpc")
-local textbox = require("wibox.widget.textbox")
-local gears = require("gears")
-local awful = require("awful")
+local awful   = require("awful")
+local gears   = require("gears")
+local mpc     = require("widgets/mpc")
 local naughty = require("naughty")
-local timer = require("gears.timer")
-local wibox = require("wibox")
-
---TODO remove
-local dbg = require("gears.debug")
+local textbox = require("wibox.widget.textbox")
+local timer   = require("gears.timer")
+local wibox   = require("wibox")
 
 local widget = {}
 widget._textbox = textbox()
@@ -15,14 +12,12 @@ widget._currentsong = {}
 
 widget.scroll = wibox.widget {
     layout = wibox.container.scroll.horizontal,
-    forced_width = 200,
-    expand = true,
+    max_size = 200,
+    extra_space = 10,
     step_function = wibox.container.scroll.step_functions.linear_increase,
     speed = 20,
     {
         widget = widget._textbox,
-        align = 'center',
-        valign = 'center'
     }
 }
 
@@ -31,7 +26,6 @@ function widget:update_widget()
     local artist = self._currentsong.artist
     local title = self._currentsong.title
     local file = self._currentsong.file
-    text = text .. tostring(artist or "") .. " - " .. tostring(title or "")
     if not artist then
         text = string.format("%s", title or file )
     else
@@ -54,16 +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)
-        info.text = tostring(song.artist or "") .. " - " .. tostring(song.title or "") .. "\n"
-            .. tostring(song.album or "")
-        callback(info)
-        return false
+            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
 
@@ -72,10 +79,11 @@ function widget:popup_show()
         if self._notification then return end
         self._notification = naughty.notify(
             { title = table.title
-            -- , icon = img
+            , icon = table.icon
+            , 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)
@@ -167,4 +175,11 @@ globalkeys = gears.table.join(globalkeys,
     awful.key({ modkey }, ".", function() widget._connection:send("next") end,
               { description = "next track", group = "mpd" })
 )
-return widget.scroll
+return {
+    layout = wibox.layout.align.horizontal,
+    forced_width = 200,
+    expand = "outside",
+    nil,
+    widget.scroll,
+    nil,
+}