From: Rongzhou Shen <anticlockwise5@gmail.com>
Date: Sat, 27 Dec 2014 20:58:56 +0000 (-0800)
Subject: Moving moc to contrib and adding license information
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/bb5204a72237b7bc3731517988769f19fffd7ae5?ds=sidebyside;hp=9e72153c6dba0f7bf919effc3494b1a12e2e45d9

Moving moc to contrib and adding license information
---

diff --git a/widgets/moc.lua b/widgets/contrib/moc.lua
similarity index 76%
rename from widgets/moc.lua
rename to widgets/contrib/moc.lua
index 9b1380a..84c618b 100644
--- a/widgets/moc.lua
+++ b/widgets/contrib/moc.lua
@@ -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