Merge pull request #284 from BarbUk/master

[etc/awesome.git] / widgets / mpd.lua

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 7fd611d71fb7c80782d55aa4f0aa7d6d3b8955e0..7996aeb8e3b1facd258e1b8d8fb69021c54dcbcc 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -8,67 +8,84 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")

-local async        = require("lain.asyncshell")
-
+local shell        = require("awful.util").shell

 local escape_f     = require("awful.util").escape
 local escape_f     = require("awful.util").escape

+local focused      = require("awful.screen").focused

 local naughty      = require("naughty")
 local wibox        = require("wibox")
 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,
-                       gmatch   = string.gmatch }
-
+local os           = { getenv = os.getenv }
+local string       = { format = string.format,
+                       gmatch = string.gmatch,
+                       match  = string.match }

 local setmetatable = setmetatable
 
 -- MPD infos
 -- lain.widgets.mpd
 local setmetatable = setmetatable
 
 -- MPD infos
 -- lain.widgets.mpd

-local mpd = {}
+local mpd = helpers.make_widget_textbox()

 
 local function worker(args)
 
 local function worker(args)

-    local args        = args or {}
-    local timeout     = args.timeout or 2
-    local password    = args.password or ""
-    local host        = args.host or "127.0.0.1"
-    local port        = args.port or "6600"
-    local music_dir   = args.music_dir or os.getenv("HOME") .. "/Music"
-    local cover_size  = args.cover_size or 100
-    local default_art = args.default_art or ""
-    local settings    = args.settings or function() end
-
-    local mpdcover = helpers.scripts_dir .. "mpdcover"
-    local mpdh = "telnet://" .. host .. ":" .. port
-    local echo = "echo 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
-
-    mpd.widget = wibox.widget.textbox('')
-
-    mpd_notification_preset = {
-        title   = "Now playing",
-        timeout = 6
-    }
+    local args          = args or {}
+    local timeout       = args.timeout or 2
+    local password      = (args.password and #args.password > 0 and string.format("password %s\\n", args.password)) or ""
+    local host          = args.host or "127.0.0.1"
+    local port          = args.port or "6600"
+    local music_dir     = args.music_dir or os.getenv("HOME") .. "/Music"
+    local cover_pattern = args.cover_pattern or "*\\.(jpg|jpeg|png|gif)$"
+    local cover_size    = args.cover_size or 100
+    local default_art   = args.default_art or ""
+    local notify        = args.notify or "on"
+    local followtag     = args.followtag or false
+    local settings      = args.settings or function() end
+
+    local mpdh = string.format("telnet://%s:%s", host, port)
+    local echo = string.format("printf \"%sstatus\\ncurrentsong\\nclose\\n\"", password)
+    local cmd  = string.format("%s | curl --connect-timeout 1 -fsm 3 %s", echo, mpdh)
+
+    mpd_notification_preset = { title = "Now playing", timeout = 6 }

 
     helpers.set_map("current mpd track", nil)
 
     function mpd.update()
 
     helpers.set_map("current mpd track", nil)
 
     function mpd.update()

-        async.request(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh, function (f)
+        helpers.async({ shell, "-c", cmd }, function(f)

             mpd_now = {
             mpd_now = {

-                state  = "N/A",
-                file   = "N/A",
-                artist = "N/A",
-                title  = "N/A",
-                album  = "N/A",
-                date   = "N/A"
+                random_mode  = false,
+                single_mode  = false,
+                repeat_mode  = false,
+                consume_mode = false,
+                pls_pos      = "N/A",
+                pls_len      = "N/A",
+                state        = "N/A",
+                file         = "N/A",
+                name         = "N/A",
+                artist       = "N/A",
+                title        = "N/A",
+                album        = "N/A",
+                genre        = "N/A",
+                track        = "N/A",
+                date         = "N/A",
+                time         = "N/A",
+                elapsed      = "N/A"

             }
 
             }
 

-            for line in f:lines() do
+            for line in string.gmatch(f, "[^\n]+") do

                 for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") 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)
+                    if     k == "state"          then mpd_now.state        = v
+                    elseif k == "file"           then mpd_now.file         = v
+                    elseif k == "Name"           then mpd_now.name         = escape_f(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 == "Genre"          then mpd_now.genre        = escape_f(v)
+                    elseif k == "Track"          then mpd_now.track        = 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+")
+                    elseif k == "song"           then mpd_now.pls_pos      = v
+                    elseif k == "playlistlength" then mpd_now.pls_len      = v
+                    elseif k == "repeat"         then mpd_now.repeat_mode  = v ~= "0"
+                    elseif k == "single"         then mpd_now.single_mode  = v ~= "0"
+                    elseif k == "random"         then mpd_now.random_mode  = v ~= "0"
+                    elseif k == "consume"        then mpd_now.consume_mode = v ~= "0"

                     end
                 end
             end
                     end
                 end
             end


@@ -78,29 +95,38 @@ local function worker(args)
             widget = mpd.widget
             settings()
 
             widget = mpd.widget
             settings()
 

-            if mpd_now.state == "play"
-            then
-                if mpd_now.title ~= helpers.get_map("current mpd track")
-                then
+            if mpd_now.state == "play" then
+                if notify == "on" and mpd_now.title ~= helpers.get_map("current mpd track") then

                     helpers.set_map("current mpd track", mpd_now.title)
 
                     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))
+                    if followtag then mpd_notification_preset.screen = focused() end

 
 

-                    mpd.id = naughty.notify({
-                        preset = mpd_notification_preset,
-                        icon = "/tmp/mpdcover.png",
+                    local common =  {
+                        preset      = mpd_notification_preset,
+                        icon        = default_art,
+                        icon_size   = cover_size,

                         replaces_id = mpd.id,
                         replaces_id = mpd.id,

-                    }).id
+                    }
+
+                    if not string.match(mpd_now.file, "http.*://") then -- local file instead of http stream
+                        local path   = string.format("%s/%s", music_dir, string.match(mpd_now.file, ".*/"))
+                        local cover  = string.format("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", path, cover_pattern)
+                        helpers.async({ shell, "-c", cover }, function(current_icon)
+                            common.icon = current_icon:gsub("\n", "")
+                            mpd.id = naughty.notify(common).id
+                        end)
+                    else
+                        mpd.id = naughty.notify(common).id
+                    end
+

                 end
                 end

-            elseif mpd_now.state ~= "pause"
-            then
+            elseif mpd_now.state ~= "pause" then

                 helpers.set_map("current mpd track", nil)
             end
         end)
     end
 
                 helpers.set_map("current mpd track", nil)
             end
         end)
     end
 

-    helpers.newtimer("mpd", timeout, mpd.update)
+    mpd.timer = helpers.newtimer("mpd", timeout, mpd.update, true, true)

 
     return setmetatable(mpd, { __index = mpd.widget })
 end
 
     return setmetatable(mpd, { __index = mpd.widget })
 end