mediapl

4 files changed, 2 insertions, 308 deletions

diff --git a/home/ebisu/fortune/desktop/waybar/default-modules.nix b/home/ebisu/fortune/desktop/waybar/default-modules.nix
index 253a72d..c245b3f 100644
--- a/home/ebisu/fortune/desktop/waybar/default-modules.nix
+++ b/home/ebisu/fortune/desktop/waybar/default-modules.nix
@@ -1,18 +1,6 @@
 { pkgs, ... }:
 let
-  mediaplayer = pkgs.stdenv.mkDerivation {
-    name = "mediaplayer";
-
-    propagatedBuildInputs = with pkgs; [
-      (python3.withPackages (ps: [ ps.pygobject3 ]))
-      playerctl
-      gobject-introspection
-      curl
-    ];
-
-    dontUnpack = true;
-    installPhase = "install -Dm755 ${./scripts/mediaplayer.py} $out/bin/mediaplayer";
-  };
+  mediaplayer = (pkgs.callPackage ../../../../../pkgs/mediaplayer { });
 in
 {
   layer = "top";
@@ -149,7 +137,7 @@ in
     };
 
     escape = true;
-    exec = "GI_TYPELIB_PATH=${pkgs.playerctl}/lib/girepository-1.0:${pkgs.glib}/lib/girepository-1.0:$GI_TYPELIB_PATH ${mediaplayer}/bin/mediaplayer 2> /dev/null";
+    exec = "${mediaplayer}/bin/mediaplayer.py 2> /dev/null";
     on-click = "${pkgs.playerctl}/bin/playerctl play-pause";
     on-scroll-up = "${pkgs.playerctl}/bin/playerctl next";
     on-scroll-down = "${pkgs.playerctl}/bin/playerctl previous";
diff --git a/home/ebisu/fortune/desktop/waybar/default.nix b/home/ebisu/fortune/desktop/waybar/default.nix
index e94d1c0..9e68dcf 100644
--- a/home/ebisu/fortune/desktop/waybar/default.nix
+++ b/home/ebisu/fortune/desktop/waybar/default.nix
@@ -77,18 +77,4 @@
         )
       ];
   };
-
-  xdg.configFile =
-    let
-      scripts = [ "mediaplayer.py" ];
-    in
-    (builtins.listToAttrs (
-      map (script: {
-        name = "waybar/scripts/${script}";
-
-        value = {
-          source = ./scripts/${script};
-        };
-      }) scripts
-    ));
 }
