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

diff --git a/list.sh b/list.sh
index 8d76f18..fa657d1 100644
--- a/list.sh
+++ b/list.sh
@@ -1,47 +1,101 @@
 #!/bin/sh
 
-list_item(){
+. "$_EXEC/indexmeta.sh"
+
+list_item() {
   name="$(HTML "$1")"
   path="$(HTML "$ITEM/$1")"
 
   if [ -d "$_DATA/$ITEM/$1" ]; then
-    printf '[a .list .dir href="%s" %s]' \
-      "$path" "$name"
+    printf '[a .list .dir href="%s?%s" %s]' \
+      "$path" "$(HTML "$QUERY_STRING")" "$name"
   else
-    printf '[div .list .file [a href="%s" [img src="%s?a=thumbnail"] %s]]' \
-      "$path" "$path" "$name"
+    read -r length width height tags comment n <<-EOF
+	$(meta_info "$_DATA/$ITEM/$1")
+	EOF
+    printf '[div .list .file
+              [a href="%s" [img src="%s?a=thumbnail"][label %s]]
+              [span .time %i:%imin] [span .dim %ix%i] %s
+              [checkbox "select" "%s" id="select_%s" form="multitag"][label for="select_%s" +]
+            ]' \
+      "$path" "$path" "$name" \
+      "$((length / 60))" "$((length % 60))" \
+      "$width" "$height" \
+      "$(UNSTRING "${tags#tags=}" |tr , '\0' |xargs -r0 printf ' [span .tag %s]')" \
+      "$path" "$path" "$path"
   fi
 }
 
-list_dirs(){
-  [ "$ITEM" ] && printf '..\n'
+list_fs_browse(){
+  meta_dir "$_DATA/$ITEM"
   (cd "$_DATA/$ITEM";
-   find ./ -type d -mindepth 1 -maxdepth 1 \
+   find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
      -exec stat -c '%Y	%n' '{}' +
-   ) \
-  | { [ "$(GET o)" = Date ] && sort -rn || sort -k 2; } \
-  | cut -d/ -f2-
+   find ./ -type f -mindepth 1 -maxdepth 1 \
+     -exec stat -c '%Y	%n' '{}' +
+  )
 }
-
-list_files(){
+list_fs_index(){
+  find "$_DATA/$ITEM" -type d -name .index \
+  | while d="$(line)"; do
+    meta_dir "${d%/.index}"
+  done
   (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-
+   find ./ \! -path '*/.index/*' -type f \
+     -exec stat -c '%Y	%n' '{}' +
+  )
 }
 
-list_tree(){
+list_browse(){
+  meta="$_DATA/$ITEM/.index/meta"
+  meta_dir "$_DATA/$ITEM"
   (cd "$_DATA/$ITEM";
-   find ./ -type f \
-     -exec stat -c '%Y	%n' '{}' +
-   ) \
-  | { [ "$(GET o)" = Date ] && sort -rn || sort -k 2; } \
+    find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
+  ) | cut -d/ -f2- | sort
+  sort -n "$meta" | cut -f6- \
+  | while f="$(line)"; do
+    [ -e "$_DATA/$ITEM/$f" ] && printf '%s\n' "$f"
+  done
+}
+list_index(){
+  (cd "$_DATA/$ITEM";
+    find ./ -path '*/.index/meta'
+  ) | while meta="$(line)"; do
+    base="${meta%/.index/meta}"
+    meta_dir "$_DATA/$ITEM/$base"
+    cut -f1,6- <"$_DATA/$ITEM/$meta" \
+    | while f="$(line)"; do
+      fn="$(printf '%s\n' "$_DATA/$ITEM/$base/${f#*	}".*)"
+      fn="${fn%%${BR}*}"; fn="${fn##*/}"
+      [ -e "$_DATA/$ITEM/$base/${fn}" ] \
+      && printf '%s	%s\n' "${f%%	*}" "${base}/${fn}"
+    done
+  done \
+  | sort -n \
   | cut -d/ -f2-
 }
 
-list_paginate(){
+list_items() {
+  mode="$(COOKIE mode |grep -m1 -xE 'index|browse' || printf browse )"
+
+  [ "$mode" = browse -a "$ITEM" ] && printf '..\n'
+
+  if   [ "$mode" = browse -a "$ORDER" = Date ]; then
+    list_fs_browse | sort -rn | cut -d/ -f2-
+  elif [ "$mode" = browse -a "$ORDER" = Name ]; then
+    list_fs_browse | sort -k 2 | cut -d/ -f2-
+  elif [ "$mode" = index  -a "$ORDER" = Date ]; then
+    list_fs_index | sort -rn | cut -d/ -f2-
+  elif [ "$mode" = index  -a "$ORDER" = Name ]; then
+    list_fs_index | sort -k 2 | cut -d/ -f2-
+  elif [ "$mode" = browse -a "$ORDER" = Length ]; then
+    list_browse
+  elif [ "$mode" = index  -a "$ORDER" = Length ]; then
+    list_index
+  fi
+}
+
+list_paginate() {
   page="$(GET p |grep -xE '[0-9]+' || printf 1)"
 
   printf '[div .itemlist '
@@ -63,6 +117,33 @@ list_paginate(){
   printf ']'
 }
 
+w_tagging(){
+  printf '[div #multitag [input type="hidden" name="ref" value="%s"]' "$(HTML "$REQUEST_URI")"
+  printf '[a href="#" Hide][br]'
+  tags="$(find "$_DATA/$ITEM" -path '*/.index/meta' -exec cut -f4 '{}' + \
+          | cut -d= -f2- |tr , '\n' | sort -u)"
+  tags="$(UNSTRING "$tags")"
+
+  printf '[fieldset [legend %s:][select name=tag size=4 multiple' "Tags"
+  printf %s "$tags" |grep -vF ":" |grep -vxF '' \
+  | while read -r tag; do
+    printf '[option value="%s" %s]' "$(HTML "$tag")" "$(HTML "$tag")"
+  done
+  printf ']]'
+
+  printf %s "$tags" |cut -sd: -f1 |sort -u \
+  | while read -r category; do
+    printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$(HTML "$category")"
+    printf %s "$tags" |grep -wF "${category}" \
+    | while read -r tag; do
+      printf '[option value="%s" %s]' "$(HTML "$tag")" "$(HTML "${tag#*:}")"
+    done
+    printf ']]'
+  done
+
+  printf '[fieldset [legend New:][textarea name=newtag\n][button type=Submit Add Tags]]]'
+}
+
 printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
 
 "$_EXEC/cgilite/html-sh.sed" <<-EOF
@@ -70,17 +151,23 @@ 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
-  )
+
+  [form method=POST action="?a=multitag"
+    $(list_items \
+      | list_paginate
+    )
+    [div #editing
+      [a href="#multitag" Add Tags] $(w_tagging)
+      $(w_index)
+    ]
+  ]
 ] ]
 EOF