bin/addnzb: show curl errors

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

diff --git a/awesome/widgets/mpd_widget.lua b/awesome/widgets/mpd_widget.lua
index 1d011cf5cde5b2b80bee0365e84622efae4d3ae4..89deae19af6fbc7c363a11008120559c0b8c6874 100644 (file)
--- a/awesome/widgets/mpd_widget.lua
+++ b/awesome/widgets/mpd_widget.lua
@@ -26,10 +26,12 @@ function widget:update_widget()
     local artist = self._currentsong.artist
     local title = self._currentsong.title
     local file = self._currentsong.file
-    if not artist then
+    if artist and title then
+        text = string.format("%s - %s", artist, title)
+    elseif title or file then
         text = string.format("%s", title or file )
     else
-        text = string.format("%s - %s", artist, title)
+        text = "-"
     end
     self._textbox.text = text
 end
@@ -62,6 +64,7 @@ end
 function widget:get_info()
     local status, song = self._status, self._currentsong
     if not status.state then return nil end
+    if not status.song then return nil end
 
     local info = {}
     info.title = status.state .. " " .. status.song .. "/" .. status.playlistlength .. " " .. song_duration(status.elapsed, status.duration)
@@ -164,6 +167,10 @@ function widget:run()
 
                 conn:send("currentsong", function(_, song)
                     self._currentsong = song
+                    if not song then
+                        self:update_widget()
+                        return
+                    end
                     conn:albumart(song.file, function(_, art)
                         self._albumart = art
                         self:update_widget()