Merge branch 'master' into music-player-adjustments

Author: LinkUpGames

docs/CONFIG.md

@@ -31,6 +31,7 @@
   - [playerctl](#playerctl---up)
   - [ram-usage](#ram-usage---up)
   - [spotify-tui](#spotify-tui---up)
+  - [spr](#spr---up)
   - [ssh-session](#ssh-session---up)
   - [synchronize-panes](#synchronize-panes---up)
   - [sys-temp](#sys-temp---up)
@@ -88,6 +89,18 @@ Hide empty plugins
 set -g @dracula-show-empty-plugins false
 ```
 
+Set plugin padding
+Whilst the padding is one space per default, can be whatever you want it to be, whether that's whitespace or other characters.
+**If you want to remove any padding, you need to use a zero width space!**
+
+```bash
+set -g @dracula-left-pad ' ° '
+set -g @dracula-right-pad ' ° '
+# no padding with zero width space
+set -g @dracula-left-pad '​'
+set -g @dracula-right-pad '​'
+```
+
 ### Powerline - [up](#table-of-contents)
 
 Enable powerline symbols
@@ -219,6 +232,18 @@ alternatively, if you have no battery and would like a nerdfont icon to indicate
 set -g @dracula-no-battery-label " "
 ```
 
+in case you have multiple batteries:
+
+the default battery label is only displayed in the very front.
+you can specify multiple battery labels by splitting them with `\n` like so:
+```bash
+set -g @dracula-battery-label "1:\n2:"
+```
+additionally you can specify the separator between each battery like so:
+```bash
+set -g @dracula-battery-separator "; "
+```
+
 ### compact-alt - [up](#table-of-contents)
 
 This widget allows the user to switch to an alternate list of widgets when the terminal becomes narrow.
@@ -516,6 +541,7 @@ set -g @dracula-kubernetes-eks-extract-account true
 This script retrieves and displays continuous glucose monitoring (CGM) data from the LibreView API.
 It caches the data to minimize API requests and displays the latest glucose level along with a trend indicator in a Tmux status bar.
 
+
 ### mac-player - [up](#table-of-contents)
 
 This widget and script displays music information provided by the native macOS players.
@@ -535,8 +561,6 @@ The supported remote players are:
 - Spotify
 - Music - Apple Music
 
-NOTE: `set -g @dracula-refresh-rate 5` affects this widget
-
 To change player icons:
 
 ```bash
@@ -728,8 +752,47 @@ To limit the maximum length (0 means unlimited length):
 set -g @dracula-spotify-tui-max-len 30
 ```
 
+
 `set -g @dracula-refresh-rate 5` affects this widget
 
+### spr - [up](#table-of-contents)
+
+This widget displays music information provided by [spotify-player](https://github.com/aome510/spotify-player). spotify-player must be installed to use this widget.
+
+To change player icons:
+
+```bash
+set -g @dracula-spr-play-icon "♪ "
+set -g @dracula-spr-pause-icon "❚❚ "
+
+```
+
+This section includes an experimental remote control feature, but it may limit the widget’s display on macOS.
+
+In order to utilize the remote feature you need to install the [spotify-player-daemon](https://github.com/aome510/spotify-player#daemon)
+To activate the remote:
+
+```bash
+set -g @dracula-spr-remote true
+```
+
+The default keybinds are:
+
+- `<prefix> + P` - Play/Pause
+- `<prefix> + R` - Back to position 0/previous track
+- `<prefix> + N` - Next track
+
+To change the keybinds:
+
+```bash
+set -g @dracula-spr-remote-play-pause "P"
+set -g @dracula-spr-remote-back "R"
+set -g @dracula-spr-remote-next "N"
+```
+
+`set -g @dracula-refresh-rate 5` affects this widget
+
+
 ### ssh-session - [up](#table-of-contents)
 
 This widget displays the current username@host combination, both of the local machine as well as when connected via ssh.

scripts/battery.sh

@@ -61,7 +61,7 @@ battery_percent()
   esac
 }
 
-battery_status()
+get_battery_status()
 {
   # Check OS
   case $(uname -s) in
@@ -84,9 +84,15 @@ battery_status()
     *)
       ;;
   esac
+  echo "$status"
+}
 
-  tmp_bat_perc=$(battery_percent)
-  bat_perc="${tmp_bat_perc%\%}"
+parse_battery_status()
+{
+  # $1 is battery_percent
+  bat_perc="$1"
+  # $2 is get_battery_status
+  status="$2"
 
   case $status in
     discharging|Discharging)
@@ -153,31 +159,40 @@ battery_status()
 
 main()
 {
+  # get left most custom label
   bat_label=$(get_tmux_option "@dracula-battery-label" "♥")
   if [ "$bat_label" == false ]; then
     bat_label=""
   fi
 
+  # get label for when there is no battery
   no_bat_label=$(get_tmux_option "@dracula-no-battery-label" "AC")
   if [ "$no_bat_label" == false ]; then
     no_bat_label=""
   fi
 
-  show_bat_label=$(get_tmux_option "@dracula-show-battery-status" false)
-  if $show_bat_label; then
-    bat_stat=$(battery_status)
-  else
-    bat_stat=""
-  fi
-
   bat_perc=$(battery_percent)
+  bat_perc="${bat_perc%\%}"
 
-  if [ -z "$bat_stat" ]; then # Test if status is empty or not
-    echo "$bat_label $bat_perc"
-  elif [ -z "$bat_perc" ]; then # In case it is a desktop with no battery percent, only AC power
+  # display widget
+  if [ -z "$bat_perc" ]; then # In case it is a desktop with no battery percent, only AC power
     echo "$no_bat_label"
   else
-    echo "$bat_label$bat_stat $bat_perc"
+    IFS=$'\n' read -rd '' -a percs <<<"$bat_perc"
+    IFS=$'\n' read -rd '' -a stats <<<"$(get_battery_status)"
+    IFS=$'\n' read -rd '' -a lbls <<<"$bat_label"
+    num_bats=${#percs[@]}
+    show_bat_label=$(get_tmux_option "@dracula-show-battery-status" false)
+    for ((i=0; i<num_bats; i++)); do
+      if [[ i -gt 0 ]]; then
+        echo -n "$(get_tmux_option "@dracula-battery-separator" "; ")"
+      fi
+      echo -n "${lbls[$i]}"
+      if $show_bat_label; then
+        echo -n "$(parse_battery_status "${percs[$i]}" "${stats[$i]}") "
+      fi
+      echo -n "${percs[$i]}%"
+    done
   fi
 }
 

scripts/dracula.sh

@@ -38,6 +38,8 @@ main() {
   show_ssh_session_port=$(get_tmux_option "@dracula-show-ssh-session-port" false)
   show_libreview=$(get_tmux_option "@dracula-show-libreview" false)
   show_empty_plugins=$(get_tmux_option "@dracula-show-empty-plugins" true)
+  left_pad=$(get_tmux_option "@dracula-left-pad" " ")
+  right_pad=$(get_tmux_option "@dracula-right-pad" " ")
 
   narrow_mode=$(get_tmux_option "@dracula-narrow-mode" false)
   if $narrow_mode; then
@@ -278,6 +280,10 @@ main() {
       IFS=' ' read -r -a colors <<<$(get_tmux_option "@dracula-mpc-colors" "green dark_gray")
       script="#($current_dir/mpc.sh)"
 
+    elif [ $plugin = "spr" ]; then
+      IFS=' ' read -r -a colors <<<$(get_tmux_option "@dracula-spr-colors" "green dark_gray")
+      script="#($current_dir/spr.sh)"
+
     elif [ $plugin = "spotify-tui" ]; then
       IFS=' ' read -r -a colors <<<$(get_tmux_option "@dracula-spotify-tui-colors" "green dark_gray")
       script="#($current_dir/spotify-tui.sh)"
@@ -361,18 +367,21 @@ main() {
       background_color=${powerbg}
     fi
 
+    # padding
+    pad_script="$left_pad$script$right_pad"
+
     if $show_powerline; then
       if $show_empty_plugins; then
-        tmux set-option -ga status-right " #[fg=${!colors[0]},bg=${background_color},nobold,nounderscore,noitalics]${right_sep}#[fg=${!colors[1]},bg=${!colors[0]}] $script $right_edge_icon"
+        tmux set-option -ga status-right " #[fg=${!colors[0]},bg=${background_color},nobold,nounderscore,noitalics]${right_sep}#[fg=${!colors[1]},bg=${!colors[0]}]$pad_script$right_edge_icon"
       else
-    tmux set-option -ga status-right "#{?#{==:$script,},,#[fg=${!colors[0]},nobold,nounderscore,noitalics] ${right_sep}#[fg=${!colors[1]},bg=${!colors[0]}] $script $right_edge_icon}"
+        tmux set-option -ga status-right "#{?#{==:$script,},,#[fg=${!colors[0]},nobold,nounderscore,noitalics]${right_sep}#[fg=${!colors[1]},bg=${!colors[0]}]$pad_script$right_edge_icon}"
     fi
       powerbg=${!colors[0]}
     else
       if $show_empty_plugins; then
-        tmux set-option -ga status-right "#[fg=${!colors[1]},bg=${!colors[0]}] $script "
+        tmux set-option -ga status-right "#[fg=${!colors[1]},bg=${!colors[0]}]$pad_script"
       else
-        tmux set-option -ga status-right "#{?#{==:$script,},,#[fg=${!colors[1]},bg=${!colors[0]}] $script }"
+        tmux set-option -ga status-right "#{?#{==:$script,},,#[fg=${!colors[1]},bg=${!colors[0]}]$pad_script}"
       fi
     fi
 

scripts/mac-player.sh

@@ -159,15 +159,20 @@ function sliceTrack()
 
 
 function remoteControl() {
-  toggle_button="$1"
-  back_button="$2"
-  next_button="$3"
-  app_controlled="$4"
+  local toggle_button="$1"
+  local back_button="$2"
+  local next_button="$3"
+  local app_controlled="$4"
 
   if [[ $app_controlled == "Spotify" ]] || [[ $app_controlled == "Music" ]]; then
 
+    if [[ $app_controlled == "Music" ]]; then
+      back="osascript -e 'tell application \"$app_controlled\" to back track'"
+    else
+      back="osascript -e 'tell application \"$app_controlled\" to previous track'"
+    fi
+
     toggle="osascript -e 'tell application \"$app_controlled\" to playpause'"
-    back="osascript -e 'tell application \"$app_controlled\" to back track'"
     next="osascript -e 'tell application \"$app_controlled\" to play next track'"
 
     tmux unbind-key "$toggle_button"
@@ -177,10 +182,6 @@ function remoteControl() {
     tmux bind-key "$toggle_button" run-shell "$toggle"
     tmux bind-key "$back_button" run-shell "$back"
     tmux bind-key "$next_button" run-shell "$next"
-  else
-    tmux unbind-key "$toggle_button"
-    tmux unbind-key "$back_button"
-    tmux unbind-key "$next_button"
   fi
 }
 
@@ -216,7 +217,7 @@ main() {
   MAX_LENGTH=$(get_tmux_option "@dracula-mac-player-length" 25)
 
   # Remote variables
-  REMOTE_ACCESS=$(get_tmux_option "@dracula-mac-player-remote" false)
+  REMOTE_ACCESS=$(get_tmux_option "@dracula-mac-player-remote" "false")
   REMOTE_APP=$(get_tmux_option "@dracula-mac-player-app" "Spotify")
 
   # Remote Control Buttons Customizations
@@ -230,20 +231,33 @@ main() {
 
   # os checker
   if [[ "$OSTYPE" != "darwin"* ]]; then
-    echo ""
     exit 1
   fi
 
   # Remote Access
-  if [[ "$REMOTE_ACCESS" == true ]]; then
+  if [[ "$REMOTE_ACCESS" == "true" ]]; then
+    # Remote Control Buttons Customizations
+    PLAY_PAUSE_BUTTON=$(get_tmux_option "@dracula-mac-player-remote-play-pause" "P")
+    BACK_BUTTON=$(get_tmux_option "@dracula-mac-player-remote-back" "R")
+    NEXT_BUTTON=$(get_tmux_option "@dracula-mac-player-remote-next" "N")
+
     remoteControl "$PLAY_PAUSE_BUTTON" "$BACK_BUTTON" "$NEXT_BUTTON" "$REMOTE_APP"
+  else
+    # Clean up when remote is disabled
+    tmux set -g @dracula-mac-player-remote-play-pause ""
+    tmux set -g @dracula-mac-player-remote-back ""
+    tmux set -g @dracula-mac-player-remote-next ""
+    tmux unbind-key "$PLAY_PAUSE_BUTTON" 2>/dev/null
+    tmux unbind-key "$BACK_BUTTON" 2>/dev/null
+    tmux unbind-key "$NEXT_BUTTON" 2>/dev/null
   fi
 
   if [ ! -f "$cache_file" ] || [ $(($(date +%s) - $(stat -f%c "$cache_file"))) -ge "$RATE" ]; then
-    trackStatus "$PAUSE_ICON" "$PLAY_ICON" >"$cache_file"
+    local full_track
+    full_track=$(trackStatus "$PAUSE_ICON" "$PLAY_ICON")
 
     if [ "$SCROLL" = false ]; then
-      sliceTrack "$(cat $cache_file)" "$MAX_LENGTH" >"$cache_file"
+      sliceTrack "$full_track" "$MAX_LENGTH" > "$cache_file"
     fi
   fi