X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;ds=sidebyside;f=pages%2Fcommon.sh;h=6b597d5abeb1d6b84cdb4f662462067632ff1fee;hb=285b1ceecc1204178cec53870a109c901d6a3839;hp=9e659bf1c5a3575c6050068fbf5310aec3d85aa7;hpb=0619bc447c21ac196734848ae3b0aa786b6eb1ee;p=serve0
diff --git a/pages/common.sh b/pages/common.sh
index 9e659bf..6b597d5 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,21 @@ taglist=$(
done |sort -u |grep -xv '' |tee ${_DATA}/cache/taglist
)
+genthumb(){
+ videofile="$1"
+ thumb="$2"
+
+ nohup nice -10 "${_EXEC}"/helpers/genthumb.sh "$videofile" "$thumb" >/dev/null 2>/dev/null &
+ #printf '%s\n' "${_EXEC}/helpers/genthumb.sh '$videofile' '$thumb' >/dev/null 2>/dev/null" \
+ #| batch
+}
+genmeta(){
+ videofile="$1"
+ meta="$2"
+
+ "${_EXEC}"/helpers/genmeta.sh "$videofile" "$meta" >/dev/null
+}
+
_printVideo(){
info="$1"
cache="${_DATA}/cache/$info.cache"
@@ -48,9 +63,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" ] || genmeta "$videofile" "$meta"
head -n1 "$meta" |read length width height filename
[ -z "$length" ] && length=0
@@ -58,9 +73,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,56 +86,55 @@ _printVideo(){
-