tagging engine

[serve0] / pages / videoview.sh

diff --git a/pages/videoview.sh b/pages/videoview.sh
index c3965a975f5323799bb7f82660164131da9adde3..dacb524bcf7dae126d77bfb81eb94dc2b8d50fed 100755 (executable)
--- a/pages/videoview.sh
+++ b/pages/videoview.sh
@@ -54,6 +54,7 @@ view() {
     eval $(mplayer -noconsolecontrols -input file=/dev/null -slave -really-quiet -identify -frames 0 -ao null -vo null "$video" 2>/dev/null\
     | sed -rn 's:ID_VIDEO_WIDTH=(.*):width=\1:p;s:ID_VIDEO_HEIGHT=(.*):height=\1:p;s:ID_LENGTH=(.*)(\..*)$:length=\1:p;')
     
+    video="videos/$info"
     . ${_EXEC}/templates/view.html.sh
   fi
 }
@@ -76,8 +77,8 @@ _printVideo(){
 #    reenc="${_DATA}/vp8/$(sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:\1:' <<<"$info" )"
     mpfake="${_DATA}/mp4/$(sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:\1.mp4:' <<<"$info" )"
 #    [ -f "$reenc.mp4" ] && reenc="$reenc.mp4" || reenc="$reenc.mkv"
-    [ -r "$meta" ] || ./genmeta.sh "$video" "$meta"
-    [ -r "$thumb" ] || ./genthumb.sh "$video" "$thumb"
+    [ -r "$meta" ] || ". ${_EXEC}/helpers/genmeta.sh" "$video" "$meta"
+    [ -r "$thumb" ] || ". ${_EXEC}/helpers/genthumb.sh" "$video" "$thumb"
     [ -L "$mpfake" ] || ln -s "../$video" "$mpfake"
     video="$(echo "videos/$info" |sed 's/\?/\%6F/g')"
     thumb="$(echo "thumbs/$info.jpg" |sed 's/\?/%6F/g')"