]> git.madduck.net Git - etc/awesome.git/commitdiff

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:

Moving moc to contrib and adding license information
authorRongzhou Shen <anticlockwise5@gmail.com>
Sat, 27 Dec 2014 20:58:56 +0000 (12:58 -0800)
committercopycat-killer <dada@archlinux.info>
Wed, 5 Aug 2015 11:31:15 +0000 (13:31 +0200)
widgets/contrib/moc.lua [moved from widgets/moc.lua with 76% similarity]

similarity index 76%
rename from widgets/moc.lua
rename to widgets/contrib/moc.lua
index 9b1380ae817b6249df380ea04d618ff3fb2979a9..84c618b5acbca6b57fad94b0625bae12a5ffeb46 100644 (file)
@@ -1,3 +1,11 @@
+
+--[[
+                                                   
+     Licensed under GNU General Public License v2  
+      * (c) 2014, anticlockwise <http://github.com/anticlockwise>
+                                                   
+--]]
+
 local helpers = require("lain.helpers")
 local async   = require("lain.asyncshell")
 
@@ -16,34 +24,38 @@ local setmetatable = setmetatable
 local moc = {}
 
 local function worker(args)
-    local args = args or {}
-    local timeout = args.timeout or 2
-    local music_dir = args.music_dir or os.getenv("HOME") .. "/Music"
-    local cover_size = args.cover_size or 100
+    local args        = args or {}
+    local timeout     = args.timeout or 2
+    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 settings    = args.settings or function() end
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
 
     moc.widget = wibox.widget.textbox('')
 
     moc_notification_preset = {
-        title = "Now playing",
+        title   = "Now playing",
         timeout = 6
     }
 
     helpers.set_map("current moc track", nil)
 
     function moc.update()
+        -- mocp -i will produce output like:
+        -- Artist: Travis
+        -- Album: The Man Who
+        -- etc.
         async.request("mocp -i", function(f)
             moc_now = {
-                state = "N/A",
-                file  = "N/A",
-                artist = "N/A",
-                title = "N/A",
-                album = "N/A",
+                state   = "N/A",
+                file    = "N/A",
+                artist  = "N/A",
+                title   = "N/A",
+                album   = "N/A",
                 elapsed = "N/A",
-                total = "N/A"
+                total   = "N/A"
             }
 
             for line in f:lines() do