discard previous status lines when feeding progrss bar

svn path=/trunk/; revision=129

diff --git a/pages/playctl.sh b/pages/playctl.sh
index e273237b48666c676e56eea4fbb954fe2b94dc7e..c01b8007c61996acd02f8ace1935804cc4f32fed 100755 (executable)
--- a/pages/playctl.sh
+++ b/pages/playctl.sh
@@ -37,11 +37,14 @@ 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' \
-  | sed -urn '1~5s;^.* V: +([0-9]+)(\.[0-9]+) A-V:.*$;\1;p' \
+  | tail -n+$discard \
+  | sed -urn '1~10s;^.* 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))"
+    printf "%d %d\n" "$(($m * 100 / $length))" "$m"
   done \
   | while read n; do
     [ "$n" != "$previous" ] && printf "%s\n" "$n"

diff --git a/templates/playctl.html.sh b/templates/playctl.html.sh
index 8a94bd35ccf1feaa25d60e87931e7051bd1d8553..e361ddae4cb316de57237f93aea8cf7f2c4ec4c3 100755 (executable)
--- a/templates/playctl.html.sh
+++ b/templates/playctl.html.sh
@@ -104,7 +104,7 @@ EOF
 cnt=0
 progress \
 | while read p t; do
-  printf '<span class="progress"><span style="width: %d%%;">%s</span></span>\n' "${p}" "${t}"
+  printf '<span class="progress"><span style="width: %d%%;">%d:%02d</span></span>\n' "${p}" "$(($t / 60))" "$(($t % 60))"
 done
 
 # vi:set filetype=html: