time display for files from directory

svn path=/trunk/; revision=126

diff --git a/actions/watch.sh b/actions/watch.sh
index b3463b9aac183627af0c1f04b700f6869e9661f7..3fae936a01491b525a3bbb26e0accc6684eea8b5 100755 (executable)
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -54,12 +54,18 @@ case "${_COOKIE[watch]}" in
     [ -n "$location" ] && playuri="${treeroot%/}/${location#/}"
     [ -n "$info" ]     && playuri="${_DATA}/videos/$info"
 
+    metafile="${_DATA}/meta/${info}.meta"
+
+    playmeta="${_DATA}/mplayer.meta"
     fifofile="${_DATA}/mplayer.fifo"
     statusfile="${_DATA}/mplayer.status"
     volume="$(validate "$(cat "${_DATA}/mplayer.volume")" '[1-9]?[0-9]|100' 20)"
     [ \! -p "$fifofile" ] && rm -f "$fifofile" && mkfifo -m 600 "$fifofile"
 
-    debug PLAYURI $playuri
+    debug PLAYURI "$playuri"
+
+    [ -f "$metafile" ] && cp "$metafile" "$playmeta" \
+                       || "${_EXEC}"/helpers/genmeta.sh "$playuri" "$playmeta" >/dev/null
 
     DISPLAY=:0 XDG_RUNTIME_DIR=/run/user/1006 \
       nohup /usr/bin/mplayer -ao pulse \

diff --git a/pages/list.sh b/pages/list.sh
index 4d25103059d14932a90e552442c7cd152ca41df1..284b9185740897cde272e5cc4776dbc3c9c7d15e 100755 (executable)
--- a/pages/list.sh
+++ b/pages/list.sh
@@ -74,8 +74,7 @@ _printVideo(){
     linkinfo="$(urlsafe "$info")"
     htmlinfo="$(htmlsafe "$info")"
 
-    [ "$(($length % 60))" -lt 10 ] && minutes="$(($length / 60)):0$(($length % 60))" \
-                                   || minutes="$(($length / 60)):$(($length % 60))"
+    minutes="$(printf "%d:%02d" $(($length / 60)) $(($length % 60)) )"
 
     tee "$cache" <<VIDEOend
       <li class="thumb">

diff --git a/pages/playctl.sh b/pages/playctl.sh
index 11507803019f8d916d1e500ce772bc5b91dade49..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.
 # 
@@ -24,19 +24,13 @@ location="$(invalidate "${_GET[l]}" '(.*/)?\.\.(/.*)?|' /)"
 directory="${location%/*}"
 statusfile="$_DATA/mplayer.status"
 
-TITLE="$info"
-
-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
+[ -n "$info" ] && video="${_DATA}/videos/$info" \
+               || video="${treeroot%/}/${location#/}"
+
+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)
 

diff --git a/templates/playctl.html.sh b/templates/playctl.html.sh
index 62fe1d262a1e48105968636462a56cc0e3a6a2cb..8a94bd35ccf1feaa25d60e87931e7051bd1d8553 100755 (executable)
--- a/templates/playctl.html.sh
+++ b/templates/playctl.html.sh
@@ -53,7 +53,7 @@ cat <<EOF
      <!--button type="submit" name="osd" value="progression">Progress</button -->
   </form>
 
-  <span class="info length">$(($length / 60)):$(($length % 60)) min</span>
+  <span class="info length">$(printf "%d:%02d min" $(($length / 60)) $(($length % 60)) )</span>
   <span class="info width" >Width: $width</span>
   <span class="info height">Height: $height</span><br>