X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;ds=sidebyside;f=pages%2Fcommon.sh;h=0d33ee4e5336f20d2d2f4e5142ec3d72de50bfe3;hb=eec85ea1fe623ac2e2aae698625443a90bbf8fc6;hp=5e233142f7d289ffb354fbe3d868f7c70cce5081;hpb=77a26b975ad1dfdff620ec9156b53d6c1c032f92;p=serve0
diff --git a/pages/common.sh b/pages/common.sh
index 5e23314..0d33ee4 100755
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -1,6 +1,6 @@
#!/bin/zsh
-# Copyright 2014, 2015 Paul Hänsch
+# Copyright 2014 - 2016 Paul Hänsch
#
# This file is part of Serve0.
#
@@ -17,125 +17,73 @@
# You should have received a copy of the GNU Affero General Public License
# along with Serve0. If not, see .
-filter="$_GET[\"f\"]"
-search="$_GET[\"s\"]"
-order=$(echo -E "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
-page=$(echo -E "$_GET[\"p\"]" |egrep '^[0-9]+$')
-[ -z "$page" ] && page=0
+filter="${_GET[f]}"
+search="${_GET[s]}"
+order="${_GET[o]}" #validated
+page="${_GET[pn]}" #validated
+pagesize="${_COOKIE[pagesize]}" #validated
+pagecount=0
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}p=$([ "$page" = 0 ] && echo 0 || echo $(($page - 1)) )"
-page_next="${page_link}p=$(($page + 1))"
-page_this="${page_link}p=$page"
+[ "$page" -le "$pagesize" ] && page_prev="${page_link}pn=1" || page_prev="${page_link}pn=$(($page - $pagesize))"
+page_next="${page_link}pn=$(($page + $pagesize))"
+page_this="${page_link}pn=$page"
taglist=$(
- [ -r ${_DATA}/cache/taglist ] && cat ${_DATA}/cache/taglist ||\
- for each in ${_DATA}/meta/*.meta; do
+if [ -r ${_DATA}/cache/taglist ]; then
+ cat ${_DATA}/cache/taglist
+else
+ truncate -s0 ${_DATA}/cache/taglist
+ truncate -s0 ${_DATA}/cache/tagnorm
+ (for each in ${_DATA}/meta/*.meta; do
sed -n '2s:|:\n:gp' "$each"
- done |sort -u |grep -xv '' |tee ${_DATA}/cache/taglist
+ done \
+ | sort
+ printf \\n
+ ) | (while read tag; do
+ if [ "$tag" = "$lasttag" ]; then
+ tagcount=$(( ${tagcount:-0} + 1 ))
+ else
+ [ -n "$lasttag" ] && printf %s\\t%s\\n "$tagcount" "$lasttag"
+ tagcount=1
+ fi
+ lasttag="$tag"
+ done \
+ | sort -rn
+ printf \\n
+ ) | while read x tag; do
+ topcnt=$(grep "${tag%%:*}" ${_DATA}/cache/taglist |wc -l)
+ [ $topcnt -lt 10 ] \
+ && printf %s\\n "$tag" >>${_DATA}/cache/taglist \
+ || printf %s\\n "$tag" >>${_DATA}/cache/tagnorm
+ done
+ cat ${_DATA}/cache/taglist
+ sort ${_DATA}/cache/tagnorm \
+ | tee -a ${_DATA}/cache/taglist
+ rm ${_DATA}/cache/tagnorm
+fi
)
-_printVideo(){
- info="$1"
- cache="${_DATA}/cache/$info.cache"
- meta="${_DATA}/meta/$info.meta"
-
- if [ "$cache" -nt "$meta" ]; then
- 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"
-
- head -n1 "$meta" |read length width height filename
- [ -z "$length" ] && length=0
- [ -z "$width" ] && width=0
- [ -z "$height" ] && height=0
-
- tags="$(sed -n 2p "$meta")"
- video="$(urlsave "videos/$info")"
- thumb="$(urlsave "thumbs/$info.jpg")"
- linkinfo="$(urlsave "$info")"
-
- [ "$(($length % 60))" -lt 10 ] &&\
- minutes="$(($length / 60)):0$(($length % 60))" ||\
- minutes="$(($length / 60)):$(($length % 60))"
-
- rpiaddr="$(host pfostenpanne |sed -r 's;^.* ([0-9\.]+)$;\1;')"
- rpidull="http://${rpiaddr}/?player=play&path=http://jupiter:8000/${video}"
- rpicgi="http://${rpiaddr}/?player=play&path=$(urlsave "http://jupiter:8000/?action=transcode&i=${linkinfo}&t=480")"
+list_categories(){
+ printf none\\n
+ printf %s "$taglist" |sed -rn 's;^([^:]+):.*$;\1;p' |sort -u
+}
- [ $height -gt 480 -a $width -gt 480 ] && \
- raspi="RasPi" \
- || raspi="RasPi"
- [ $height -gt 480 ] && \
- alt480="480p" \
- ||unset alt480
- [ $height -gt 240 ] && \
- alt240="240p" \
- ||unset alt240
+genthumb(){
+ videofile="$1"
+ thumb="$2"
- tee "$cache" <
-
-
-
- $info
- ${alt480} ${alt320} ${alt240} ${raspi}
-
-
- ${minutes}min
- ${width}x${height}
- $(echo -E "$tags" |sed -r 's:\|*([^|]+)\|*:\1:g')
-
-VIDEOend
- fi
+ 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"
-_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} - ::' }
-
-thumblist() {
- cache="${_DATA}/cache/?o=${order}&s=${search}&f=${filter}&p=${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
- 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" && echo -E "$video"
- done
- else
- $genlist
- fi |sed -n $(($page * $pagesize + 1)),$(($page * $pagesize + $pagesize))p |tee "$cache"
- fi | while read line; do
- _printVideo "$line"
- done
+ "${_EXEC}"/helpers/genmeta.sh "$videofile" "$meta" >/dev/null
}