wiki updated #254; other fixes

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

diff --git a/widgets/contrib/gpmdp.lua b/widgets/contrib/gpmdp.lua
index 6b4341b64bff12bda2b8d5a6787439689aaf27b0..ee40a8d108fa6c5f42d21bf6bccd7f596e15edda 100644 (file)
--- a/widgets/contrib/gpmdp.lua
+++ b/widgets/contrib/gpmdp.lua
@@ -1,22 +1,23 @@
 
 --[[
-
-        Licensed under GNU General Public License v2
-        * (c) 2016, Alexandre Terrien
-
+                                                     
+        Licensed under GNU General Public License v2 
+        * (c) 2016, Alexandre Terrien                
+                                                     
 --]]
 
-local helpers       = require("lain.helpers")
-local json          = require("lain.util.dkjson")
-
-local pread         = require("awful.util").pread
-
-local naughty       = require("naughty")
-local wibox         = require("wibox")
+local helpers      = require("lain.helpers")
+local json         = require("lain.util.dkjson")
 
-local mouse         = mouse
+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 setmetatable = setmetatable
+local table        = table
 
 -- Google Play Music Desktop infos
 -- lain.widget.contrib.gpmdp
@@ -26,9 +27,9 @@ local function worker(args)
     local args          = args or {}
     local timeout       = args.timeout or 2
     local notify        = args.notify or "off"
-    local followmouse   = args.followmouse or false
+    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"
+                          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('')
@@ -38,62 +39,54 @@ local function worker(args)
         timeout = 6
     }
 
-    helpers.set_map("gpmpd_current", nil)
+    helpers.set_map("gpmdp_current", nil)
 
     function gpmdp.update()
-        file, err = io.open(file_location, "r")
-        if not file
+        local filelines = helpers.lines_from(file_location)
+
+        if not next(filelines)
         then
-            gpm_now = {
-                running = false,
-                playing = false
-            }
+            local gpm_now = { running = false, playing = false }
         else
-            dict, pos, err = json.decode(file:read "*a", 1, nil)
-            file:close()
-            gpm_now = {}
-            gpm_now.artist      = dict.song.artist
-            gpm_now.album       = dict.song.album
-            gpm_now.title       = dict.song.title
-            gpm_now.cover_url   = dict.song.albumArt
-            gpm_now.playing     = dict.playing
+            dict, pos, err = json.decode(table.concat(filelines), 1, nil)
+            local gpm_now = {}
+            gpm_now.artist    = dict.song.artist
+            gpm_now.album     = dict.song.album
+            gpm_now.title     = dict.song.title
+            gpm_now.cover_url = dict.song.albumArt
+            gpm_now.playing   = dict.playing
         end
-        if (pread("pidof 'Google Play Music Desktop Player'") ~= '') then
+
+        if pread("pidof 'Google Play Music Desktop Player'") ~= '' then
             gpm_now.running = true
         else
             gpm_now.running = false
         end
 
-        gpmdp_notification_preset.text = string.format(
-                                        "%s (%s) - %s",
-                                        gpm_now.artist,
-                                        gpm_now.album,
-                                        gpm_now.title)
+        gpmdp_notification_preset.text = string.format("%s (%s) - %s", gpm_now.artist, gpm_now.album, gpm_now.title)
         widget = gpmdp.widget
         settings()
 
         if gpm_now.playing
         then
-            if notify == "on" and gpm_now.title ~= helpers.get_map("gpmpd_current")
+            if notify == "on" and gpm_now.title ~= helpers.get_map("gpmdp_current")
             then
-                helpers.set_map("gpmpd_current", gpm_now.title)
-
-                current_icon = "/tmp/gpmcover.png"
-                os.execute("curl " .. gpm_now.cover_url .. " -o " .. current_icon)
+                helpers.set_map("gpmdp_current", gpm_now.title)
+                os.execute(string.format("curl %d -o /tmp/gpmcover.png", gpm_now.cover_url))
 
-                if followmouse then
-                    gpmdp_notification_preset.screen = mouse.screen
+                if followtag then
+                    gpmdp_notification_preset.screen = focused()
                 end
 
                 gpmdp.id = naughty.notify({
                     preset = gpmdp_notification_preset,
-                    icon = current_icon,
+                    icon = "/tmp/gpmcover.png",
                     replaces_id = gpmdp.id,
                 }).id
             end
-        elseif (not gpm_now.running)
+        elseif not gpm_now.running
         then
-            helpers.set_map("current mpd track", nil)
+            helpers.set_map("gpmdp_current", nil)
         end
     end