mirror of https://github.com/lcpz/lain.git
gpmdp: some fixe + added wiki; #206
This commit is contained in:
parent
202ab106d5
commit
53b782f7c1
|
@ -8,13 +8,11 @@
|
|||
|
||||
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 mouse = mouse
|
||||
local os = { getenv = os.getenv }
|
||||
|
||||
local setmetatable = setmetatable
|
||||
|
||||
|
@ -38,16 +36,13 @@ 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
|
||||
then
|
||||
gpm_now = {
|
||||
running = false,
|
||||
playing = false
|
||||
}
|
||||
gpm_now = { running = false, playing = false }
|
||||
else
|
||||
dict, pos, err = json.decode(file:read "*a", 1, nil)
|
||||
file:close()
|
||||
|
@ -58,28 +53,23 @@ local function worker(args)
|
|||
gpm_now.cover_url = dict.song.albumArt
|
||||
gpm_now.playing = dict.playing
|
||||
end
|
||||
|
||||
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("curl " .. gpm_now.cover_url .. " -o /tmp/gpmcover.png")
|
||||
|
||||
if followmouse then
|
||||
gpmdp_notification_preset.screen = mouse.screen
|
||||
|
@ -87,13 +77,13 @@ local function worker(args)
|
|||
|
||||
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
|
||||
|
||||
|
|
2
wiki
2
wiki
|
@ -1 +1 @@
|
|||
Subproject commit 060b1822e3a0bdcd59bcae2d047908b031310ea6
|
||||
Subproject commit c4e5537b9502894954c825fad4fd90d9abd3b29d
|
Loading…
Reference in New Issue