mutt: fix F macro to not write message to home

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

diff --git a/awesome/widgets/mpd_widget.lua b/awesome/widgets/mpd_widget.lua
index f8510efcbec8e4102899bbce00e326378a3ef0aa..b6cfec8686d57ee94a47fbefbe4de727866e76d7 100644 (file)
--- a/awesome/widgets/mpd_widget.lua
+++ b/awesome/widgets/mpd_widget.lua
@@ -13,6 +13,7 @@ widget._currentsong = {}
 widget.scroll = wibox.widget {
     layout = wibox.container.scroll.horizontal,
     max_size = 200,
+    extra_space = 10,
     step_function = wibox.container.scroll.step_functions.linear_increase,
     speed = 20,
     {
@@ -53,8 +54,14 @@ function widget:get_info(callback)
 
         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 "")
+        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
@@ -67,7 +74,7 @@ function widget:popup_show()
             -- , icon = img
             , text = table.text
             , timeout = 0
-            , destroy = function() self._timer:stop() end
+            , destroy = function() self._timer:stop(); self._notification = nil end
             })
         self._timer:start()
     end)