X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=list.sh;h=4596dfc23c593d487e7e07b7dfbd92c63990eeb0;hp=d0868baffeda9c0af2b778c85a048f05f618b3dc;hb=3f9026072887cc5723948ec151dd108cf874225d;hpb=fac83e5789b5b68484ba8bdf7830c462a722d000

diff --git a/list.sh b/list.sh
index d0868ba..4596dfc 100644
--- a/list.sh
+++ b/list.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. "$_EXEC/indexmeta.sh"
+
 list_item() {
   name="$(HTML "$1")"
   path="$(HTML "$ITEM/$1")"
@@ -10,7 +12,7 @@ list_item() {
       "$path" "$(HTML "$QUERY_STRING")" "$name"
   elif [ -f "$meta" ]; then
     read -r length width height tags comment n <<-EOF
-	$(grep -m1 -F "	${1##*/}" "$meta")
+	$(grep -m1 -F "	$(meta_name "$1")" "$meta")
 	EOF
     printf '[div .list .file
               [a href="%s" [img src="%s?a=thumbnail"][label %s]]
@@ -29,8 +31,7 @@ list_item() {
 }
 
 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 +42,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,8 +52,7 @@ 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
@@ -67,12 +66,13 @@ list_index(){
     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="$(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 \