X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Flist.sh;h=757d5418e95bebff8123b5859c13c89579e862c9;hb=9554fea689ec1519a572888aae9dc37ae140cd57;hp=4d25103059d14932a90e552442c7cd152ca41df1;hpb=12c83ad8f3ac1a3178ced9dbd82c3b6e078a06b9;p=serve0
diff --git a/pages/list.sh b/pages/list.sh
index 4d25103..757d541 100755
--- a/pages/list.sh
+++ b/pages/list.sh
@@ -1,6 +1,6 @@
#!/bin/zsh
-# Copyright 2014 - 2016 Paul Hänsch
+# Copyright 2014 - 2017 Paul Hänsch
#
# This file is part of Serve0.
#
@@ -17,6 +17,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with Serve0. If not, see .
+page_link="p=list&"
+
. $_EXEC/pages/common.sh
LF='
@@ -73,16 +75,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
@@ -95,16 +97,16 @@ 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
}
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"
@@ -141,4 +143,6 @@ thumblist() {
done
}
-pagecount="$(( $(selectionlist | wc -l) / $pagesize + 1 ))"
+pagecount() {
+ printf "$(( $(selectionlist | wc -l) / $pagesize + 1 ))"
+}