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

diff --git a/list.sh b/list.sh
index d0868ba..18dc98d 100644
--- a/list.sh
+++ b/list.sh
@@ -1,16 +1,18 @@
 #!/bin/sh
 
+. "$_EXEC/indexmeta.sh"
+. "$_EXEC/widgets.sh"
+
 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" %s]' \
       "$path" "$(HTML "$QUERY_STRING")" "$name"
-  elif [ -f "$meta" ]; then
+  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"][label %s]]
@@ -20,17 +22,13 @@ list_item() {
       "$path" "$path" "$name" \
       "$((length / 60))" "$((length % 60))" \
       "$width" "$height" \
-      "$(printf %s\\n "${tags#tags=}" |tr , ' ' |xargs printf '[span .tag %s]')" \
+      "$(UNSTRING "${tags#tags=}" |tr , '\0' |xargs -r0 printf ' [span .tag %s]')" \
       "$path" "$path" "$path"
-  else
-    printf '[div .list .file [a href="%s" [img src="%s?a=thumbnail"][label %s]]]' \
-      "$path" "$path" "$name"
   fi
 }
 
 list_fs_browse(){
-  [ -d "$_DATA/$ITEM/.index" -a \! "$_DATA/$ITEM" -ot "$_DATA/$ITEM/.index/meta" ] \
-  && dir="$_DATA/$ITEM" . "$_EXEC/update_meta.sh"
+  meta_dir "$_DATA/$ITEM"
   (cd "$_DATA/$ITEM";
    find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
      -exec stat -c '%Y	%n' '{}' +
@@ -41,8 +39,7 @@ list_fs_browse(){
 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"
+    meta_dir "${d%/.index}"
   done
   (cd "$_DATA/$ITEM";
    find ./ \! -path '*/.index/*' -type f \
@@ -52,27 +49,33 @@ list_fs_index(){
 
 list_browse(){
   meta="$_DATA/$ITEM/.index/meta"
-  [ -d "${meta%/meta}" -a \! "$_DATA/$ITEM" -ot "${meta}" ] \
-  && dir="$_DATA/$ITEM" . "$_EXEC/update_meta.sh"
+  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
-    [ -e "$_DATA/$ITEM/$f" ] && printf '%s\n' "$f"
+    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}"
-    [ \! "$_DATA/$ITEM/$base" -ot "$_DATA/$ITEM/$meta" ] \
-    && dir="$_DATA/$ITEM/$base" . "$_EXEC/update_meta.sh"
+    meta_dir "$_DATA/$ITEM/$base"
     cut -f1,6- <"$_DATA/$ITEM/$meta" \
     | while f="$(line)"; do
-      [ -e "$_DATA/$ITEM/$base/${f#*	}" ] \
-      && printf '%s	%s\n' "${f%%	*}" "${base}/${f#*	}"
+      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
   done \
   | sort -n \
@@ -121,23 +124,6 @@ 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