fix pulseaudio env variable, provide additional watch link

[serve0] / pages / playctl.sh

diff --git a/pages/playctl.sh b/pages/playctl.sh
index c5d6c09fb1e9f30d7d5751ae79e30843b5a5e542..79122fd00d9f4f5ea370abdc33ec4b3883b471b3 100755 (executable)
--- a/pages/playctl.sh
+++ b/pages/playctl.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014 2016 Paul Hänsch
+# Copyright 2014, 2016 Paul Hänsch
 #
 # This file is part of Serve0.
 # 
@@ -24,30 +24,31 @@ location="$(invalidate "${_GET[l]}" '(.*/)?\.\.(/.*)?|' /)"
 directory="${location%/*}"
 statusfile="$_DATA/mplayer.status"
 
-TITLE="$info"
+[ -n "$info" ] && video="${_DATA}/videos/$info" \
+               || video="${treeroot%/}/${location#/}"
 
-if [ -n "$info" ]; then
-  video="${_DATA}/videos/$info"
-  meta="${_DATA}/meta/$info.meta"
-  tags="$(sed -n '2p' "$meta")"
-  description="$(sed -n '3,$p' "$meta")"
-  head -n1 "$meta" |read length width height x
-else
-  video="${treeroot%/}/${location#/}"
-  meta=''; tags=''; length=0; width=0; height=0;
-  description=0
-fi
+meta="${_DATA}/mplayer.meta"
+tags="$(sed -n '2p' "$meta")"
+description="$(sed -n '3,$p' "$meta")"
+head -n1 "$meta" |read length width height TITLE
 
 volume=$(validate "$(cat "$_DATA/mplayer.volume")" '[1-9]?[0-9]|100' 20)
 
 debug VIDEO: $video
 
+printf 'Refresh: 1\r\n'
+
 progress(){
-  tail --pid=$$ -f "$statusfile" \
-  | tr '\r' '\n' \
-  | sed -urn 's;^.* ([0-9]{1,3})(,[0-9]+)?% *$;\1;p' \
-  | while read n; do
-    [ "$n" != "$previous" ] && printf "%s\n" "$((100 - $n))"
-    previous=$n
+  cr="$(printf \\r)"
+
+  tail --pid=$$ -c0 -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))" "$m"
+    previous="$m"
   done
 }