X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Flist.sh;h=6cc5fdc946efcb45ec927aea1a0503765edafd22;hb=3e3a70ef3ea209edb6757b1da57254d94d11d053;hp=eddbb8c63c87cea04ba220dd5a32d8c9e1e7bfe2;hpb=a68bd6b9df0235cbe92a88f13be638825d86aac9;p=serve0 diff --git a/pages/list.sh b/pages/list.sh index eddbb8c..6cc5fdc 100755 --- a/pages/list.sh +++ b/pages/list.sh @@ -114,8 +114,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 +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 ))"