X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Flist.sh;h=5628136ec94a389296b6ae666116bd2532e01b83;hb=928455a621e5fe136bf1cad14bcb66bb54938388;hp=a9eeb331720e45d97c1ce2e8d183287fc12c6c31;hpb=78b2b96e212289a0f78d6e2bb957808a28914902;p=serve0

diff --git a/pages/list.sh b/pages/list.sh
index a9eeb33..5628136 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 <http://www.gnu.org/licenses/>. 
 
+page_link="p=list&"
+
 . $_EXEC/pages/common.sh
 
 LF='
@@ -73,11 +75,12 @@ _printVideo(){
     thumb="$(urlsafe "thumbs/$info.jpg")"
     linkinfo="$(urlsafe "$info")"
     htmlinfo="$(htmlsafe "$info")"
+    attrinfo="$(attribsafe "$info")"
 
     minutes="$(printf "%d:%02d" $(($length / 60)) $(($length % 60)) )"
 
     tee "$cache" <<VIDEOend
-      <li class="thumb">
+      <li id="$attrinfo" class="thumb">
         <button class="watchlink" name="${linkinfo}" formaction="?action=watch&i=${linkinfo}">
           <img src="$thumb" alt="Preview not yet available">
         </button>
@@ -94,9 +97,25 @@ VIDEOend
 
 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;^.*/;;;';;
+    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;;'
+      | while read file; do
+        [ -f "${_DATA}/videos/${file}" ] && printf '%s\\n' "$file"
+      done
+      ;;
+    Name)
+      find "${_DATA}"/videos/ -maxdepth 1 -mindepth 1 -printf     '%f\n' \
+      | sort -f \
+      | egrep -i "$file_pattern"
+      ;;
   esac
 }