time display for files from directory

[serve0] / pages / playctl.sh

diff --git a/pages/playctl.sh b/pages/playctl.sh
index 015e7d338d16d3678bb3042954c0817e1ece98c4..e273237b48666c676e56eea4fbb954fe2b94dc7e 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,17 +22,29 @@
 info="${_GET[i]}"
 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#/}"
-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
+
+progress(){
+  tail --pid=$$ -f "$statusfile" \
+  | tr '\r' '\n' \
+  | sed -urn '1~5s;^.* V: +([0-9]+)(\.[0-9]+) A-V:.*$;\1;p' \
+  | while read m; do
+    printf "%d %d:%02d\n" "$(($m * 100 / $length))" "$(($m / 60))" "$(($m % 60))"
+  done \
+  | while read n; do
+    [ "$n" != "$previous" ] && printf "%s\n" "$n"
+    previous="$n"
+  done
+}