X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Flist.sh;h=39a6ccbea7e64855400e61ca81833aedfd8fa3f2;hb=30ac844acd16c48c632232285259a2fc449a58ce;hp=2d3cbf3bad443f2eb5c0aec98ee6c8afbc60dca9;hpb=47b905d14103c01625d16fe557e63e34317c6453;p=serve0

diff --git a/pages/list.sh b/pages/list.sh
index 2d3cbf3..39a6ccb 100755
--- a/pages/list.sh
+++ b/pages/list.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014, 2015 Paul Hänsch
+# Copyright 2014 - 2016 Paul Hänsch
 #
 # This file is part of Serve0.
 # 
@@ -19,16 +19,32 @@
 
 . $_EXEC/pages/common.sh
 
+LF='
+'
 filters="${_GET[f]}"
 debug "FILTERS: $filters"
 
+present_filter(){ printf %s "$*" |sed -r 's;(^|!|\^|\|)([^!\^\|:]+:);\1;g;s;\^; \&amp\; ;g' }
+
+if [ -n "$search" ]; then
+  TITLE="$search by $order"
+elif [ -n $filter ]; then
+  TITLE="$(present_filter "$filter") by $order"
+else
+  TITLE="List by $order"
+fi
+
 quicklinks(){
   output=''
-  tac ${_DATA}/meta/recent |while [ "$(echo "$output" |wc -l)" -lt 10 ] && read line; do
-    line="<a href="$line">$line</a>" 
-    echo "$output" |grep -qF "$line" || output="$output$line\n"
+  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 
-  echo $output
+  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(){
@@ -56,9 +72,9 @@ _printVideo(){
     [ -r "$meta"  ] || genmeta "$videofile" "$meta"
 
     head -n1 "$meta" |read length width height filename
-    [ -z "$length" ] && length=0
-    [ -z "$width"  ] && width=0
-    [ -z "$height" ] && height=0
+    length=$(validate "$length" '[0-9]+' 0)
+    width=$(validate "$width" '[0-9]+' 0)
+    height=$(validate "$height" '[0-9]+' 0)
 
     tags="$(sed -n 2p "$meta")"
     video="$(urlsafe "videos/$info")"
@@ -94,12 +110,14 @@ genlist(){
 }
 
 thumblist() {
-  cache="${_DATA}/cache/${pagesize}?o=${order}&s=${search}&f=${filter}&pn=${page}"
+  cachebase="${pagesize}?o=${order}&s=${search//\//}&f=${filter//\//}&pn=${page}"
+  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}}"