discard previous status lines when feeding progrss bar

[serve0] / pages / playctl.sh

diff --git a/pages/playctl.sh b/pages/playctl.sh
index ad6ea24e0b81955f912fb62f86d30f19aae75bc4..c01b8007c61996acd02f8ace1935804cc4f32fed 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.
 # 
@@ -22,18 +22,32 @@
 info="${_GET[i]}"
 location="$(invalidate "${_GET[l]}" '(.*/)?\.\.(/.*)?|' /)"
 directory="${location%/*}"
+statusfile="$_DATA/mplayer.status"
 
-TITLE="$info"
-
-meta="${_DATA}/meta/$info.meta"
 [ -n "$info" ] && video="${_DATA}/videos/$info" \
                || video="${treeroot%/}/${location#/}"
+
+meta="${_DATA}/mplayer.meta"
 tags="$(sed -n '2p' "$meta")"
 description="$(sed -n '3,$p' "$meta")"
-length=0; width=0; height=0;
-
-video="videos/$info"
-[ -n "$info" ] && video="videos/$info" \
-               || video="${location#/}"
+head -n1 "$meta" |read length width height TITLE
 
 volume=$(validate "$(cat "$_DATA/mplayer.volume")" '[1-9]?[0-9]|100' 20)
+
+debug VIDEO: $video
+
+progress(){
+  discard="$(tail -n2 "$statusfile" |sed 's;[^\r];;g' |wc -c)"
+
+  tail --pid=$$ -f "$statusfile" \
+  | tr '\r' '\n' \
+  | tail -n+$discard \
+  | sed -urn '1~10s;^.* V: +([0-9]+)(\.[0-9]+) A-V:.*$;\1;p' \
+  | while read m; do
+    printf "%d %d\n" "$(($m * 100 / $length))" "$m"
+  done \
+  | while read n; do
+    [ "$n" != "$previous" ] && printf "%s\n" "$n"
+    previous="$n"
+  done
+}