Merge pull request #53 from wooparadog/show-notify-in-focused-screen

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 016f2a3a4e5de2a150e7276c810e7507601548ea..73efebb48b3423b164a98bf0b73a1241fa2fa7bd 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -9,14 +9,14 @@
 
 local helpers      = require("lain.helpers")
 
-local util         = require("awful.util")
+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 string       = { format   = string.format,
                        gmatch   = string.gmatch }
 
 local setmetatable = setmetatable
@@ -26,13 +26,15 @@ local setmetatable = setmetatable
 local mpd = {}
 
 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 settings  = args.settings or function() end
+    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
@@ -40,7 +42,7 @@ local function worker(args)
 
     mpd.widget = wibox.widget.textbox('')
 
-    notification_preset = {
+    mpd_notification_preset = {
         title   = "Now playing",
         timeout = 6
     }
@@ -57,24 +59,24 @@ local function worker(args)
             date   = "N/A"
         }
 
-        local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 1 " .. mpdh)
+        local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 3 " .. 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 = util.escape(v)
-                elseif k == "Title"  then mpd_now.title  = util.escape(v)
-                elseif k == "Album"  then mpd_now.album  = util.escape(v)
-                elseif k == "Date"   then mpd_now.date   = util.escape(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)
                 end
             end
         end
 
         f:close()
 
-        notification_preset.text = string.format("%s (%s) - %s\n%s", mpd_now.artist,
-                                   mpd_now.album, mpd_now.date, mpd_now.title)
+        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()
 
@@ -84,12 +86,14 @@ local function worker(args)
             then
                 helpers.set_map("current mpd track", mpd_now.title)
 
-                os.execute(string.format("%s %q %q", mpdcover, music_dir, mpd_now.file))
+                os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir,
+                           mpd_now.file, cover_size, default_art))
 
                 mpd.id = naughty.notify({
-                    preset = notification_preset,
+                    preset = mpd_notification_preset,
                     icon = "/tmp/mpdcover.png",
-                    replaces_id = mpd.id
+                    replaces_id = mpd.id,
+                    screen = client.focus and client.focus.screen or 1
                 }).id
             end
         elseif mpd_now.state ~= "pause"