X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=list.sh;h=ddf111136381418fcf3db8a342906325c5680555;hp=61099e71450309411935e9158d2084bd22ca0c93;hb=ca9072b5b140d1a78f4c38f0751a9256fdc8f28d;hpb=dfdfcfb7ac57a823e639a19d268436753385cbed

diff --git a/list.sh b/list.sh
index 61099e7..ddf1111 100644
--- a/list.sh
+++ b/list.sh
@@ -1,25 +1,38 @@
 #!/bin/sh
 
-list_item(){
+list_item() {
   name="$(HTML "$1")"
   path="$(HTML "$ITEM/$1")"
+  meta="$_DATA/$ITEM/.index/meta"
 
   if [ -d "$_DATA/$ITEM/$1" ]; then
     printf '[a .list .dir href="%s" %s]' \
       "$path" "$name"
+  elif [ -f "$meta" ]; then
+    read -r length width height tags comment n <<-EOF
+	$(grep -m1 -F "	$1" "$meta")
+	EOF
+    printf '[div .list .file
+              [a href="%s" [img src="%s?a=thumbnail"][label %s]]
+              [span .time %i:%imin] [span .dim %ix%i] %s
+            ]' \
+      "$path" "$path" "$name" \
+      "$((length / 60))" "$((length % 60))" \
+      "$width" "$height" \
+      "$(printf %s\\n "${tags#tags=}" |tr , ' ' |xargs printf '[span .tag %s]')"
   else
-    printf '[div .list .file [a href="%s" [img src="%s?a=thumbnail"] %s]]' \
+    printf '[div .list .file [a href="%s" [img src="%s?a=thumbnail"][label %s]]]' \
       "$path" "$path" "$name"
   fi
 }
 
-list_items(){
+list_items() {
   mode="$(COOKIE mode |grep -m1 -xE 'index|browse' || printf browse )"
 
   [ "$mode" = browse -a "$ITEM" ] && printf '..\n'
   if [ "$mode" = browse ]; then
-    [ -d "$_DATA/$ITEM/.index" -a "$_DATA/$ITEM" -nt "$_DATA/$ITEM/.index/meta" ] \
-    && . "$_EXEC/update_meta.sh"
+    [ -d "$_DATA/$ITEM/.index" -a \! "$_DATA/$ITEM" -ot "$_DATA/$ITEM/.index/meta" ] \
+    && dir="$_DATA/$ITEM" . "$_EXEC/update_meta.sh"
     (cd "$_DATA/$ITEM";
      find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
        -exec stat -c '%Y	%n' '{}' +
@@ -27,6 +40,11 @@ list_items(){
        -exec stat -c '%Y	%n' '{}' +
     )
   elif [ "$mode" = index ]; then
+    find "$_DATA/$ITEM" -type d -name .index \
+    | while d="$(line)"; do
+      [ ! "${d%/.index}" -ot "$d/meta" ] \
+      && dir="${d%/.index}" . "$_EXEC/update_meta.sh"
+    done
     (cd "$_DATA/$ITEM";
      find ./ -type f \
        -exec stat -c '%Y	%n' '{}' +
@@ -37,10 +55,9 @@ list_items(){
     Name) sort -k 2;;
   esac \
   | cut -d/ -f2-
-    
 }
 
-list_paginate(){
+list_paginate() {
   page="$(GET p |grep -xE '[0-9]+' || printf 1)"
 
   printf '[div .itemlist '