diff --git a/experiments/spotify-player/README.md b/experiments/spotify-player/README.md
new file mode 100644
index 0000000..b19d5ac
--- /dev/null
+++ b/experiments/spotify-player/README.md
@@ -0,0 +1,5 @@
+# Spotify Player
+
+In progress
+
+
\ No newline at end of file
diff --git a/experiments/spotify-player/media-playback-start-symbolic.svg b/experiments/spotify-player/media-playback-start-symbolic.svg
deleted file mode 100644
index b94454d..0000000
--- a/experiments/spotify-player/media-playback-start-symbolic.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
diff --git a/experiments/spotify-player/media-skip-backward-symbolic.svg b/experiments/spotify-player/media-skip-backward-symbolic.svg
deleted file mode 100644
index e25937f..0000000
--- a/experiments/spotify-player/media-skip-backward-symbolic.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
diff --git a/experiments/spotify-player/media-skip-forward-symbolic.svg b/experiments/spotify-player/media-skip-forward-symbolic.svg
deleted file mode 100644
index 8dc5cc9..0000000
--- a/experiments/spotify-player/media-skip-forward-symbolic.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
diff --git a/experiments/spotify-player/spotify-player.lua b/experiments/spotify-player/spotify-player.lua
index a6c53df..eba85d6 100644
--- a/experiments/spotify-player/spotify-player.lua
+++ b/experiments/spotify-player/spotify-player.lua
@@ -16,63 +16,30 @@ local gears = require("gears")
local beautiful = require("beautiful")
local gfs = require("gears.filesystem")
local gs = require("gears.string")
+local awesomebuttons = require("awesome-buttons.awesome-buttons")
local HOME_DIR = os.getenv("HOME")
+local WIDGET_DIR = HOME_DIR .. '/.config/awesome/awesome-wm-widgets/experiments/spotify-player'
+local ICON_DIR = WIDGET_DIR
-local spotify_player = {}
+local spotify_playerr = {}
local BLUR_CMD = 'convert %s ( -clone 0 -fill white -colorize 100 -fill black -draw "polygon 0,200 300,200 300,300 0,300" -alpha off -write mpr:mask +delete ) -mask mpr:mask -blur 0x3 +mask %s'
local function show_warning(message)
naughty.notify{
preset = naughty.config.presets.critical,
- title = 'Bitbucket Widget',
+ title = 'Spotify Player Widget',
text = message}
end
local function worker(args)
local args = args or {}
+ local artwork_size = args.artwork_size or 300
local timeout = args.timeout or 1
- local function get_artwork(track_id, url)
- if ((url ~= nil or url ~='') and not gfs.file_readable('/tmp/' .. track_id)) then
- spawn.easy_async('touch /tmp/' .. track_id, function()
- spawn.easy_async('curl -L -s --show-error --create-dirs -o /tmp/' .. track_id .. ' '.. url, function(stdout, stderr)
- if stderr ~= '' then
- show_warning(stderr)
- return
- end
- -- spawn.easy_async(string.format(BLUR_CMD, '/tmp/' .. track_id, '/tmp/' .. track_id .. 'test'))
- end)
- end)
- end
- end
-
- local create_button = function (path)
- return wibox.widget {
- { {
- forced_width=32,
- forced_height=32,
- resize = true,
- image = path,
- widget = wibox.widget.imagebox
- },
- margins = 13,
- widget = wibox.container.margin,
- },
- forced_height = 50,
- forced_width = 50,
- shape = function(cr, width, height)
- gears.shape.circle(cr, width, height, 20)
- end,
- shape_border_color = '#88888888',
- shape_border_width = 2,
- widget = wibox.container.background
- }
- end
-
local popup = awful.popup{
ontop = true,
bg = beautiful.bg_normal .. '88',
@@ -80,7 +47,8 @@ local function worker(args)
shape = gears.shape.rounded_rect,
border_width = 1,
border_color = beautiful.bg_focus,
- maximum_width = 400,
+ width = artwork_size,
+ maximum_width = 300,
offset = { y = 5 },
widget = {}
}
@@ -90,112 +58,133 @@ local function worker(args)
layout = wibox.layout.align.vertical,
}
- spotify_player = wibox.widget {
- text = 'icon',
+ spotify_playerr.widget = wibox.widget {
+ --image = ,
+ text = 'sp-player',
widget = wibox.widget.textbox
}
+ local artwork_widget = wibox.widget {
+ forced_height = artwork_size,
+ forced_width = artwork_size,
+ widget = wibox.widget.imagebox
+ }
+
+ local artist_w = wibox.widget {
+ align = 'center',
+ widget = wibox.widget.textbox,
+ set_artist = function(self, artist)
+ self:set_markup('' .. artist .. '')
+ end
+ }
+
+ local title_w = wibox.widget {
+ align = 'center',
+ forced_height = 30,
+ widget = wibox.widget.textbox,
+ set_title = function(self, title)
+ self:set_markup('' .. title .. '')
+ end
+ }
+
+ local play_pause_btn = awesomebuttons.with_icon{ type = 'outline', icon = 'play', icon_size = 32, icon_margin = 8, color = '#1DB954', shape = 'circle', onclick = function()
+ spawn.with_shell('sp play')
+ end}
+
+ local buttons_w = wibox.widget {
+ {
+ awesomebuttons.with_icon{ icon = 'rewind', icon_size = 32, icon_margin = 8, color = '#18800000', shape = 'circle', onclick = function()
+ spawn.with_shell('sp prev')
+ end},
+ play_pause_btn,
+ awesomebuttons.with_icon{ icon = 'fast-forward', icon_size = 32, icon_margin = 8, color = '#18800000', shape = 'circle', onclick = function()
+ spawn.with_shell('sp next')
+ end},
+ spacing = 16,
+ layout = wibox.layout.fixed.horizontal
+ },
+ halign = 'center',
+ layout = wibox.container.place,
+ }
+
+ local some_w = wibox.widget {
+ artwork_widget,
+ {
+ {
+ {
+ {
+ title_w,
+ artist_w,
+ buttons_w,
+ layout = wibox.layout.fixed.vertical
+ },
+ top = 8,
+ bottom = 8,
+ widget = wibox.container.margin
+ },
+ bg = '#33333388',
+ widget = wibox.container.background
+ },
+ valign = 'bottom',
+ content_fill_horizontal = true,
+ layout = wibox.container.place,
+ },
+ layout = wibox.layout.stack
+ }
+
+ popup:setup({
+ some_w,
+ layout = wibox.layout.fixed.vertical,
+ })
+
local update_widget = function(widget, stdout, stderr, _, _)
for i = 0, #rows do rows[i]=nil end
- local track_id, length, art_url, album, album_artist, artist, auto_rating, disc_number, title, track_number, url =
+ local track_id, length, art_url, album, album_artist, artist, auto_rating, disc_number, title, track_number, url =
string.match(stdout, 'trackid|(.*)\nlength|(.*)\nartUrl|(.*)\nalbum|(.*)\nalbumArtist|(.*)\nartist|(.*)\nautoRating|(.*)\ndiscNumber|(.*)\ntitle|(.*)\ntrackNumber|(.*)\nurl|(.*)')
title = string.gsub(title, "&", '&')
- get_artwork(track_id, art_url)
+ artist_w:set_artist(artist)
+ title_w:set_title(title)
- local artwork_widget = wibox.widget {
- -- image = '/tmp/' .. track_id .. 'test',
- image = '/tmp/' .. track_id,
- widget = wibox.widget.imagebox
- }
-
- local artist_w = wibox.widget {
- markup = '' .. artist .. '',
- align = 'center',
- widget = wibox.widget.textbox
- }
-
- local title_w = wibox.widget {
- markup = '' .. title .. '',
- align = 'center',
- forced_height = 30,
- widget = wibox.widget.textbox
- }
-
- local prev_button = create_button(HOME_DIR .. '/.config/awesome/awesome-wm-widgets/spotify-player/media-skip-backward-symbolic.svg')
- local play_button = create_button(HOME_DIR .. '/.config/awesome/awesome-wm-widgets/spotify-player/media-playback-start-symbolic.svg')
- local next_button = create_button(HOME_DIR .. '/.config/awesome/awesome-wm-widgets/spotify-player/media-skip-forward-symbolic.svg')
-
- -- prev_button:buttons(awful.util.table.join(awful.button({}, 1, function() prev_button:set_bg(beautiful.bg_focus);spawn.with_shell('sp prev') end)))
- play_button:buttons(awful.util.table.join(awful.button({}, 1, function() spawn.with_shell('sp play') end)))
- next_button:buttons(awful.util.table.join(awful.button({}, 1, function() spawn.with_shell('sp next') end)))
-
- prev_button:connect_signal("button::press", function(c) c:set_bg(beautiful.bg_focus) end)
- prev_button:connect_signal("button::release", function(c) c:set_bg(beautiful.bg_normal) spawn.with_shell('sp prev') end)
-
- local buttons_w = wibox.widget {
- {
- prev_button,
- play_button,
- next_button,
- spacing = 10,
- layout = wibox.layout.fixed.horizontal
- },
- halign = 'center',
- layout = wibox.container.place,
- }
-
- local some_w = wibox.widget {
- artwork_widget,
- {
- {
- -- {
- {
- title_w,
- artist_w,
- buttons_w,
- layout = wibox.layout.fixed.vertical
- },
- top = 10,
- bottom = 10,
- widget = wibox.container.margin
- -- },
- -- bg = '#33333388',
- -- widget = wibox.container.background
- },
- valign = 'bottom',
- content_fill_horizontal = true,
- layout = wibox.container.place,
- },
- layout = wibox.layout.stack
- }
-
- popup:setup({
- -- artwork_widget,
- -- artist_w,
- -- title_w,
- some_w,
- -- buttons_w,
- layout = wibox.layout.fixed.vertical,
- })
+ art_url = art_url:gsub('https://open.spotify.com', 'https://i.scdn.co')
+ if ((art_url ~= nil or art_url ~='') and not gfs.file_readable('/tmp/' .. track_id)) then
+ spawn.easy_async('touch /tmp/' .. track_id, function()
+ spawn.easy_async('curl -L -s --show-error --create-dirs -o /tmp/' .. track_id .. ' '.. art_url, function(stdout, stderr)
+ if stderr ~= '' then
+ show_warning(stderr)
+ return
+ end
+ artwork_widget:set_image('/tmp/' .. track_id)
+ end)
+ end)
+ else
+ artwork_widget:set_image('/tmp/' .. track_id)
+ end
end
- spotify_player:buttons(
+ function spotify_playerr:tog()
+ if popup.visible then
+ popup.visible = not popup.visible
+ else
+ popup:move_next_to(mouse.current_widget_geometry)
+ end
+ end
+
+ spotify_playerr.widget:buttons(
awful.util.table.join(
- awful.button({}, 1, function()
- if popup.visible then
- popup.visible = not popup.visible
- else
- popup:move_next_to(mouse.current_widget_geometry)
- end
- end)
+ awful.button({}, 1, function() spotify_playerr:tog() end)
)
)
- watch('sp metadata', timeout, update_widget, spotify_player)
+ watch('sp metadata', timeout, update_widget)
- return spotify_player
+ watch('sp status', 1, function(_, stdout)
+ stdout = string.gsub(stdout, "\n", "")
+ play_pause_btn:set_icon(stdout == 'Playing' and 'pause' or 'play')
+ end)
+
+ return spotify_playerr
end
-return setmetatable(spotify_player, { __call = function(_, ...) return worker(...) end })
+return setmetatable(spotify_playerr, { __call = function(_, ...) return worker(...) end })
diff --git a/experiments/spotify-player/spotify-player.png b/experiments/spotify-player/spotify-player.png
new file mode 100644
index 0000000..7bfecfc
Binary files /dev/null and b/experiments/spotify-player/spotify-player.png differ