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

diff --git a/list.sh b/list.sh
index 8d76f18..61099e7 100644
--- a/list.sh
+++ b/list.sh
@@ -13,32 +13,31 @@ list_item(){
   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" -nt "$_DATA/$ITEM/.index/meta" ] \
+    && . "$_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
+    (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(){
@@ -70,17 +69,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 ⚙]
+  [div #navigation
+    [a #t_bookmarks href="#bookmarks" ★]
+    $(w_search)
+    [a #t_avsearch href="#advsearch" Advanced]
+    [a #t_prefs href="#prefs" ⚙]
+  ]
   $(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