X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0eb2084a3ac0e352d2a401869b4f8a73229af0ba..b7c3cb77a1ca72ab8fb91c8618f8703e3c1e446c:/widgets/mpd.lua?ds=sidebyside

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 4ee922f..73efebb 100644
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -16,7 +16,7 @@ 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
@@ -28,7 +28,7 @@ local mpd = {}
 local function worker(args)
     local args        = args or {}
     local timeout     = args.timeout or 2
-    local password    = args.password or "\"\""
+    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"
@@ -42,15 +42,6 @@ local function worker(args)
 
     mpd.widget = wibox.widget.textbox('')
 
-    mpd_now = {
-        state  = "N/A",
-        file   = "N/A",
-        artist = "N/A",
-        title  = "N/A",
-        album  = "N/A",
-        date   = "N/A"
-    }
-
     mpd_notification_preset = {
         title   = "Now playing",
         timeout = 6
@@ -59,6 +50,15 @@ 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 3 " .. mpdh)
 
         for line in f:lines() do
@@ -92,7 +92,8 @@ local function worker(args)
                 mpd.id = naughty.notify({
                     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"