]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/mpd.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

mpd: added http streams check; #115
[etc/awesome.git] / widgets / mpd.lua
index 41233cd39256e17125d4f67595f1f38972a2ce8a..6b66f8138f06a2d49395e06602933185adb3ef6f 100644 (file)
@@ -8,15 +8,17 @@
 --]]
 
 local helpers      = require("lain.helpers")
+local async        = require("lain.asyncshell")
 
 local escape_f     = require("awful.util").escape
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local io           = { popen    = io.popen }
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
-local string       = { format   = string.format, 
+local math         = { floor    = math.floor }
+local string       = { format   = string.format,
+                       match    = string.match,
                        gmatch   = string.gmatch }
 
 local setmetatable = setmetatable
@@ -50,55 +52,63 @@ local function worker(args)
     helpers.set_map("current mpd track", nil)
 
     function mpd.update()
-        mpd_now = {
-            state  = "N/A",
-            file   = "N/A",
-            artist = "N/A",
-            title  = "N/A",
-            album  = "N/A",
-            date   = "N/A"
-        }
-
-        local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 1 " .. mpdh)
-
-        for line in f:lines() do
-            for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do
-                if     k == "state"  then mpd_now.state  = v
-                elseif k == "file"   then mpd_now.file   = v
-                elseif k == "Artist" then mpd_now.artist = escape_f(v)
-                elseif k == "Title"  then mpd_now.title  = escape_f(v)
-                elseif k == "Album"  then mpd_now.album  = escape_f(v)
-                elseif k == "Date"   then mpd_now.date   = escape_f(v)
+        async.request(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh, function (f)
+            mpd_now = {
+                state   = "N/A",
+                file    = "N/A",
+                artist  = "N/A",
+                title   = "N/A",
+                album   = "N/A",
+                date    = "N/A",
+                time    = "N/A",
+                elapsed = "N/A"
+            }
+
+            for line in f:lines() do
+                for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do
+                    if     k == "state"   then mpd_now.state   = v
+                    elseif k == "file"    then mpd_now.file    = v
+                    elseif k == "Artist"  then mpd_now.artist  = escape_f(v)
+                    elseif k == "Title"   then mpd_now.title   = escape_f(v)
+                    elseif k == "Album"   then mpd_now.album   = escape_f(v)
+                    elseif k == "Date"    then mpd_now.date    = escape_f(v)
+                    elseif k == "Time"    then mpd_now.time    = v
+                    elseif k == "elapsed" then mpd_now.elapsed = string.match(v, "%d+")
+                    end
                 end
             end
-        end
 
-        f:close()
+            mpd_notification_preset.text = string.format("%s (%s) - %s\n%s", mpd_now.artist,
+                                           mpd_now.album, mpd_now.date, mpd_now.title)
+            widget = mpd.widget
+            settings()
 
-        mpd_notification_preset.text = string.format("%s (%s) - %s\n%s", mpd_now.artist,
-                                       mpd_now.album, mpd_now.date, mpd_now.title)
-        widget = mpd.widget
-        settings()
-
-        if mpd_now.state == "play"
-        then
-            if mpd_now.title ~= helpers.get_map("current mpd track")
+            if mpd_now.state == "play"
             then
-                helpers.set_map("current mpd track", mpd_now.title)
-
-                os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir,
-                           mpd_now.file, cover_size, default_art))
-
-                mpd.id = naughty.notify({
-                    preset = mpd_notification_preset,
-                    icon = "/tmp/mpdcover.png",
-                    replaces_id = mpd.id
-                }).id
+                if mpd_now.title ~= helpers.get_map("current mpd track")
+                then
+                    helpers.set_map("current mpd track", mpd_now.title)
+
+                    if string.match(mpd_now.file, "http://") == nil
+                    then -- local file
+                        os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir,
+                                   mpd_now.file, cover_size, default_art))
+                        current_icon = "/tmp/mpdcover.png"
+                    else -- http stream
+                        current_icon = default_art
+                    end
+
+                    mpd.id = naughty.notify({
+                        preset = mpd_notification_preset,
+                        icon = current_icon,
+                        replaces_id = mpd.id,
+                    }).id
+                end
+            elseif mpd_now.state ~= "pause"
+            then
+                helpers.set_map("current mpd track", nil)
             end
-        elseif mpd_now.state ~= "pause"
-        then
-            helpers.set_map("current mpd track", nil)
-             end
+        end)
     end
 
     helpers.newtimer("mpd", timeout, mpd.update)