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

diff --git a/list.sh b/list.sh
index 61099e7..d0868ba 100644
--- a/list.sh
+++ b/list.sh
@@ -1,46 +1,105 @@
 #!/bin/sh
 
-list_item(){
+list_item() {
   name="$(HTML "$1")"
   path="$(HTML "$ITEM/$1")"
+  meta="$_DATA/$ITEM/$1"; meta="${meta%/*}/.index/meta"
 
   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"
+  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
+              [checkbox "select" "%s" id="select_%s" form="multitag"][label for="select_%s" +]
+            ]' \
+      "$path" "$path" "$name" \
+      "$((length / 60))" "$((length % 60))" \
+      "$width" "$height" \
+      "$(printf %s\\n "${tags#tags=}" |tr , ' ' |xargs printf '[span .tag %s]')" \
+      "$path" "$path" "$path"
   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_fs_browse(){
+  [ -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' '{}' +
+  )
+}
+list_fs_index(){
+  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 ./ \! -path '*/.index/*' -type f \
+     -exec stat -c '%Y	%n' '{}' +
+  )
+}
+
+list_browse(){
+  meta="$_DATA/$ITEM/.index/meta"
+  [ -d "${meta%/meta}" -a \! "$_DATA/$ITEM" -ot "${meta}" ] \
+  && dir="$_DATA/$ITEM" . "$_EXEC/update_meta.sh"
+  (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
+    [ -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}"
+    [ \! "$_DATA/$ITEM/$base" -ot "$_DATA/$ITEM/$meta" ] \
+    && dir="$_DATA/$ITEM/$base" . "$_EXEC/update_meta.sh"
+    cut -f1,6- <"$_DATA/$ITEM/$meta" \
+    | while f="$(line)"; do
+      [ -e "$_DATA/$ITEM/$base/${f#*	}" ] \
+      && printf '%s	%s\n' "${f%%	*}" "${base}/${f#*	}"
+    done
+  done \
+  | sort -n \
+  | cut -d/ -f2-
+}
+
+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"
-    (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-
-    
+
+  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(){
+list_paginate() {
   page="$(GET p |grep -xE '[0-9]+' || printf 1)"
 
   printf '[div .itemlist '
@@ -62,6 +121,23 @@ list_paginate(){
   printf ']'
 }
 
+w_tagging(){
+  printf '[div #multitag [input type="hidden" name="ref" value="%s"]' "$(HTML "$REQUEST_URI")"
+  printf '[a href="#" Hide][br]'
+  find "$_DATA/$ITEM" -path '*/.index/meta' \
+       -exec cut -f4 '{}' + \
+  | cut -d= -f2- |tr , '\n' | sort -u \
+  | while read tag; do
+    cat_old="${category}"; category="${tag%%:*}"
+    [ "$category" = "$tag" ] && category="(none)"
+    [ "$cat_old" -a "$cat_old" != "$category" ] && printf ']]'
+    [ "$cat_old" != "$category" ] \
+    && printf '[fieldset [legend %s:][select name="tag" size=4 multiple' $(HTML "$category")
+    printf '[option value="%s" %s]' "$(HTML "$tag")" "$(HTML "${tag#*:}")"
+  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
@@ -77,11 +153,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