Allow multiple instances of the pulseaudio widget

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

diff --git a/widgets/contrib/gpmdp.lua b/widgets/contrib/gpmdp.lua
index de82b1e8ca6f7aaadab7fd4e40941d1dd79b2e77..94076c85b6f9e72721f2380a5012f697c0a3afa5 100644 (file)
--- a/widgets/contrib/gpmdp.lua
+++ b/widgets/contrib/gpmdp.lua
@@ -8,16 +8,14 @@
 
 local helpers      = require("lain.helpers")
 local json         = require("lain.util.dkjson")
 
 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 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 next         = next
 local os           = { getenv = os.getenv }

-local setmetatable = setmetatable

 local table        = table
 local table        = table

+local setmetatable = setmetatable

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


@@ -32,7 +30,7 @@ local function worker(args)
                           os.getenv("HOME") .. "/.config/Google Play Music Desktop Player/json_store/playback.json"
     local settings      = args.settings or function() end
 
                           os.getenv("HOME") .. "/.config/Google Play Music Desktop Player/json_store/playback.json"
     local settings      = args.settings or function() end
 

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

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


@@ -69,25 +67,26 @@ local function worker(args)
         if gpm_now.playing then
             if notify == "on" and gpm_now.title ~= helpers.get_map("gpmdp_current") then
                 helpers.set_map("gpmdp_current", gpm_now.title)
         if gpm_now.playing then
             if notify == "on" and gpm_now.title ~= helpers.get_map("gpmdp_current") then
                 helpers.set_map("gpmdp_current", gpm_now.title)

-                os.execute(string.format("curl %d -o /tmp/gpmcover.png", gpm_now.cover_url))

 
                 if followtag then gpmdp_notification_preset.screen = focused() end
 
 
                 if followtag then gpmdp_notification_preset.screen = focused() end
 

-                gpmdp.id = naughty.notify({
-                    preset = gpmdp_notification_preset,
-                    icon = "/tmp/gpmcover.png",
-                    replaces_id = gpmdp.id,
-                }).id
+                helpers.async(string.format("curl %d -o /tmp/gpmcover.png", gpm_now.cover_url),
+                function(f)
+                    gpmdp.id = naughty.notify({
+                        preset = gpmdp_notification_preset,
+                        icon = "/tmp/gpmcover.png",
+                        replaces_id = gpmdp.id
+                    }).id
+                end)

             end
             end

-        elseif not gpm_now.running
-        then
+        elseif not gpm_now.running then

             helpers.set_map("gpmdp_current", nil)
         end
     end
 
             helpers.set_map("gpmdp_current", nil)
         end
     end
 

-    helpers.newtimer("gpmdp", timeout, gpmdp.update)
+    gpmdp.timer = helpers.newtimer("gpmdp", timeout, gpmdp.update, true, true)

 
 

-    return setmetatable(gpmdp, { __index = gpmdp.widget })
+    return gpmdp

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