#126 fs notification: fixed typo

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index d910fd1961d450750c9062728a865d509f56d1e2..642a556b4e760f4fa4b7983d9592a17f6881913f 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -17,6 +17,7 @@ local wibox        = require("wibox")
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
 local math         = { floor    = math.floor }
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
 local math         = { floor    = math.floor }

+local mouse        = mouse

 local string       = { format   = string.format,
                        match    = string.match,
                        gmatch   = string.gmatch }
 local string       = { format   = string.format,
                        match    = string.match,
                        gmatch   = string.gmatch }


@@ -36,11 +37,12 @@ local function worker(args)
     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 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 followmouse = args.followmouse or false

     local settings    = args.settings or function() end
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
     local mpdh = "telnet://" .. host .. ":" .. port
     local settings    = args.settings or function() end
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
     local mpdh = "telnet://" .. host .. ":" .. port

-    local echo = "echo -e 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
+    local echo = "/bin/echo -e 'password " .. password .. "\nstatus\ncurrentsong\nclose'"

 
     mpd.widget = wibox.widget.textbox('')
 
 
     mpd.widget = wibox.widget.textbox('')
 


@@ -89,7 +91,7 @@ local function worker(args)
                 then
                     helpers.set_map("current mpd track", mpd_now.title)
 
                 then
                     helpers.set_map("current mpd track", mpd_now.title)
 

-                    if string.match(mpd_now.file, "http://") == nil
+                    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))
                     then -- local file
                         os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir,
                                    mpd_now.file, cover_size, default_art))


@@ -98,6 +100,10 @@ local function worker(args)
                         current_icon = default_art
                     end
 
                         current_icon = default_art
                     end
 

+                    if followmouse then
+                        mpd_notification_preset.screen = mouse.screen
+                    end
+

                     mpd.id = naughty.notify({
                         preset = mpd_notification_preset,
                         icon = current_icon,
                     mpd.id = naughty.notify({
                         preset = mpd_notification_preset,
                         icon = current_icon,