Merge pull request #338 from klaernie/master

[etc/awesome.git] / widget / contrib / gpmdp.lua

diff --git a/widget/contrib/gpmdp.lua b/widget/contrib/gpmdp.lua
index 94076c85b6f9e72721f2380a5012f697c0a3afa5..e9802096885d361b2a0502707baefa41515af602 100644 (file)
--- a/widget/contrib/gpmdp.lua
+++ b/widget/contrib/gpmdp.lua
@@ -6,32 +6,28 @@
                                                      
 --]]
 
                                                      
 --]]
 

-local helpers      = require("lain.helpers")
-local json         = require("lain.util.dkjson")
-local focused      = require("awful.screen").focused
-local pread        = require("awful.util").pread
-local naughty      = require("naughty")
-local wibox        = require("wibox")
-local next         = next
-local os           = { getenv = os.getenv }
-local table        = table
-local setmetatable = setmetatable
+local helpers             = require("lain.helpers")
+local json                = require("lain.util.dkjson")
+local focused             = require("awful.screen").focused
+local pread               = require("awful.util").pread
+local naughty             = require("naughty")
+local wibox               = require("wibox")
+local next, getenv, table = next, os.getenv, table

 
 -- Google Play Music Desktop infos
 -- lain.widget.contrib.gpmdp
 
 -- Google Play Music Desktop infos
 -- lain.widget.contrib.gpmdp

-local gpmdp = {}
+-- requires: curl

 
 

-local function worker(args)
+local function factory(args)
+    local gpmdp         = { widget = wibox.widget.textbox() }

     local args          = args or {}
     local timeout       = args.timeout or 2
     local notify        = args.notify or "off"
     local followtag     = args.followtag or false
     local file_location = args.file_location or
     local args          = args or {}
     local timeout       = args.timeout or 2
     local notify        = args.notify or "off"
     local followtag     = args.followtag or false
     local file_location = args.file_location or

-                          os.getenv("HOME") .. "/.config/Google Play Music Desktop Player/json_store/playback.json"
+                          getenv("HOME") .. "/.config/Google Play Music Desktop Player/json_store/playback.json"

     local settings      = args.settings or function() end
 
     local settings      = args.settings or function() end
 

-    gpmdp.widget = wibox.widget.textbox()
-

     gpmdp_notification_preset = {
         title   = "Now playing",
         timeout = 6
     gpmdp_notification_preset = {
         title   = "Now playing",
         timeout = 6


@@ -89,4 +85,4 @@ local function worker(args)
     return gpmdp
 end
 
     return gpmdp
 end
 

-return setmetatable(gpmdp, { __call = function(_, ...) return worker(...) end })
+return factory