feat(custom): make spotify module generic

Set class via json attribute
Choose icon via alt attribute
pull/256/head
Sibren Vasse 2019-03-31 16:12:38 +02:00
parent 618fe80670
commit 0f689b733d
3 changed files with 33 additions and 14 deletions

View File

@ -4,7 +4,7 @@
// "height": 30, // Waybar height // "height": 30, // Waybar height
// "width": 1280, // Waybar width // "width": 1280, // Waybar width
// Choose the order of the modules // Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/mode", "custom/spotify"], "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
"modules-center": ["sway/window"], "modules-center": ["sway/window"],
"modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"], "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"],
// Modules configuration // Modules configuration
@ -95,9 +95,14 @@
}, },
"on-click": "pavucontrol" "on-click": "pavucontrol"
}, },
"custom/spotify": { "custom/media": {
"format": " {}", "format": "{icon} {}",
"return-type": "json",
"max-length": 40, "max-length": 40,
"format-icons": {
"spotify": "",
"default": "🎜"
},
"escape": true, "escape": true,
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
} }

View File

@ -4,12 +4,24 @@ import logging
import sys import sys
import signal import signal
import gi import gi
import json
gi.require_version('Playerctl', '2.0') gi.require_version('Playerctl', '2.0')
from gi.repository import Playerctl, GLib from gi.repository import Playerctl, GLib
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def write_output(text, player):
logger.info('Writing output')
output = {'text': text,
'class': 'custom-' + player.props.player_name,
'alt': player.props.player_name}
sys.stdout.write(json.dumps(output) + '\n')
sys.stdout.flush()
def on_play(player, status, manager): def on_play(player, status, manager):
logger.info('Received new playback status') logger.info('Received new playback status')
on_metadata(player, player.props.metadata, manager) on_metadata(player, player.props.metadata, manager)
@ -26,16 +38,10 @@ def on_metadata(player, metadata, manager):
elif player.get_artist() != '' and player.get_title() != '': elif player.get_artist() != '' and player.get_title() != '':
track_info = '{artist} - {title}'.format(artist=player.get_artist(), track_info = '{artist} - {title}'.format(artist=player.get_artist(),
title=player.get_title()) title=player.get_title())
else:
sys.stdout.write('\n')
sys.stdout.flush()
return
if player.props.status == 'Playing': if player.props.status != 'Playing':
sys.stdout.write(track_info + '\n') track_info = '' + track_info
else: write_output(track_info, player)
sys.stdout.write('' + track_info + '\n')
sys.stdout.flush()
def on_player_appeared(manager, player, selected_player=None): def on_player_appeared(manager, player, selected_player=None):

View File

@ -30,7 +30,7 @@ window#waybar {
border-bottom: 3px solid #ffffff; border-bottom: 3px solid #ffffff;
} }
#clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-spotify, #tray, #mode, #idle_inhibitor { #clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor {
padding: 0 10px; padding: 0 10px;
margin: 0 5px; margin: 0 5px;
} }
@ -97,11 +97,19 @@ window#waybar {
color: #2a5c45; color: #2a5c45;
} }
#custom-spotify { #custom-media {
background: #66cc99; background: #66cc99;
color: #2a5c45; color: #2a5c45;
} }
.custom-spotify {
background: #66cc99;
}
.custom-vlc {
background: #ffa000;
}
#temperature { #temperature {
background: #f0932b; background: #f0932b;
} }