awesome: support widget for missing title and file

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

diff --git a/awesome/widgets/mpd_widget.lua b/awesome/widgets/mpd_widget.lua
index 2e4b215a0ad5ccf9989075c2e290f816f5f5bd8a..9a698f76cabf62784b304152a535768c0a7934d7 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
     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", title or file )
     else

-        text = string.format("%s - %s", artist, title)
+        text = "-"

     end
     self._textbox.text = text
 end
     end
     self._textbox.text = text
 end


@@ -60,8 +62,10 @@ function widget:get_albumart()
 end
 
 function widget:get_info()
 end
 
 function widget:get_info()

-    local info = {}

     local status, song = self._status, self._currentsong
     local status, song = self._status, self._currentsong

+    if not status.state then return nil end
+
+    local info = {}

     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)
     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)


@@ -77,7 +81,10 @@ end
 
 function widget:popup_show()
     if self._notification then return end
 
 function widget:popup_show()
     if self._notification then return end

+

     local table = self:get_info()
     local table = self:get_info()

+    if not table then return end
+

     self._timer:start()
     self._notification = naughty.notify(
         { title = table.title
     self._timer:start()
     self._notification = naughty.notify(
         { title = table.title


@@ -142,7 +149,6 @@ end
 
 function widget:run()
     self._status = {}
 
 function widget:run()
     self._status = {}

-    self._status.songid = nil

 
     self._connection = mpc.new(nil, nil, nil, function(err) self:error_handler(err) end,
         "player", function(conn)
 
     self._connection = mpc.new(nil, nil, nil, function(err) self:error_handler(err) end,
         "player", function(conn)


@@ -194,6 +200,11 @@ widget.scroll:buttons(gears.table.join(
 )
 
 globalkeys = gears.table.join(globalkeys,
 )
 
 globalkeys = gears.table.join(globalkeys,

+    --TODO headphone support
+    awful.key({ }, "XF86AudioPlay", function() widget._connection:play() end,
+              { description = "play", group = "mpd" }),
+    awful.key({ }, "XF86AudioPause", function() widget._connection:pause() end,
+              { description = "pause", group = "mpd" }),

     awful.key({ modkey }, "p", function() widget._connection:toggle_play() end,
               { description = "toogle play", group = "mpd" }),
     awful.key({ modkey }, "'", function() widget:popup_oneshot(5) end,
     awful.key({ modkey }, "p", function() widget._connection:toggle_play() end,
               { description = "toogle play", group = "mpd" }),
     awful.key({ modkey }, "'", function() widget:popup_oneshot(5) end,