X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=list.sh;h=18dc98d3d18864538ff17c26e8ce93cd7e3ee9f5;hb=c7333f20eb9e0f18c5cb1094a2a82411fab71812;hp=9abf0e9d9e27fc23af9a34b35405b3c6c9af7b3a;hpb=b3b0d44a61029470e449827a1fa4b686e4279b7c;p=serve0

diff --git a/list.sh b/list.sh
index 9abf0e9..18dc98d 100644
--- a/list.sh
+++ b/list.sh
@@ -1,64 +1,108 @@
 #!/bin/sh
 
-list_item(){
+. "$_EXEC/indexmeta.sh"
+. "$_EXEC/widgets.sh"
+
+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
+    printf '[a .list .dir href="%s?%s" %s]' \
+      "$path" "$(HTML "$QUERY_STRING")" "$name"
+  else
     read -r length width height tags comment n <<-EOF
-	$(grep -m1 -F "	$1" "$meta")
+	$(meta_info "$_DATA/$ITEM/$1")
 	EOF
-     printf '[div .list .file
-               [a href="%s" [img src="%s?a=thumbnail"] %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]]' \
-      "$path" "$path" "$name"
+    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_items(){
-  mode="$(COOKIE mode |grep -m1 -xE 'index|browse' || printf browse )"
+list_fs_browse(){
+  meta_dir "$_DATA/$ITEM"
+  (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' '{}' +
+  )
+}
+list_fs_index(){
+  find "$_DATA/$ITEM" -type d -name .index \
+  | while d="$(line)"; do
+    meta_dir "${d%/.index}"
+  done
+  (cd "$_DATA/$ITEM";
+   find ./ \! -path '*/.index/*' -type f \
+     -exec stat -c '%Y	%n' '{}' +
+  )
+}
 
-  [ "$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"
+list_browse(){
+  meta="$_DATA/$ITEM/.index/meta"
+  meta_dir "$_DATA/$ITEM"
+  (cd "$_DATA/$ITEM";
+    find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
+  ) | cut -d/ -f2- | sort
+  sort -n "$meta" | cut -f6- \
+  | while f="$(line)"; do
+    fn="$(UNSTRING "${f#*	}")"; fn="${fn%${CR}}";
+    file="$(printf '%s\n' "$_DATA/$ITEM/${fn}".*)"
+    file="${file##*/}"
+    [ -e "$_DATA/$ITEM/$base/${file}" ] \
+    && printf '%s\n' "${file}"
+  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="$(UNSTRING "${f#*	}")"; fn="${fn%${CR}}";
+      file="$(printf '%s\n' "$_DATA/$ITEM/$base/${fn}".*)"
+      file="${file##*/}"
+      [ -e "$_DATA/$ITEM/$base/${file}" ] \
+      && printf '%s	%s\n' "${f%%	*}" "${base}/${file}"
     done
-    (cd "$_DATA/$ITEM";
-     find ./ -type f \
-       -exec stat -c '%Y	%n' '{}' +
-    )
-  fi \
-  | case $ORDER in
-    Date) sort -rn;;
-    Name) sort -k 2;;
-  esac \
+  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 '
@@ -95,11 +139,14 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
   ]
   $(w_prefs)
 
-  $(list_items \
-    | list_paginate
-  )
-  [div #editing
-    $(w_index)
+  [form method=POST action="?a=multitag"
+    $(list_items \
+      | list_paginate
+    )
+    [div #editing
+      [a href="#multitag" Add Tags] $(w_tagging)
+      $(w_index)
+    ]
   ]
 ] ]
 EOF