Added LF as EOL for mpv socket commands in polybar due to mpv slight requirements changes, replaced the remaining `echo` lines with `printf` in mpv.sh

master
Meliurwen 3 years ago
parent d81ce0cbad
commit 81c4e6b353
Signed by: meliurwen
GPG Key ID: 818A8B35E9F1CE10
  1. 2
      polybar/.config/polybar/config
  2. 18
      polybar/.config/polybar/scripts/mpv.sh

@ -264,7 +264,7 @@ interval = 1
format = <label> format = <label>
label = %output% label = %output%
click-left = printf "%s" "cycle pause" | socat - ~/.cache/mpvsocket click-left = printf "%s\n" "cycle pause" | socat - ~/.cache/mpvsocket
[module/bluetooth] [module/bluetooth]

@ -27,19 +27,19 @@ if pgrep -u "$(id -u)" -x mpv > /dev/null; then
# The "16) Connection refused" error happens at the row below # The "16) Connection refused" error happens at the row below
# See: https://github.com/deterenkelt/Nadeshiko/wiki/Known-issues-for-Nadeshiko%E2%80%91mpv#----connection-refused # See: https://github.com/deterenkelt/Nadeshiko/wiki/Known-issues-for-Nadeshiko%E2%80%91mpv#----connection-refused
if ! TIME="$(echo '{ "command": ["get_property", "time-pos"] }' | socat - "$MPV_SOCKET_PATH" 2> /dev/null)"; then if ! TIME="$(printf '{ "command": ["get_property", "time-pos"] }\n' | socat - "$MPV_SOCKET_PATH" 2> /dev/null)"; then
exit 1 exit 1
fi fi
if [ "$(echo "$TIME" | jq -r .error)" = "success" ]; then if [ "$(printf "%s" "$TIME" | jq -r .error)" = "success" ]; then
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
COMMAND=$1 COMMAND=$1
VALID_COMMAND=true VALID_COMMAND=true
case $COMMAND in case $COMMAND in
"time-pos" | "time-remaining" | "duration" | "media-title" | "playlist-pos" | "playlist-pos-1" | "playlist-count") "time-pos" | "time-remaining" | "duration" | "media-title" | "playlist-pos" | "playlist-pos-1" | "playlist-count")
API_OUTPUT=$(echo "{ \"command\": [\"get_property\", \"$COMMAND\"] }" | socat - "$MPV_SOCKET_PATH") API_OUTPUT=$(printf '{ "command": ["get_property", "%s"] }\n' "$COMMAND" | socat - "$MPV_SOCKET_PATH")
;; ;;
"core-idle" | "play-pause-btn") "core-idle" | "play-pause-btn")
API_OUTPUT=$(echo '{ "command": ["get_property", "core-idle"] }' | socat - "$MPV_SOCKET_PATH") API_OUTPUT=$(printf '{ "command": ["get_property", "core-idle"] }\n' | socat - "$MPV_SOCKET_PATH")
;; ;;
*) *)
VALID_COMMAND=false VALID_COMMAND=false
@ -47,21 +47,21 @@ if pgrep -u "$(id -u)" -x mpv > /dev/null; then
esac esac
if $VALID_COMMAND; then if $VALID_COMMAND; then
if [ "$(echo "$API_OUTPUT" | jq -r .error)" = "success" ]; then if [ "$(printf "%s" "$API_OUTPUT" | jq -r .error)" = "success" ]; then
case $COMMAND in case $COMMAND in
"time-pos" | "time-remaining" | "duration") "time-pos" | "time-remaining" | "duration")
API_OUTPUT=$(echo "$API_OUTPUT" | jq -r .data | cut -d'.' -f 1) API_OUTPUT=$(printf "%s" "$API_OUTPUT" | jq -r .data | cut -d'.' -f 1)
time_to_human time_to_human
;; ;;
"media-title") "media-title")
API_OUTPUT=$(echo "$API_OUTPUT" | jq -r .data | cut -c 1-35) API_OUTPUT=$(printf "%s" "$API_OUTPUT" | jq -r .data | cut -c 1-35)
;; ;;
"playlist-pos" | "playlist-pos-1" | "playlist-count") "playlist-pos" | "playlist-pos-1" | "playlist-count")
API_OUTPUT=$(echo "$API_OUTPUT" | jq -r .data) API_OUTPUT=$(printf "%s" "$API_OUTPUT" | jq -r .data)
;; ;;
"core-idle" | "play-pause-btn") "core-idle" | "play-pause-btn")
shift; shift;
if [ "$(echo "$API_OUTPUT" | jq -r .data)" = "false" ]; then if [ "$(printf "%s" "$API_OUTPUT" | jq -r .data)" = "false" ]; then
API_OUTPUT=$1 #Play icon API_OUTPUT=$1 #Play icon
shift; shift;
else else

Loading…
Cancel
Save