fixed faulty path in fake mp4/wmv generator

[serve0] / pages / videoview.sh

diff --git a/pages/videoview.sh b/pages/videoview.sh
index dacb524bcf7dae126d77bfb81eb94dc2b8d50fed..0cc3e7a6a6f55e3a9f92b795d4f860e8f5b67e2e 100755 (executable)
--- a/pages/videoview.sh
+++ b/pages/videoview.sh
@@ -24,6 +24,16 @@ order=$(echo "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
 page=$(echo "$_GET[\"p\"]" |egrep '^[0-9]+$')
 [ -z "$page" ] && page=0
 
+page_link=''
+[ -n "$info" ]   && page_link="i=$(echo -n "$info" |sed -r 's:%:%25:g;s:\&:%26:g;')&"
+[ -n "$order" ]  && page_link="${page_link}o=${order}&"
+[ -n "$search" ] && page_link="${page_link}s=${search}&"
+[ -n "$filter" ] && page_link="${page_link}f=${filter}&"
+page_prev="${page_link}p=$([ "$page" = 0 ] && echo 0 || echo $(($page - 1)) )"
+page_next="${page_link}p=$(($page + 1))"
+page_this="${page_link}p=$page"
+
+
 taglist=$(
   [ -r ${_DATA}/cache/taglist ] && cat ${_DATA}/cache/taglist ||\
   for each in ${_DATA}/meta/*.meta; do
@@ -76,31 +86,35 @@ _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" )"
+    mvfake="${_DATA}/mp4/$(sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:\1.wmv:' <<<"$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 "../$video" "$mpfake"
+    [ -L "$mpfake" ] || ln -s "../videos/$info" "$mpfake"
+    [ -L "$mvfake" ] || ln -s "../videos/$info" "$mvfake"
     video="$(echo "videos/$info" |sed 's/\?/\%6F/g')"
     thumb="$(echo "thumbs/$info.jpg" |sed 's/\?/%6F/g')"
     mpfake="$(echo "$info" |sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:mp4/\1.mp4:' |sed 's/\?/%6F/g')"
+    mvfake="$(echo "$info" |sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:mp4/\1.wmv:' |sed 's/\?/%6F/g')"
 
     [ "$(($length % 60))" -lt 10 ] &&\
       minutes="$(($length / 60)):0$(($length % 60))" ||\
       minutes="$(($length / 60)):$(($length % 60))"
 
+    linkinfo="$(echo -n "$info" |sed -r 's:%:%25:g;s:\&:%26:g;')"
     tee "$cache" <<VIDEOend
-      <div class="thumb">
-        <a name="$info" href="?i=$info&p=$page&f=$filter&s=$search&o=$order#$info"><img src="$thumb"></a>
-        <div class="thumbinfo">
-          <a href="$video"><b>$info</b></a><br>
-          <!-- a href="$reenc">VP8</a -->
-          <a href="$mpfake">fake-mp4</a><br>
-          <input type="checkbox" name="tagsel" value="$info">
-          <span class="coord">${minutes}min</span>
-          <span class="coord">${width}x${height}</span><br>
-          <!--a class="function" href='write/lock.cgi?p=Locations&e=$info&i=$info&f=$filter#$anchor'>edit</a-->
-          <span class="tag">$(sed 's,|$,,;s,|,</span> <span class="tag">,g' <<<"$tags")</span>
-        </div>
+      <li class="thumb">
+        <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="$mvfake">fake-wmv</a>
+        <input type="checkbox" name="tagsel" value="$info">
+        <span class="info property">${minutes}min</span>
+        <span class="info property">${width}x${height}</span>
+       $(echo "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
       </div>
 VIDEOend
   fi