X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/600b44f5bae5110a2b31cf5f46208d973d6dd2d1..7e4175f7aaef5c690afca3bc987107e2193a58df:/widgets/contrib/moc.lua

diff --git a/widgets/contrib/moc.lua b/widgets/contrib/moc.lua
index 84c618b..d4571e1 100644
--- a/widgets/contrib/moc.lua
+++ b/widgets/contrib/moc.lua
@@ -1,26 +1,29 @@
 
 --[[
-                                                   
-     Licensed under GNU General Public License v2  
-      * (c) 2014, anticlockwise <http://github.com/anticlockwise>
-                                                   
+                                                                  
+     Licensed under GNU General Public License v2                 
+      * (c) 2014, anticlockwise <http://github.com/anticlockwise> 
+                                                                  
 --]]
 
-local helpers = require("lain.helpers")
-local async   = require("lain.asyncshell")
+local helpers  = require("lain.helpers")
+local async    = require("lain.asyncshell")
 
+local focused  = require("awful.screen").focused
 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,
-                 gmatch  = string.gmatch }
+local io       = { popen   = io.popen }
+local os       = { execute = os.execute,
+                   getenv  = os.getenv }
+local string   = { format  = string.format,
+                   gmatch  = string.gmatch }
 
 local setmetatable = setmetatable
 
+-- MOC audio player
+-- lain.widgets.contrib.moc
 local moc = {}
 
 local function worker(args)
@@ -29,6 +32,7 @@ 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 followtag    = args.followtag or false
     local settings    = args.settings or function() end
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
@@ -58,7 +62,7 @@ local function worker(args)
                 total   = "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
                     if k == "State" then moc_now.state = v
                     elseif k == "File" then moc_now.file = v
@@ -82,6 +86,10 @@ local function worker(args)
                     os.execute(string.format("%s %q %q %d %q", mpdcover, "",
                                moc_now.file, cover_size, default_art))
 
+                    if followtag then
+                        moc_notification_preset.screen = focused()
+                    end
+
                     moc.id = naughty.notify({
                         preset = moc_notification_preset,
                         icon = "/tmp/mpdcover.png",