improved processing of progress bar

[serve0] / actions / playctl.sh

diff --git a/actions/playctl.sh b/actions/playctl.sh
index 1fd907b4e7730993916e5a6b38e177aca4f06b23..6dc138f1561611829149b5991a45e3852d0e9490 100755 (executable)
--- a/actions/playctl.sh
+++ b/actions/playctl.sh
@@ -26,6 +26,28 @@ export XDG_RUNTIME_DIR="/run/user/$(id |sed -rn '1s;.*uid=([0-9]+)[^0-9].*;\1;p'
 
 printf '\rBREAK\r' >> "$statusfile"
 
+if [ "${_GET[api]}" = progress ]; then
+  cr="$(printf \\r)"
+  printf 'Content-Type: text/plain\r\n\r\n'
+
+  read length <${_DATA}/mplayer.meta
+  tail --pid=$$ -c100 -f "$statusfile" \
+  | while read -d "$cr" line; do
+    [ "$line" = "BREAK" ] && exit 0
+    printf '%s\n' "$line"
+  done \
+  | sed -urn '1~12s;^.* V: *+([0-9]+)(\.[0-9]+) A-V:.*$;\1;p' \
+  | while read m; do
+    [ "$m" != "$previous" ] && printf "%d %d\n" "$(($m * 100 / ${length:--1}))" "$m"
+    previous="$m"
+  done
+  exit 0
+elif [ "${_GET[api]}" = volume ]; then
+  printf 'Content-Type: text/plain\r\n\r\n'
+  validate "$(cat "$_DATA/mplayer.volume")" '[1-9]?[0-9]|100' 20
+  exit 0
+fi
+
 if   [ -n "${_POST[amp]+x}" ]; then
   amp $(validate "${_POST[amp]}" '(on|off)' off)
 elif [ -n "${_POST[vol]+x}" ]; then
@@ -48,4 +70,4 @@ elif [ -n "${_POST[osd]+x}" ]; then
   esac >"$fifofile"
 fi &
 
-redirect "$HTTP_REFERER"
+redirect "${_POST[referrer]}"