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

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Updated temp (markdown)
[etc/awesome.git] / widgets / mpd.lua
diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 8ba1cde3c690ea100e0209ece5d8df8ea1c1db4a..1749b5710b9e0588ae2bf83e35b27e0e23e98687 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -9,40 +9,47 @@
 
 local helpers      = require("lain.helpers")
 
 
 local helpers      = require("lain.helpers")
 
-local util         = require("awful.util")
-local beautiful    = require("beautiful")
+local escape_f     = require("awful.util").escape
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local io           = io
+local io           = { popen    = io.popen }
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
-local string       = { gmatch   = string.gmatch }
+local string       = { format   = string.format,
+                       gmatch   = string.gmatch }
 
 local setmetatable = setmetatable
 
 -- MPD infos
 -- lain.widgets.mpd
 
 local setmetatable = setmetatable
 
 -- MPD infos
 -- lain.widgets.mpd
-local mpd = { id = nil }
-
-function worker(args)
-    local args      = args or {}
-    local timeout   = args.timeout or 1
-    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 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 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
     local echo = "echo 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
 
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
     local mpdh = "telnet://" .. host .. ":" .. port
     local echo = "echo 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
 
-    widget = wibox.widget.textbox('')
+    mpd.widget = wibox.widget.textbox('')
+
+    mpd_notification_preset = {
+        title   = "Now playing",
+        timeout = 6
+    }
 
     helpers.set_map("current mpd track", nil)
 
 
     helpers.set_map("current mpd track", nil)
 
-    function update()
+    function mpd.update()
         mpd_now = {
             state  = "N/A",
             file   = "N/A",
         mpd_now = {
             state  = "N/A",
             file   = "N/A",
@@ -58,27 +65,19 @@ function worker(args)
             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
             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()
 
                 end
             end
         end
 
         f:close()
 
-        notification_preset = {
-            title   = "Now playing",
-            text    = mpd_now.artist .. " ("   ..
-                      mpd_now.album  .. ") - " ..
-                      mpd_now.date   .. "\n"   ..
-                      mpd_now.title,
-            fg      = beautiful.fg_normal or "#FFFFFF",
-            bg      = beautiful.bg_normal or "#000000",
-            timeout = 6
-        }
-
+        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()
 
         if mpd_now.state == "play"
         settings()
 
         if mpd_now.state == "play"
@@ -87,11 +86,11 @@ function worker(args)
             then
                 helpers.set_map("current mpd track", mpd_now.title)
 
             then
                 helpers.set_map("current mpd track", mpd_now.title)
 
-                os.execute(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({
 
                 mpd.id = naughty.notify({
-                    preset = notification_preset,
+                    preset = mpd_notification_preset,
                     icon = "/tmp/mpdcover.png",
                     replaces_id = mpd.id
                 }).id
                     icon = "/tmp/mpdcover.png",
                     replaces_id = mpd.id
                 }).id
@@ -102,11 +101,9 @@ function worker(args)
              end
     end
 
              end
     end
 
-    helpers.newtimer("mpd", timeout, update)
-
-    output = { widget = widget, notify = update }
+    helpers.newtimer("mpd", timeout, mpd.update)
 
 
-    return setmetatable(output, { __index = output.widget })
+    return setmetatable(mpd, { __index = mpd.widget })
 end
 
 return setmetatable(mpd, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(mpd, { __call = function(_, ...) return worker(...) end })
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.