]> 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:

{alsa,pulse}bar: remove reset_timeout due to (timer already started) issue
[etc/awesome.git] / widgets / mpd.lua
index ebdda98a456295f2f36d70fb2ed5695fe3697544..d92c78f564f472cde55586c4818fd99698540e48 100644 (file)
@@ -7,19 +7,16 @@
                                                   
 --]]
 
                                                   
 --]]
 
-local async        = require("lain.asyncshell")
 local helpers      = require("lain.helpers")
 local helpers      = require("lain.helpers")
-
+local shell        = require("awful.util").shell
 local escape_f     = require("awful.util").escape
 local focused      = require("awful.screen").focused
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local escape_f     = require("awful.util").escape
 local focused      = require("awful.screen").focused
 local naughty      = require("naughty")
 local wibox        = require("wibox")
-
 local os           = { getenv = os.getenv }
 local string       = { format = string.format,
                        gmatch = string.gmatch,
                        match  = string.match }
 local os           = { getenv = os.getenv }
 local string       = { format = string.format,
                        gmatch = string.gmatch,
                        match  = string.match }
-
 local setmetatable = setmetatable
 
 -- MPD infos
 local setmetatable = setmetatable
 
 -- MPD infos
@@ -29,30 +26,27 @@ local mpd = helpers.make_widget_textbox()
 local function worker(args)
     local args          = args or {}
     local timeout       = args.timeout or 2
 local function worker(args)
     local args          = args or {}
     local timeout       = args.timeout or 2
-    local password      = args.password or ""
+    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 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 default_art   = args.default_art
     local notify        = args.notify or "on"
     local followtag     = args.followtag or false
     local notify        = args.notify or "on"
     local followtag     = args.followtag or false
-    local echo_cmd      = args.echo_cmd or "echo"
     local settings      = args.settings or function() end
 
     local mpdh = string.format("telnet://%s:%s", host, port)
     local settings      = args.settings or function() end
 
     local mpdh = string.format("telnet://%s:%s", host, port)
-    local echo = string.format("%s 'password %s\nstatus\ncurrentsong\nclose'", echo_cmd, password)
+    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
-    }
+    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(string.format("%s | curl --connect-timeout 1 -fsm 3 %s", echo, mpdh), function (f)
+        helpers.async({ shell, "-c", cmd }, function(f)
             mpd_now = {
                 random_mode  = false,
                 single_mode  = false,
             mpd_now = {
                 random_mode  = false,
                 single_mode  = false,
@@ -105,22 +99,27 @@ local function worker(args)
                 if notify == "on" and mpd_now.title ~= helpers.get_map("current mpd track") then
                     helpers.set_map("current mpd track", mpd_now.title)
 
                 if notify == "on" and mpd_now.title ~= helpers.get_map("current mpd track") then
                     helpers.set_map("current mpd track", mpd_now.title)
 
-                    local current icon = default_art
+                    if followtag then mpd_notification_preset.screen = focused() end
+
+                    local common =  {
+                        preset      = mpd_notification_preset,
+                        icon        = default_art,
+                        icon_size   = cover_size,
+                        replaces_id = mpd.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)
 
                     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)
-                        current_icon = helpers.read_pipe(cover):gsub("\n", "")
+                        helpers.async({ shell, "-c", cover }, function(current_icon)
+                            common.icon = current_icon:gsub("\n", "")
+                            if #common.icon == 0 then common.icon = nil end
+                            mpd.id = naughty.notify(common).id
+                        end)
+                    else
+                        mpd.id = naughty.notify(common).id
                     end
 
                     end
 
-                    if followtag then mpd_notification_preset.screen = focused() end
-
-                    mpd.id = naughty.notify({
-                        preset      = mpd_notification_preset,
-                        icon        = current_icon,
-                        icon_size   = cover_size,
-                        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)
@@ -128,7 +127,7 @@ local function worker(args)
         end)
     end
 
         end)
     end
 
-    helpers.newtimer("mpd", timeout, mpd.update)
+    mpd.timer = helpers.newtimer("mpd", timeout, mpd.update, true, true)
 
     return mpd
 end
 
     return mpd
 end