X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;ds=sidebyside;f=pages%2Fcommon.sh;h=e03e6f5da8e5e9c7e2f413594713f7f82c448f2c;hb=bd06005650121b28e904060a5ab4da7c0b99529a;hp=377e5f54b3f9f69450911a7d4f5312e2024dacf2;hpb=1fa16d769f765fab3eab88bdc14ecf6adf299347;p=serve0 diff --git a/pages/common.sh b/pages/common.sh index 377e5f5..e03e6f5 100755 --- a/pages/common.sh +++ b/pages/common.sh @@ -19,17 +19,17 @@ filter="${_GET[f]}" search="${_GET[s]}" -order=$(echo -E "${_GET[o]}" |egrep '^(Name|Date|Length)$') -page=$(echo -E "${_GET[pn]}" |egrep '^[0-9]+$') -[ -z "$page" ] && page=0 +order="${_GET[o]}" #validated +page="${_GET[pn]}" #validated +pagesize="${_COOKIE[pagesize]}" #validated page_link='' -[ -n "$info" ] && page_link="i=$(urlsave "$info")&" +[ -n "$info" ] && page_link="i=$(urlsafe "$info")&" [ -n "$order" ] && page_link="${page_link}o=${order}&" [ -n "$search" ] && page_link="${page_link}s=${search}&" [ -n "$filter" ] && page_link="${page_link}f=${filter}&" -page_prev="${page_link}pn=$([ "$page" = 0 ] && echo 0 || echo $(($page - 1)) )" -page_next="${page_link}pn=$(($page + 1))" +page_prev="${page_link}pn=$([ "$page" -le "$pagesize" ] && echo 1 || echo $(($page - $pagesize)) )" +page_next="${page_link}pn=$(($page + $pagesize))" page_this="${page_link}pn=$page" taglist=$( @@ -39,6 +39,14 @@ taglist=$( done |sort -u |grep -xv '' |tee ${_DATA}/cache/taglist ) +genthumb(){ + videofile="$(printf %s "$1" |sed -r "s;';'\\'';g")" + thumb="$(printf %s "$2" |sed -r "s;';'\\'';g")" + + printf '%s\n' "${_EXEC}/helpers/genthumb.sh '$videofile' '$thumb' >/dev/null 2>/dev/null" \ + | batch +} + _printVideo(){ info="$1" cache="${_DATA}/cache/$info.cache" @@ -48,9 +56,9 @@ _printVideo(){ cat "$cache" else videofile="${_DATA}/videos/$info" - thumb="${_DATA}/thumbs/$info.jpg" - [ -r "$meta" ] || ${_EXEC}/helpers/genmeta.sh "$videofile" "$meta" - [ -r "$thumb" ] || ${_EXEC}/helpers/genthumb.sh "$videofile" "$thumb" + thumb="${_DATA}/thumbs/${info}.jpg" + [ -r "$thumb" ] || genthumb "$videofile" "$thumb" + [ -r "$meta" ] || "${_EXEC}/helpers/genmeta.sh" "$videofile" "$meta" >/dev/null head -n1 "$meta" |read length width height filename [ -z "$length" ] && length=0 @@ -58,9 +66,10 @@ _printVideo(){ [ -z "$height" ] && height=0 tags="$(sed -n 2p "$meta")" - video="$(urlsave "videos/$info")" - thumb="$(urlsave "thumbs/$info.jpg")" - linkinfo="$(urlsave "$info")" + video="$(urlsafe "videos/$info")" + thumb="$(urlsafe "thumbs/$info.jpg")" + linkinfo="$(urlsafe "$info")" + htmlinfo="$(htmlsafe "$info")" [ "$(($length % 60))" -lt 10 ] && minutes="$(($length / 60)):0$(($length % 60))" \ || minutes="$(($length / 60)):$(($length % 60))" @@ -70,12 +79,12 @@ _printVideo(){ -