RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Add main method / Clean global scope

pull/249/head
Daniel Voogsgerd 2019-03-27 16:10:36 +01:00
parent b17984f75e
commit faa79ea216
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
resources/custom_modules/mediaplayer.py
View File

@ -5,9 +5,6 @@ import gi
gi.require_version('Playerctl', '2.0') gi.require_version('Playerctl', '2.0')
from gi.repository import Playerctl, GLib from gi.repository import Playerctl, GLib
manager = Playerctl.PlayerManager()
loop = GLib.MainLoop()
def on_play(player, status, manager): def on_play(player, status, manager):
on_metadata(player, player.props.metadata, manager) on_metadata(player, player.props.metadata, manager)
@ -35,16 +32,12 @@ def on_metadata(player, metadata, manager):
sys.stdout.flush() sys.stdout.flush()
def on_name_appeared(manager, name):
init_player(name)
def on_player_vanished(manager, player): def on_player_vanished(manager, player):
sys.stdout.write("\n") sys.stdout.write("\n")
sys.stdout.flush() sys.stdout.flush()
def init_player(name): def init_player(manager, name):
player = Playerctl.Player.new_from_name(name) player = Playerctl.Player.new_from_name(name)
player.connect('playback-status', on_play, manager) player.connect('playback-status', on_play, manager)
player.connect('metadata', on_metadata, manager) player.connect('metadata', on_metadata, manager)
@ -55,17 +48,26 @@ def init_player(name):
def signal_handler(sig, frame): def signal_handler(sig, frame):
sys.stdout.write("\n") sys.stdout.write("\n")
sys.stdout.flush() sys.stdout.flush()
loop.quit() # loop.quit()
sys.exit(0) sys.exit(0)
manager.connect('name-appeared', on_name_appeared) def main():
manager = Playerctl.PlayerManager()
loop = GLib.MainLoop()
manager.connect('name-appeared', init_player)
manager.connect('player-vanished', on_player_vanished) manager.connect('player-vanished', on_player_vanished)
signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler) signal.signal(signal.SIGTERM, signal_handler)
for player in manager.props.player_names: for player in manager.props.player_names:
init_player(player) init_player(manager, player)
loop.run() loop.run()
if __name__ == "__main__":
main()