diff --git a/home/ebisu/fortune/desktop/waybar/scripts/mediaplayer.py b/home/ebisu/fortune/desktop/waybar/scripts/mediaplayer.py
deleted file mode 100755
index c44ee0b..0000000
--- a/home/ebisu/fortune/desktop/waybar/scripts/mediaplayer.py
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import logging
-import os
-import sys
-import signal
-import gi
-import json
-
-gi.require_version("Playerctl", "2.0")
-
-from gi.repository import Playerctl, GLib
-
-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,
-        "art": player.props.metadata["mpris:artUrl"],
-    }
-
-    sys.stdout.write(json.dumps(output) + "\n")
-    sys.stdout.flush()
-
-
-def on_play(player, status, manager):
-    logger.info("Received new playback status")
-    on_metadata(player, player.props.metadata, manager)
-
-
-def on_metadata(player, metadata, manager):
-    logger.info("Received new metadata")
-
-    track_info = ""
-
-    if (
-        player.props.player_name == "spotify"
-        and "mpris:trackid" in metadata.keys()
-        and ":ad:" in player.props.metadata["mpris:trackid"]
-    ):
-        track_info = "AD PLAYING"
-    elif player.get_artist() != "" and player.get_title() != "":
-        track_info = "{title} - {artist}".format(
-            artist=player.get_artist(), title=player.get_title()
-        )
-    else:
-        track_info = player.get_title()
-
-    if "file://" in player.props.metadata["mpris:artUrl"]:
-        os.system(
-            f"cp $(echo '{player.props.metadata['mpris:artUrl']}' | sed -E 's/file:\\/\\///g') /tmp/mediaplayer_art"
-        )
-    else:
-        os.system(
-            f"curl --silent $(echo '{player.props.metadata['mpris:artUrl']}' | sed -E 's/file:\\/\\///g') --output /tmp/mediaplayer_art"
-        )
-
-    # if player.props.status != 'Playing' and track_info:
-    #     track_info = ' ' + track_info
-
-    write_output(track_info, player)
-
-
-def on_player_appeared(manager, player, selected_player=None):
-    if player is not None and (
-        selected_player is None or player.name == selected_player
-    ):
-        init_player(manager, player)
-    else:
-        logger.debug("New player appeared, but it's not the selected player, skipping")
-
-
-def on_player_vanished(manager, player):
-    logger.info("Player has vanished")
-    sys.stdout.write("\n")
-    sys.stdout.flush()
-    os.system("rm /tmp/mediaplayer_art")
-
-
-def init_player(manager, name):
-    logger.debug("Initialize player: {player}".format(player=name.name))
-
-    player = Playerctl.Player.new_from_name(name)
-
-    player.connect("playback-status", on_play, manager)
-    player.connect("metadata", on_metadata, manager)
-    manager.manage_player(player)
-    on_metadata(player, player.props.metadata, manager)
-
-
-def signal_handler(sig, frame):
-    logger.debug("Received signal to stop, exiting")
-    sys.stdout.write("\n")
-    sys.stdout.flush()
-    # loop.quit()
-    sys.exit(0)
-
-
-def parse_arguments():
-    parser = argparse.ArgumentParser()
-
-    parser.add_argument("-v", "--verbose", action="count", default=0)
-    parser.add_argument("--player")
-
-    return parser.parse_args()
-
-
-def main():
-    arguments = parse_arguments()
-    logging.basicConfig(
-        stream=sys.stderr,
-        level=logging.DEBUG,
-        format="%(name)s %(levelname)s %(message)s",
-    )
-
-    logger.setLevel(max((3 - arguments.verbose) * 10, 0))
-    logger.debug("Arguments received {}".format(vars(arguments)))
-
-    manager = Playerctl.PlayerManager()
-    loop = GLib.MainLoop()
-
-    manager.connect(
-        "name-appeared", lambda *args: on_player_appeared(*args, arguments.player)
-    )
-    manager.connect("player-vanished", on_player_vanished)
-    signal.signal(signal.SIGINT, signal_handler)
-    signal.signal(signal.SIGTERM, signal_handler)
-    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-
-    for player in manager.props.player_names:
-        if arguments.player is not None and arguments.player != player.name:
-            logger.debug(
-                "{player} is not the filtered player, skipping it".format(
-                    player=player.name
-                )
-            )
-
-            continue
-
-        init_player(manager, player)
-
-    loop.run()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/home/ebisu/fortune/desktop/waybar/scripts/mediaplayer.py.bak b/home/ebisu/fortune/desktop/waybar/scripts/mediaplayer.py.bak
deleted file mode 100755
index 1630d97..0000000
--- a/home/ebisu/fortune/desktop/waybar/scripts/mediaplayer.py.bak
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env python3
-import argparse
-import logging
-import sys
-import signal
-import gi
-import json
-gi.require_version('Playerctl', '2.0')
-from gi.repository import Playerctl, GLib
-
-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):
-    logger.info('Received new playback status')
-    on_metadata(player, player.props.metadata, manager)
-
-
-def on_metadata(player, metadata, manager):
-    logger.info('Received new metadata')
-    track_info = ''
-
-    if player.props.player_name == 'spotify' and \
-            'mpris:trackid' in metadata.keys() and \
-            ':ad:' in player.props.metadata['mpris:trackid']:
-        track_info = 'AD PLAYING'
-    elif player.get_artist() != '' and player.get_title() != '':
-        track_info = '{artist} - {title}'.format(artist=player.get_artist(),
-                                                 title=player.get_title())
-    else:
-        track_info = player.get_title()
-
-    if player.props.status != 'Playing' and track_info:
-        track_info = ' ' + track_info
-    write_output(track_info, player)
-
-
-def on_player_appeared(manager, player, selected_player=None):
-    if player is not None and (selected_player is None or player.name == selected_player):
-        init_player(manager, player)
-    else:
-        logger.debug("New player appeared, but it's not the selected player, skipping")
-
-
-def on_player_vanished(manager, player):
-    logger.info('Player has vanished')
-    sys.stdout.write('\n')
-    sys.stdout.flush()
-
-
-def init_player(manager, name):
-    logger.debug('Initialize player: {player}'.format(player=name.name))
-    player = Playerctl.Player.new_from_name(name)
-    player.connect('playback-status', on_play, manager)
-    player.connect('metadata', on_metadata, manager)
-    manager.manage_player(player)
-    on_metadata(player, player.props.metadata, manager)
-
-
-def signal_handler(sig, frame):
-    logger.debug('Received signal to stop, exiting')
-    sys.stdout.write('\n')
-    sys.stdout.flush()
-    # loop.quit()
-    sys.exit(0)
-
-
-def parse_arguments():
-    parser = argparse.ArgumentParser()
-
-    # Increase verbosity with every occurrence of -v
-    parser.add_argument('-v', '--verbose', action='count', default=0)
-
-    # Define for which player we're listening
-    parser.add_argument('--player')
-
-    return parser.parse_args()
-
-
-def main():
-    arguments = parse_arguments()
-
-    # Initialize logging
-    logging.basicConfig(stream=sys.stderr, level=logging.DEBUG,
-                        format='%(name)s %(levelname)s %(message)s')
-
-    # Logging is set by default to WARN and higher.
-    # With every occurrence of -v it's lowered by one
-    logger.setLevel(max((3 - arguments.verbose) * 10, 0))
-
-    # Log the sent command line arguments
-    logger.debug('Arguments received {}'.format(vars(arguments)))
-
-    manager = Playerctl.PlayerManager()
-    loop = GLib.MainLoop()
-
-    manager.connect('name-appeared', lambda *args: on_player_appeared(*args, arguments.player))
-    manager.connect('player-vanished', on_player_vanished)
-
-    signal.signal(signal.SIGINT, signal_handler)
-    signal.signal(signal.SIGTERM, signal_handler)
-    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-
-    for player in manager.props.player_names:
-        if arguments.player is not None and arguments.player != player.name:
-            logger.debug('{player} is not the filtered player, skipping it'
-                         .format(player=player.name)
-                         )
-            continue
-
-        init_player(manager, player)
-
-    loop.run()
-
-
-if __name__ == '__main__':
-    main()