X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Flist.sh;h=37f764e4bf15979d809a53d3bf91512929574ea7;hb=5667597778145b23dc04aa65e1e9ea3ac0b7fd97;hp=7b68f29098e9463ca90edc50875a4d589e2a0724;hpb=180a9479b49361d68a684d4f0452f6f32bd79121;p=serve0

diff --git a/pages/list.sh b/pages/list.sh
index 7b68f29..37f764e 100755
--- a/pages/list.sh
+++ b/pages/list.sh
@@ -73,15 +73,16 @@ _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>
-        <h2>${htmlinfo}</h2>
+        <h2><a href="?action=watch&i=${linkinfo}">${htmlinfo}</a></h2>
         
         <input type="checkbox" name="tagsel" value="${htmlinfo}">
         <span class="info property">${minutes}min</span>
@@ -94,16 +95,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"