separate quicklinks page

[serve0] / pages / list.sh

diff --git a/pages/list.sh b/pages/list.sh
index eddbb8c63c87cea04ba220dd5a32d8c9e1e7bfe2..2c4b1f18ee2dd6ecbf58aefd41b0496d2f3328cb 100755 (executable)
--- a/pages/list.sh
+++ b/pages/list.sh
@@ -39,19 +39,6 @@ else
   TITLE="List by $order"
 fi
 
-quicklinks(){
-  output=''
-  tac ${_DATA}/meta/recent \
-  | while [ "$(printf %s "$output" |wc -l)" -lt 10 ] && read line; do
-    printf %s "$output" |grep -qF "$line" || output="$output$line$LF"
-  done 
-  printf %s "$output" |while read line; do
-    linef=$(printf %s "$line" |sed -r 's;^.*(\?|&)f=([^&]+)&?.*$;\2;g')
-    lineo=$(printf %s "$line" |sed -r 's;^.*(\?|&)o=([^&]+)&?.*$;\2;g')
-    printf %s "<a href="$line">by ${lineo}: $(present_filter "$linef")</a>" 
-  done
-}
-
 category_selected(){
   cat="${1}:"
   filter="$2"
@@ -114,8 +101,8 @@ genlist(){
   esac
 }
 
-thumblist() {
-  cachebase="${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"
@@ -142,10 +129,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 ))"