bugfix: show last page in pagination

[serve0] / pages / list.sh

diff --git a/pages/list.sh b/pages/list.sh
index deb8ce8518316311e29378f6512d3598f4496082..063bf40893e1b67e74e29ac6f61f6069318eb7dd 100755 (executable)
--- a/pages/list.sh
+++ b/pages/list.sh
@@ -24,7 +24,12 @@ LF='
 filters="${_GET[f]}"
 debug "FILTERS: $filters"
 
-present_filter(){ printf %s "$*" |sed -r 's;(^|!|\^|\|)([^!\^\|:]+:);\1;g;s;\^; \&amp\; ;g' }
+present_filter(){
+  printf %s\\n "$*" \
+  | sed -r 's;(^|!|\^|\|)([^!\^\|:]+:);\1;g;s;\^;\n;g' \
+  | sort -r \
+  | sed -r '$q;s;$; \&amp\; ;g'
+}
 
 if [ -n "$search" ]; then
   TITLE="$search by $order"
@@ -109,13 +114,15 @@ genlist(){
   esac
 }
 
-thumblist() {
-  cache="${_DATA}/cache/${pagesize}?o=${order}&s=${search}&f=${filter}&pn=${page}"
+selectionlist() {
+  cachebase="?o=${order}&s=${search//\//}&f=${filter//\//}"
+  cache="${_DATA}/cache/${cachebase}"
   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' \
+    | sed -r 's;[]\/\(\)\\\^\$\?\.\+\*\;\[\{\}];\\\\&;g' \
     | while read each; do
       [ "${each:0:1}" = '!' ] && filterex="/^[^\n]+\n(.*\|)?(${each#?})(\|.*)?$/d;{${filterex}}" \
                               || filterex="/^[^\n]+\n(.*\|)?(${each})(\|.*)?$/{${filterex}}"
@@ -135,10 +142,16 @@ thumblist() {
       debug "No search or filtering"
       cat
     fi \
-    | sed -n "$page,$(($page + $pagesize - 1))p" \
     | tee "$cache"
-  fi \
+  fi
+}
+
+thumblist() {
+  selectionlist \
+  | sed -n "$page,$(($page + $pagesize - 1))p" \
   | while read line; do
     _printVideo "$line"
   done
 }
+
+pagecount="$(( $(selectionlist | wc -l) / $pagesize + 1 ))"