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

diff --git a/pages/videoview.sh b/pages/videoview.sh
index 4b15fe8..eacc547 100755
--- a/pages/videoview.sh
+++ b/pages/videoview.sh
@@ -20,10 +20,20 @@
 info="$_GET[\"i\"]"
 filter="$_GET[\"f\"]"
 search="$_GET[\"s\"]"
-order=$(echo "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
-page=$(echo "$_GET[\"p\"]" |egrep '^[0-9]+$')
+order=$(echo -E "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
+page=$(echo -E "$_GET[\"p\"]" |egrep '^[0-9]+$')
 [ -z "$page" ] && page=0
 
+page_link=''
+[ -n "$info" ]   && page_link="i=$(echo -En "$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
@@ -54,6 +64,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
 }
@@ -63,63 +74,64 @@ _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")"
     thumb="${_DATA}/thumbs/$info.jpg"
-    head -n1 "$meta" |read length width height
+    head -n1 "$meta" |read length width height filename
     [ -z "$length" ] && length=0
     [ -z "$width" ] && width=0
     [ -z "$height" ] && height=0
 
-#    reenc="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" )"
+#    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"
-    [ -L "$mpfake" ] || ln -s "../$video" "$mpfake"
-#      anchor=$(ls videos |grep -xA2 "$info" |tail -n1)
-    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')"
+    [ -r "$meta" ] || ". ${_EXEC}/helpers/genmeta.sh" "$video" "$meta"
+    [ -r "$thumb" ] || ". ${_EXEC}/helpers/genthumb.sh" "$video" "$thumb"
+#    [ -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:')"
 
     [ "$(($length % 60))" -lt 10 ] &&\
       minutes="$(($length / 60)):0$(($length % 60))" ||\
       minutes="$(($length / 60)):$(($length % 60))"
 
+    linkinfo="$(urlsave "$info")"
     tee "$cache" <<VIDEOend
-      <div class="thumb">
-        <a name="$info" href="?i=$info&p=$page&f=$filter&s=$search&o=$order#$anchor"><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" 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>
+	$(echo -E "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
       </div>
 VIDEOend
   fi
 }
 
-_by_name(){ ls ${_DATA}/videos/ |egrep -i "$file_pattern" }
+_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(){ ls ${_DATA}/by_length/ |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}"
   if [ "$cache" -nt ${_DATA}/videos -a "$cache" -nt ${_DATA}/meta ]; then
     cat "$cache"
   else
-    filterex="p"
+    filterex="q0"
     for each in $(sed 's,\^, ,g' <<<"$filter"); do
       if egrep -q '^!' <<<"$each"; then
         this="$(sed 's,^!,,' <<<"$each")"
-        filterex="/${this}/q;{${filterex}}"
+        filterex="/${this}/q1;{${filterex}}"
       else
         filterex="/${each}/{${filterex}}"
       fi
@@ -134,16 +146,16 @@ thumblist() {
         ;;
     esac
       
-    $genlist |while read video; do
-      #video="$(basename "$each")"
-      if [ -n "$search" ] ; then
-        egrep -iq "$search" <<<"$video" <"${_DATA}/meta/$video.meta" && (echo "$video" || exit 0)
-      elif [ "$filterex" != p ]; then
-         [ -n "$(sed -rn "2{$filterex}" "${_DATA}/meta/$video.meta")" ] && (echo "$video" || exit 0)
-      else
-        echo "$video" || exit 0
-      fi
-    done |sed -n $(($page * $pagesize + 1)),$(($page * $pagesize + $pagesize))p |tee "$cache"
+    if [ -n "$search" ] ; then
+      #$genlist |egrep -i "$search"
+      $genlist |sed -rn 's:^(.+)$:'"${_DATA}"'/meta/\1'.meta':p' |xargs -d\\n egrep -sil "$search" |sed -rn 's:^(.*/)+([^/]+)\.meta$:\2:p'
+    elif [ "$filterex" != "q0" ]; then
+      $genlist |while read video; do
+        [ -r "${_DATA}/meta/$video.meta" ] && sed -rn "2{$filterex;q1}" "${_DATA}/meta/$video.meta" && echo -E "$video"
+      done
+    else
+      $genlist
+    fi |sed -n $(($page * $pagesize + 1)),$(($page * $pagesize + $pagesize))p |tee "$cache"
   fi | while read line; do
     _printVideo "$line"
   done