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

diff --git a/list.sh b/list.sh
index 49b9273..ddf1111 100644
--- a/list.sh
+++ b/list.sh
@@ -1,48 +1,66 @@
 #!/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_dirs(){
-  [ "$ITEM" ] && printf '..\n'
-  (cd "$_DATA/$ITEM";
-   find ./ -type d -mindepth 1 -maxdepth 1 \
-     -exec stat -c '%Y	%n' '{}' +
-   ) \
-  | { [ "$(GET o)" = Date ] && sort -rn || sort -k 2; } \
-  | cut -d/ -f2-
-}
-
-list_files(){
-  (cd "$_DATA/$ITEM";
-   find ./ -type f -mindepth 1 -maxdepth 1 \
-     -exec stat -c '%Y	%n' "${f#./}" '{}' + 2>&-
-   ) \
-  | { [ "$(GET o)" = Date ] && sort -rn || sort -k 2; } \
-  | cut -d/ -f2-
-}
+list_items() {
+  mode="$(COOKIE mode |grep -m1 -xE 'index|browse' || printf browse )"
 
-list_tree(){
-  (cd "$_DATA/$ITEM";
-   find ./ -type f \
-     -exec stat -c '%Y	%n' '{}' +
-   ) \
-  | { [ "$(GET o)" = Date ] && sort -rn || sort -k 2; } \
+  [ "$mode" = browse -a "$ITEM" ] && printf '..\n'
+  if [ "$mode" = browse ]; then
+    [ -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' '{}' +
+     find ./ -type f -mindepth 1 -maxdepth 1 \
+       -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' '{}' +
+    )
+  fi \
+  | case $ORDER in
+    Date) sort -rn;;
+    Name) sort -k 2;;
+  esac \
   | cut -d/ -f2-
 }
 
-list_paginate(){
+list_paginate() {
   page="$(GET p |grep -xE '[0-9]+' || printf 1)"
+
+  printf '[div .itemlist '
   while i="$(line)"; do
     c=$((${c-0} + 1))
     if [ $c -lt $page ]; then
@@ -51,11 +69,14 @@ list_paginate(){
       list_item "$i"
     fi
   done
+  printf ']'
 
+  printf '[div .pagination'
   for n in $(seq 1 $((c / LISTSIZE + 1)) ); do
     printf '[a .page href="%s" %s]' \
-      "?p=$(( (n - 1) * LISTSIZE + 1))" "$n" |tee /dev/stderr
+      "?p=$(( (n - 1) * LISTSIZE + 1))" "$n"
   done
+  printf ']'
 }
 
 printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
@@ -65,17 +86,20 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
 [html [head [title Listing]
   [link rel=stylesheet href="/style.css" ]
 ] [body
-  $(w_search)
-  [input type=checkbox #t_prefs .toggle ][label for=t_prefs &#x2699;]
+  [div #navigation
+    [a #t_bookmarks href="#bookmarks" &#x2605;]
+    $(w_search)
+    [a #t_avsearch href="#advsearch" Advanced]
+    [a #t_prefs href="#prefs" &#x2699;]
+  ]
   $(w_prefs)
-  $(if [ "$(COOKIE mode)" = index ]; then
-    list_tree
-  else
-    list_dirs
-    list_files
-  fi \
-  | list_paginate
+
+  $(list_items \
+    | list_paginate
   )
+  [div #editing
+    $(w_index)
+  ]
 ] ]
 EOF