X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Fvideoview.sh;h=eacc54718e89b41fb8a73acb42190062b6d177c1;hb=aeb6bb1a133bfdf66e614fd3b5f9d34d80bcd1c9;hp=b786b7472d5defd0add80035175b87b715f5bea3;hpb=65f4ae73d24e46c12cd983dee0a31e5a54829385;p=serve0

diff --git a/pages/videoview.sh b/pages/videoview.sh
index b786b74..eacc547 100755
--- a/pages/videoview.sh
+++ b/pages/videoview.sh
@@ -74,7 +74,7 @@ _printVideo(){
   cache="${_DATA}/cache/$info.cache"
   video="${_DATA}/videos/$info"
   meta="${_DATA}/meta/$info.meta"
-  if [ "$cache" -nt "$video" -a "$cache" -nt "$meta" ]; then
+  if [ "$cache" -nt "$meta" ]; then
     cat "$cache"
   else
     tags="$(sed -n 2p "$meta")"
@@ -85,14 +85,14 @@ _printVideo(){
     [ -z "$height" ] && height=0
 
 #    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" )"
+#    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" ] || ". ${_EXEC}/helpers/genmeta.sh" "$video" "$meta"
     [ -r "$thumb" ] || ". ${_EXEC}/helpers/genthumb.sh" "$video" "$thumb"
-    [ -L "$mpfake" ] || ln -s "../videos/$info" "$mpfake"
+#    [ -L "$mpfake" ] || ln -s "../videos/$info" "$mpfake"
     video="$(urlsave "videos/$info")"
     thumb="$(urlsave "thumbs/$info.jpg")"
-    mpfake="$(urlsave "$info" |sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:mp4/\1.mp4:')"
+#    mpfake="$(urlsave "$info" |sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:mp4/\1.mp4:')"
 
     [ "$(($length % 60))" -lt 10 ] &&\
       minutes="$(($length / 60)):0$(($length % 60))" ||\
@@ -101,12 +101,14 @@ _printVideo(){
     linkinfo="$(urlsave "$info")"
     tee "$cache" <<VIDEOend
       <li class="thumb">
-        <a class="watchlink" name="$linkinfo" href="?action=watch&i=$linkinfo">
+        <a class="watchlink" name="${linkinfo}" href="?action=watch&i=${linkinfo}">
           <img src="$thumb">
         </a>
         <a class="videolink" href="$video">$info</a>
         <!-- a href="$reenc">VP8</a -->
-        <a class="videolink fake-mp4" href="$mpfake">fake-mp4</a>
+        <!-- a class="videolink fake-mp4" href="$mpfake">fake-mp4</a --
+        <a class="videolink" href="?action=transcode&i=${linkinfo}&t=480">480p</a>
+        <a class="videolink" href="?action=transcode&i=${linkinfo}&t=240">240p</a>
         <input type="checkbox" name="tagsel" value="$info">
         <span class="info property">${minutes}min</span>
         <span class="info property">${width}x${height}</span>
@@ -118,7 +120,7 @@ VIDEOend
 
 _by_name(){ find ${_DATA}/videos/ -mindepth 1 -maxdepth 1 -printf '%f\n' |sort |egrep -i "$file_pattern" }
 _by_date(){ ls -c ${_DATA}/videos/ |egrep -i "$file_pattern" }
-_by_length(){ find ${_DATA}/by_length/ -mindepth 1 -maxdepth 1 -ptintf '%f\n' |sort |sed -r 's:[0-9]{5} - ::g' }
+_by_length(){ find ${_DATA}/by_length/ -mindepth 1 -maxdepth 1 -printf '%f\n' |sort |sed -r 's:[0-9]{5} - ::' }
 
 thumblist() {
   cache="${_DATA}/cache/?o=${order}&s=${search}&f=${filter}&p=${page}"