introduced page size cookie; globalised some input validation

[serve0] / pages / common.sh

diff --git a/pages/common.sh b/pages/common.sh
index 739f4caf1726629f685055a24afa62d12b48dbd0..9926badff68669956584c94c11ddc298cd86f684 100755 (executable)
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -17,20 +17,20 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Serve0.  If not, see <http://www.gnu.org/licenses/>. 
 
-filter="$_GET[\"f\"]"
-search="$_GET[\"s\"]"
-order=$(echo -E "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
-page=$(echo -E "$_GET[\"p\"]" |egrep '^[0-9]+$')
-[ -z "$page" ] && page=0
+filter="${_GET[f]}"
+search="${_GET[s]}"
+order="${_GET[o]}" #validated
+page="${_GET[pn]}" #validated
+pagesize="${_COOKIE[pagesize]}" #validated
 
 page_link=''
 [ -n "$info" ]   && page_link="i=$(urlsave "$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}&"
-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"
+page_prev="${page_link}pn=$([ "$page" -le "$pagesize" ] && echo 1 || echo $(($page - $pagesize)) )"
+page_next="${page_link}pn=$(($page + $pagesize))"
+page_this="${page_link}pn=$page"
 
 taglist=$(
   [ -r ${_DATA}/cache/taglist ] && cat ${_DATA}/cache/taglist ||\
@@ -62,80 +62,60 @@ _printVideo(){
     thumb="$(urlsave "thumbs/$info.jpg")"
     linkinfo="$(urlsave "$info")"
 
-    [ "$(($length % 60))" -lt 10 ] &&\
-      minutes="$(($length / 60)):0$(($length % 60))" ||\
-      minutes="$(($length / 60)):$(($length % 60))"
-
-    rpiaddr="$(host pfostenpanne |sed -r 's;^.* ([0-9\.]+)$;\1;')"
-    rpidull="http://${rpiaddr}/?path=http://jupiter:8000/${video}"
-    rpicgi="http://${rpiaddr}/?path=$(urlsave "http://jupiter:8000/?action=transcode&i=${linkinfo}&t=480")"
-
-    [ $height -gt 480 ] && \
-       raspi="<a class=\"videolink alt raspi\" href=\"${rpicgi}\">RasPi</a>" \
-    || raspi="<a class=\"videolink alt raspi\" href=\"${rpidull}\">RasPi</a>"
-    [ $height -gt 480 ] && \
-      alt480="<a class=\"videolink alt 480p\" href=\"?action=transcode&i=${linkinfo}&t=480\">480p</a>" \
-    ||unset alt480
-    [ $height -gt 240 ] && \
-      alt240="<a class=\"videolink alt 240p\" href=\"?action=transcode&i=${linkinfo}&t=240\">240p</a>" \
-    ||unset alt240
+    [ "$(($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">
+          <img src="$thumb" alt="Preview not yet available">
         </a>
-        <a class="videolink" href="$video">$info</a>
-        ${alt480} ${alt320} ${alt240} ${raspi}<br>
+        <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>
-       $(echo -E "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
-      </div>
+       $(printf %s "$tags" |sed -r 's:\|*([^|]+)\|*: <span class="info tag">\1</span>:g')
+      </li>
 VIDEOend
   fi
 }
 
-_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 -printf '%f\n' |sort |sed -r 's:[0-9]{5} - ::' }
+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
+}
 
 thumblist() {
-  cache="${_DATA}/cache/?o=${order}&s=${search}&f=${filter}&p=${page}"
+  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="q0"
-    for each in $(sed 's,\^, ,g' <<<"$filter"); do
-      if egrep -q '^!' <<<"$each"; then
-        this="$(sed 's,^!,,' <<<"$each")"
-        filterex="/${this}/q1;{${filterex}}"
-      else
-        filterex="/${each}/{${filterex}}"
-      fi
+    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
-    
-    case "$order" in
-      Date) genlist="_by_date"
-        ;;
-      Length) genlist="_by_length"
-        ;;
-      *) genlist="_by_name"
-        ;;
-    esac
       
-    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'
+    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
-      $genlist |while read video; do
-        [ -r "${_DATA}/meta/$video.meta" ] && sed -rn "2{$filterex;q1}" "${_DATA}/meta/$video.meta" && echo -E "$video"
-      done
+      xargs -d '\n' printf "${_DATA}/meta/%s.meta\n" \
+      | xargs -d '\n' sed -srn ":a;N;2!ba;{${filterex}}"
     else
-      $genlist
-    fi |sed -n $(($page * $pagesize + 1)),$(($page * $pagesize + $pagesize))p |tee "$cache"
-  fi | while read line; do
+      cat
+    fi \
+    | sed -n "$page,$(($page + $pagesize - 1))p" \
+    | tee "$cache"
+  fi \
+  | while read line; do
     _printVideo "$line"
   done
 }