From 236d9e8a3d596da6648192080ba727cf2f699070 Mon Sep 17 00:00:00 2001 From: Rongzhou Shen Date: Sat, 27 Dec 2014 12:58:56 -0800 Subject: [PATCH 1/1] Moving moc to contrib and adding license information --- widgets/{ => contrib}/moc.lua | 36 +++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) rename widgets/{ => contrib}/moc.lua (76%) 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 + +--]] + 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 -- 2.39.5