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=$(
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"
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
[ -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))"
<a class="watchlink" name="${linkinfo}" href="?action=watch&i=${linkinfo}">
<img src="$thumb" alt="Preview not yet available">
</a>
- <h2>$info</h2>
+ <h2>${htmlinfo}</h2>
- <input type="checkbox" name="tagsel" value="$info">
+ <input type="checkbox" name="tagsel" value="${htmlinfo}">
<span class="info property">${minutes}min</span>
<span class="info property">${width}x${height}</span>
- $(printf %s "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
+ $(printf %s "$tags" |sed -r 's:\|*([^|]+)\|*: <span class="info tag">\1</span>:g')
</li>
VIDEOend
fi
}
-_by_name(){ find ${_DATA}/videos/ -mindepth 1 -maxdepth 1 -printf '%f\n' |sort |egrep -i "$file_pattern" }
-_by_date(){ ls -c ${_DATA}/videos/ |egrep -i "$file_pattern" }
-_by_length(){ find ${_DATA}/by_length/ -mindepth 1 -maxdepth 1 -printf '%f\n' |sort |sed -r 's:[0-9]{5} - ::' }
+genlist(){
+ case "$order" in
+ Date) ls -c "${_DATA}"/videos/ |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;^.*/;;;';;
+ esac
+}
thumblist() {
- cache="${_DATA}/cache/?o=${order}&s=${search}&f=${filter}&pn=${page}"
+ cache="${_DATA}/cache/${pagesize}?o=${order}&s=${search}&f=${filter}&pn=${page}"
if [ "$cache" -nt ${_DATA}/videos -a "$cache" -nt ${_DATA}/meta ]; then
cat "$cache"
else
- filterex="q0"
- for each in $(sed 's,\^, ,g' <<<"$filter"); do
- if egrep -q '^!' <<<"$each"; then
- this="$(sed 's,^!,,' <<<"$each")"
- filterex="/${this}/q1;{${filterex}}"
- else
- filterex="/${each}/{${filterex}}"
- fi
+ filterex="s;^([0-9]+\t){3}(.+)\n.*$;\2;p"
+ printf '%s\n' "$filter" |tr '^' '\n' \
+ | while read each; do
+ [ "${each:0:1}" = '!' ] && filterex="/^[^\n]+\n(.*\|)?(${each#?})(\|.*)?$/d;{${filterex}}" \
+ || filterex="/^[^\n]+\n(.*\|)?(${each})(\|.*)?$/{${filterex}}"
done
-
- case "$order" in
- Date) genlist="_by_date"
- ;;
- Length) genlist="_by_length"
- ;;
- *) genlist="_by_name"
- ;;
- esac
- if [ -n "$search" ] ; then
- #$genlist |egrep -i "$search"
- $genlist |sed -rn 's:^(.+)$:'"${_DATA}"'/meta/\1'.meta':p' |xargs -d\\n egrep -sil "$search" |sed -rn 's:^(.*/)+([^/]+)\.meta$:\2:p'
- elif [ "$filterex" != "q0" ]; then
- $genlist |while read video; do
- [ -r "${_DATA}/meta/$video.meta" ] && sed -rn "2{$filterex;q1}" "${_DATA}/meta/$video.meta" && printf '%s\n' "$video"
- done
+ genlist \
+ | if [ -n "$search" ] ; then
+ debug "Applying search: ${search}"
+ xargs -d '\n' printf "${_DATA}/meta/%s.meta\n" \
+ | xargs -d '\n' egrep -sil "$search" \
+ | sed -r 's;^.*/;;;s;\.meta$;;'
+ elif [ -n "$filter" ]; then
+ debug "Applying filters: ${filter} ++ ${filterex}"
+ xargs -d '\n' printf "${_DATA}/meta/%s.meta\n" \
+ | xargs -d '\n' sed -srn ":a;N;2!ba;{${filterex}}"
else
- $genlist
- fi |sed -n $(($page * $pagesize + 1)),$(($page * $pagesize + $pagesize))p |tee "$cache"
- fi | while read line; do
+ debug "No search or filtering"
+ cat
+ fi \
+ | sed -n "$page,$(($page + $pagesize - 1))p" \
+ | tee "$cache"
+ fi \
+ | while read line; do
_printVideo "$line"
done
}
projects / serve0 / blobdiff