X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;ds=inline;f=pages%2Flist.sh;h=37f764e4bf15979d809a53d3bf91512929574ea7;hb=e542e0a34e796df05efa42cdb091ba4032836bdd;hp=9f2b9eeb761c26c4f4bf66394d72eb895311783c;hpb=235877da7d36cb076fcbfed285b54ce967907642;p=serve0
diff --git a/pages/list.sh b/pages/list.sh
index 9f2b9ee..37f764e 100755
--- 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;\^; \&\; ;g' }
+present_filter(){
+ printf %s\\n "$*" \
+ | sed -r 's;(^|!|\^|\|)([^!\^\|:]+:);\1;g;s;\^;\n;g' \
+ | sort -r \
+ | sed -r '$q;s;$; \&\; ;g'
+}
if [ -n "$search" ]; then
TITLE="$search by $order"
@@ -34,25 +39,12 @@ 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 "by ${lineo}: $(present_filter "$linef")"
- done
-}
-
category_selected(){
cat="${1}:"
filter="$2"
[ "$cat" = "none:" ] && cat=''
- printf %s "$taglist" \
+ printf %s "$taglist_filter" \
| sed -r 's;^('"$filter"')$;1 &;;t;s;^;0 ;' \
| sed -rn 's;^(0|1) '"$cat"'([^:]+)$;\1 \2;p' \
| sed 's;^0 ;;'
@@ -81,16 +73,16 @@ _printVideo(){
thumb="$(urlsafe "thumbs/$info.jpg")"
linkinfo="$(urlsafe "$info")"
htmlinfo="$(htmlsafe "$info")"
+ attrinfo="$(attribsafe "$info")"
- [ "$(($length % 60))" -lt 10 ] && minutes="$(($length / 60)):0$(($length % 60))" \
- || minutes="$(($length / 60)):$(($length % 60))"
+ minutes="$(printf "%d:%02d" $(($length / 60)) $(($length % 60)) )"
tee "$cache" <
-
+
+
- ${htmlinfo}
+
+
${minutes}min
@@ -103,21 +95,21 @@ VIDEOend
genlist(){
case "$order" in
- Date) ls -c "${_DATA}"/videos/ |egrep -i "$file_pattern";;
+ Date) find "${_DATA}"/videos/ -maxdepth 1 -mindepth 1 -printf '%T@ %f\n' |sort -r |cut -d\ -f2- |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}"/videos/* |sed -r 's;^.*/;;;';;
+ Name) find "${_DATA}"/videos/ -maxdepth 1 -mindepth 1 -printf '%f\n' |sort |egrep -i "$file_pattern";;
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
+ if [ -s "$cache" -a "$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' \
+ | sed -r 's;[]\/\(\)\\\^\$\?\.\+\*\;\[\{\}];\\\\&;g' \
| while read each; do
[ "${each:0:1}" = '!' ] && filterex="/^[^\n]+\n(.*\|)?(${each#?})(\|.*)?$/d;{${filterex}}" \
|| filterex="/^[^\n]+\n(.*\|)?(${each})(\|.*)?$/{${filterex}}"
@@ -137,10 +129,18 @@ 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() {
+ printf "$(( $(selectionlist | wc -l) / $pagesize + 1 ))"
+}