diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3a988d9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule "custom-packages/sdl3_image"] + path = custom-packages/sdl3_image + url = ./custom-packages/sdl3_image +[submodule "custom-packages/sdl3_ttf"] + path = custom-packages/sdl3_ttf + url = git@gitssh.robaertschi.me:robaertschi/sdl3_ttf.git +[submodule "custom-packages/odin-git"] + path = custom-packages/odin-git + url = ./custom-packages/odin-git diff --git a/configs/waybar/config b/configs/waybar/config index ee1c3ec..0f7cf91 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -91,7 +91,7 @@ "on-click": "pavucontrol" }, "custom/media": { - "format": "{icon} {}", + "format": "{icon} {text}", "return-type": "json", "max-length": 40, "format-icons": { diff --git a/configs/waybar/mediaplayer.py b/configs/waybar/mediaplayer.py new file mode 100755 index 0000000..51a4837 --- /dev/null +++ b/configs/waybar/mediaplayer.py @@ -0,0 +1,182 @@ +#!/usr/bin/env python3 +import gi +gi.require_version("Playerctl", "2.0") +from gi.repository import Playerctl, GLib +from gi.repository.Playerctl import Player +import argparse +import logging +import sys +import signal +import gi +import json +import os +from typing import List + +logger = logging.getLogger(__name__) + +def signal_handler(sig, frame): + logger.info("Received signal to stop, exiting") + sys.stdout.write("\n") + sys.stdout.flush() + # loop.quit() + sys.exit(0) + + +class PlayerManager: + def __init__(self, selected_player=None): + self.manager = Playerctl.PlayerManager() + self.loop = GLib.MainLoop() + self.manager.connect( + "name-appeared", lambda *args: self.on_player_appeared(*args)) + self.manager.connect( + "player-vanished", lambda *args: self.on_player_vanished(*args)) + + signal.signal(signal.SIGINT, signal_handler) + signal.signal(signal.SIGTERM, signal_handler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + self.selected_player = selected_player + + self.init_players() + + def init_players(self): + for player in self.manager.props.player_names: + if self.selected_player is not None and self.selected_player != player.name: + logger.debug(f"{player.name} is not the filtered player, skipping it") + continue + self.init_player(player) + + def run(self): + logger.info("Starting main loop") + self.loop.run() + + def init_player(self, player): + logger.info(f"Initialize new player: {player.name}") + player = Playerctl.Player.new_from_name(player) + player.connect("playback-status", + self.on_playback_status_changed, None) + player.connect("metadata", self.on_metadata_changed, None) + self.manager.manage_player(player) + self.on_metadata_changed(player, player.props.metadata) + + def get_players(self) -> List[Player]: + return self.manager.props.players + + def write_output(self, text, player): + logger.debug(f"Writing output: {text}") + + 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 clear_output(self): + sys.stdout.write("\n") + sys.stdout.flush() + + def on_playback_status_changed(self, player, status, _=None): + logger.debug(f"Playback status changed for player {player.props.player_name}: {status}") + self.on_metadata_changed(player, player.props.metadata) + + def get_first_playing_player(self): + players = self.get_players() + logger.debug(f"Getting first playing player from {len(players)} players") + if len(players) > 0: + # if any are playing, show the first one that is playing + # reverse order, so that the most recently added ones are preferred + for player in players[::-1]: + if player.props.status == "Playing": + return player + # if none are playing, show the first one + return players[0] + else: + logger.debug("No players found") + return None + + def show_most_important_player(self): + logger.debug("Showing most important player") + # show the currently playing player + # or else show the first paused player + # or else show nothing + current_player = self.get_first_playing_player() + if current_player is not None: + self.on_metadata_changed(current_player, current_player.props.metadata) + else: + self.clear_output() + + def on_metadata_changed(self, player, metadata, _=None): + logger.debug(f"Metadata changed for player {player.props.player_name}") + player_name = player.props.player_name + artist = player.get_artist() + title = player.get_title() + + track_info = "" + if player_name == "spotify" and "mpris:trackid" in metadata.keys() and ":ad:" in player.props.metadata["mpris:trackid"]: + track_info = "Advertisement" + elif artist is not None and title is not None: + track_info = f"{artist} - {title}" + else: + track_info = title + + if track_info: + if player.props.status == "Playing": + track_info = " " + track_info + else: + track_info = " " + track_info + # only print output if no other player is playing + current_playing = self.get_first_playing_player() + if current_playing is None or current_playing.props.player_name == player.props.player_name: + self.write_output(track_info, player) + else: + logger.debug(f"Other player {current_playing.props.player_name} is playing, skipping") + + def on_player_appeared(self, _, player): + logger.info(f"Player has appeared: {player.name}") + if player is not None and (self.selected_player is None or player.name == self.selected_player): + self.init_player(player) + else: + logger.debug( + "New player appeared, but it's not the selected player, skipping") + + def on_player_vanished(self, _, player): + logger.info(f"Player {player.props.player_name} has vanished") + self.show_most_important_player() + +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") + + parser.add_argument("--enable-logging", action="store_true") + + return parser.parse_args() + + +def main(): + arguments = parse_arguments() + + # Initialize logging + if arguments.enable_logging: + logfile = os.path.join(os.path.dirname( + os.path.realpath(__file__)), "media-player.log") + logging.basicConfig(filename=logfile, level=logging.DEBUG, + format="%(asctime)s %(name)s %(levelname)s:%(lineno)d %(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)) + + logger.info("Creating player manager") + if arguments.player: + logger.info(f"Filtering for player: {arguments.player}") + player = PlayerManager(arguments.player) + player.run() + + +if __name__ == "__main__": + main() diff --git a/custom-packages/odin-git b/custom-packages/odin-git new file mode 160000 index 0000000..97a14cf --- /dev/null +++ b/custom-packages/odin-git @@ -0,0 +1 @@ +Subproject commit 97a14cf257106d283992f3deb9b95c6923fefe22 diff --git a/custom-packages/sdl3_image b/custom-packages/sdl3_image new file mode 160000 index 0000000..371d662 --- /dev/null +++ b/custom-packages/sdl3_image @@ -0,0 +1 @@ +Subproject commit 371d662e9052ee0c27f423066fac42ab3f22e1b5 diff --git a/custom-packages/sdl3_ttf b/custom-packages/sdl3_ttf new file mode 160000 index 0000000..c21d3fc --- /dev/null +++ b/custom-packages/sdl3_ttf @@ -0,0 +1 @@ +Subproject commit c21d3fcb5b679699e6b4cdebcb9debbd4092c53d diff --git a/programs/dev.sh b/programs/dev.sh index a568d50..8fab013 100755 --- a/programs/dev.sh +++ b/programs/dev.sh @@ -15,4 +15,16 @@ pacinstall lazygit pacinstall github-cli pacinstall zellij +pushd custom-packages/sdl3_image// +makepkg -si --noconfirm +popd +pushd custom-packages/sdl3_ttf/ +makepkg -si --noconfirm +popd +pushd custom-packages/odin-git/ +makepkg -si --noconfirm +popd + +pacinstall ninja + program_end diff --git a/programs/hyprland.sh b/programs/hyprland.sh index d8683c8..9bc64c8 100755 --- a/programs/hyprland.sh +++ b/programs/hyprland.sh @@ -36,6 +36,7 @@ pacinstall gobject-introspection mkdir -v -p ~/.config/waybar cp -v configs/waybar/config ~/.config/waybar/config cp -v configs/waybar/style.css ~/.config/waybar/style.css -config_from_nixos_config waybar/mediaplayer.py +cp -v configs/waybar/mediaplayer.py ~/.config/waybar/mediaplayer.py +chmod +x ~/.config/waybar/mediaplayer.py program_end diff --git a/programs/sublime.sh b/programs/sublime.sh new file mode 100644 index 0000000..782ee27 --- /dev/null +++ b/programs/sublime.sh @@ -0,0 +1,4 @@ +curl -O https://download.sublimetext.com/sublimehq-pub.gpg && sudo pacman-key --add sublimehq-pub.gpg && sudo pacman-key --lsign-key 8A8F901A && rm sublimehq-pub.gpg +echo -e "\n[sublime-text]\nServer = https://download.sublimetext.com/arch/stable/x86_64" | sudo tee -a /etc/pacman.conf + +sudo pacman -Syyu