Merge pull request #512 from danyael031/now-playing/playerctl-extra-options

Add config options to pass --player and --ignore-player options to playerctl.

Author: erikw

segments/now_playing.sh

@@ -20,6 +20,8 @@ TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_UPDATE_PERIOD_DEFAULT="30"
 TMUX_POWERLINE_SEG_NOW_PLAYING_PLEXAMP_UPDATE_PERIOD_DEFAULT="30"
 TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_SIMPLE_FORMAT_DEFAULT="%artist% - %title%"
 TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_FORMAT_DEFAULT="{{ artist }} - {{ title }}"
+TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_PLAYER_DEFAULT=""
+TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_IGNORE_PLAYER_DEFAULT=""
 TMUX_POWERLINE_SEG_NOW_PLAYING_RHYTHMBOX_FORMAT_DEFAULT="%aa - %tt"
 TMUX_POWERLINE_SEG_NOW_PLAYING_NOTE_CHAR_DEFAULT="♫"
 TMUX_POWERLINE_SEG_NOW_PLAYING_MUSIC_PLAYER_DEFAULT="spotify"
@@ -56,6 +58,10 @@ export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_PORT="${TMUX_POWERLINE_SEG_NOW_PLAYING
 export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_SIMPLE_FORMAT="${TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_SIMPLE_FORMAT_DEFAULT}"
 # Song display format for playerctl. see "Format Strings" in playerctl(1).
 export TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_FORMAT="${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_FORMAT_DEFAULT}"
+# playerctl --player option value. Used to select specific players or set priority order. See "Description" in playerctl(1).
+# export TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_PLAYER="${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_PLAYER_DEFAULT}"
+# playerctl --ignore-player option value. See "Description" in playerctl(1).
+# export TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_IGNORE_PLAYER="${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_IGNORE_PLAYER_DEFAULT}"
 # Song display format for rhythmbox. see "FORMATS" in rhythmbox-client(1).
 export TMUX_POWERLINE_SEG_NOW_PLAYING_RHYTHMBOX_FORMAT="${TMUX_POWERLINE_SEG_NOW_PLAYING_RHYTHMBOX_FORMAT_DEFAULT}"
 
@@ -216,6 +222,12 @@ __process_settings() {
 	if [ -z "$TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_FORMAT" ]; then
 		export TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_FORMAT="${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_FORMAT_DEFAULT}"
 	fi
+	if [ -z "$TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_PLAYER" ]; then
+		export TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_PLAYER="${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_PLAYER_DEFAULT}"
+	fi
+	if [ -z "$TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_IGNORE_PLAYER" ]; then
+		export TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_IGNORE_PLAYER="${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_IGNORE_PLAYER_DEFAULT}"
+	fi
 	if [ -z "$TMUX_POWERLINE_SEG_NOW_PLAYING_RHYTHMBOX_FORMAT" ]; then
 		export TMUX_POWERLINE_SEG_NOW_PLAYING_RHYTHMBOX_FORMAT="${TMUX_POWERLINE_SEG_NOW_PLAYING_RHYTHMBOX_FORMAT_DEFAULT}"
 	fi
@@ -410,7 +422,15 @@ __np_rhythmbox() {
 
 __np_playerctl() {
 	if [ "$(playerctl status)" = "Playing" ]; then
-		np=$(playerctl metadata --format="$TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_FORMAT")
+		local playerctl_args=()
+		if [ -n "${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_PLAYER}" ]; then
+			playerctl_args+=( "--player=${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_PLAYER}" )
+		fi
+		if [ -n "${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_IGNORE_PLAYER}" ]; then
+			playerctl_args+=( "--ignore-player=${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_OPT_IGNORE_PLAYER}" )
+		fi
+		playerctl_args+=( "metadata" "--format=${TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_FORMAT}" )
+		np=$( playerctl "${playerctl_args[@]}" )
 		echo "$np"
 	fi
 }