X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Fcommon.sh;h=cb4117b5a9949fae419fdb1c856302198a608fda;hb=df1060bb806e2d575eee5813b5f6fb0046856aa5;hp=9926badff68669956584c94c11ddc298cd86f684;hpb=37450b7423b778817c24521e60c6719335d62d26;p=serve0

diff --git a/pages/common.sh b/pages/common.sh
index 9926bad..cb4117b 100755
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -24,7 +24,7 @@ page="${_GET[pn]}" #validated
 pagesize="${_COOKIE[pagesize]}" #validated
 
 page_link=''
-[ -n "$info" ]   && page_link="i=$(urlsave "$info")&"
+[ -n "$info" ]   && page_link="i=$(urlsafe "$info")&"
 [ -n "$order" ]  && page_link="${page_link}o=${order}&"
 [ -n "$search" ] && page_link="${page_link}s=${search}&"
 [ -n "$filter" ] && page_link="${page_link}f=${filter}&"
@@ -39,83 +39,22 @@ taglist=$(
   done |sort -u |grep -xv '' |tee ${_DATA}/cache/taglist
 )
 
-_printVideo(){
-  info="$1"
-  cache="${_DATA}/cache/$info.cache"
-  meta="${_DATA}/meta/$info.meta"
-
-  if [ "$cache" -nt "$meta" ]; then
-    cat "$cache"
-  else
-    videofile="${_DATA}/videos/$info"
-    thumb="${_DATA}/thumbs/$info.jpg"
-    [ -r "$meta"  ] || ${_EXEC}/helpers/genmeta.sh "$videofile" "$meta"
-    [ -r "$thumb" ] || ${_EXEC}/helpers/genthumb.sh "$videofile" "$thumb"
-
-    head -n1 "$meta" |read length width height filename
-    [ -z "$length" ] && length=0
-    [ -z "$width"  ] && width=0
-    [ -z "$height" ] && height=0
-
-    tags="$(sed -n 2p "$meta")"
-    video="$(urlsave "videos/$info")"
-    thumb="$(urlsave "thumbs/$info.jpg")"
-    linkinfo="$(urlsave "$info")"
-
-    [ "$(($length % 60))" -lt 10 ] && minutes="$(($length / 60)):0$(($length % 60))" \
-                                   || minutes="$(($length / 60)):$(($length % 60))"
-
-    tee "$cache" <<VIDEOend
-      <li class="thumb">
-        <a class="watchlink" name="${linkinfo}" href="?action=watch&i=${linkinfo}">
-          <img src="$thumb" alt="Preview not yet available">
-        </a>
-        <h2>$info</h2>
-        
-        <input type="checkbox" name="tagsel" value="$info">
-        <span class="info property">${minutes}min</span>
-        <span class="info property">${width}x${height}</span>
-	$(printf %s "$tags" |sed -r 's:\|*([^|]+)\|*: <span class="info tag">\1</span>:g')
-      </li>
-VIDEOend
-  fi
+list_categories(){
+  echo none
+  printf %s "$taglist" |sed -rn 's;^([^:]+):.*$;\1;p' |sort -u
 }
 
-genlist(){
-  case "$order" in
-    Date)   ls -c ${_DATA}/videos/ |egrep -i "$file_pattern";;
-    Length) sed -sn 1p "${_DATA}/meta/"*.meta |sort -n |sed -r 's;^[0-9\t]+\t;;';;
-    Name)   printf '%s\n' "${_DATA}/meta/"*meta |sed -r 's;^.*/;;;s;\.meta$;;';;
-  esac
+genthumb(){
+  videofile="$1"
+  thumb="$2"
+
+  nohup nice -10 "${_EXEC}"/helpers/genthumb.sh "$videofile" "$thumb" >/dev/null 2>/dev/null &
+  #printf '%s\n' "${_EXEC}/helpers/genthumb.sh '$videofile' '$thumb' >/dev/null 2>/dev/null" \
+  #| batch
 }
+genmeta(){
+  videofile="$1"
+  meta="$2"
 
-thumblist() {
-  cache="${_DATA}/cache/${pagesize}?o=${order}&s=${search}&f=${filter}&pn=${page}"
-  if [ "$cache" -nt ${_DATA}/videos -a "$cache" -nt ${_DATA}/meta ]; then
-    cat "$cache"
-  else
-    filterex="s;^([0-9]+\t){3}(.+)\n.*$;\2;p"
-    printf '%s\n' "$filter" |tr '^' '\n' \
-    | while read each; do
-      [ "${each:0:1}" = '!' ] && filterex="/^[^\n]+\n(.*\|)?(${each#?})(\|.*)?$/d;{${filterex}}" \
-                              || filterex="/^[^\n]+\n(.*\|)?(${each})(\|.*)?$/{${filterex}}"
-    done
-      
-    genlist \
-    | if [ -n "$search" ] ; then
-      xargs -d '\n' printf "${_DATA}/meta/%s.meta\n" \
-      | xargs -d '\n' egrep -sil "$search" \
-      | sed -r 's;^.*/;;;s;\.meta$;;'
-    elif [ "$filterex" != "q0" ]; then
-      xargs -d '\n' printf "${_DATA}/meta/%s.meta\n" \
-      | xargs -d '\n' sed -srn ":a;N;2!ba;{${filterex}}"
-    else
-      cat
-    fi \
-    | sed -n "$page,$(($page + $pagesize - 1))p" \
-    | tee "$cache"
-  fi \
-  | while read line; do
-    _printVideo "$line"
-  done
+  "${_EXEC}"/helpers/genmeta.sh "$videofile" "$meta" >/dev/null
 }