various code improvements (skip double sanitizing, bugfix in name handling, slight...

diff --git a/indexmeta.sh b/indexmeta.sh
index 8f0c971c81765becddf59d01368bf0680c766263..00741d44881793000fce5b4f2e24142d8e6cf51f 100644 (file)
--- a/indexmeta.sh
+++ b/indexmeta.sh
@@ -68,7 +68,7 @@ meta_info(){
     | grep -m1 -axE '[0-9]+    [0-9]+  [0-9]+  tags=[^ ]*      comment=[^      ]*      .+' \
     || meta_file "$file"
   else
-    printf '0\t0\t0\ttags=\tcomment=\t\r'
+    printf '0\t0\t0\ttags=\tcomment=\t%s\r' "$(meta_name "$file")"
   fi
 }
 

diff --git a/list.sh b/list.sh
index 1a5a6cf05fce903418d04d1e956da3fce4609031..2d9dff832cd480ab70f29cacc5e6dfa209ee36ba 100644 (file)
--- a/list.sh
+++ b/list.sh
@@ -25,18 +25,20 @@ list_item() {
     name="$(list_fullname "$(UNSTRING "${name%${CR}}")")"
   fi
   if [ -f "$_DATA/$ITEM/$name" ]; then
-    display="$(HTML "$name")"
     link="$(URL "$ITEM/$name")"
+    name="$(HTML "$ITEM/$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"][label for="select_%s" +]
             ]' \
-      "$link" "$link" "$name" \
+      "$link" "$link" "${name##*/}" \
       "$((length / 60))" "$((length % 60))" \
       "$width" "$height" \
-      "$(UNSTRING "${tags#tags=}" |tr , '\0' |xargs -r0 printf ' [span .tag %s]')" \
-      "$link" "$link" "$link"
+      "$(printf '%s\n' "${tags#tags=}" \
+         | sed -r "$UNSTRING"' s;^;,;; s;,+;,;g; s;,$;;;
+                   :X s;,([^,]+)(,|$); [span .tag \1]\2;; tX;'
+      )" "$name" "$link" "$link"
   else
     printf 'Canning record for nonexist file: %s\n' "$name" >&2
     # meta_purge "$_DATA/$ITEM/$name"

diff --git a/multitag.sh b/multitag.sh
index 649fb7858d5a05f33cbe0c9b6e669b3358f60ffd..45798069f237adfab581e7bcbe7b9034de3168d2 100644 (file)
--- a/multitag.sh
+++ b/multitag.sh
@@ -3,37 +3,31 @@
 . "$_EXEC/cgilite/storage.sh"
 . "$_EXEC/indexmeta.sh"
 
+newtags=''
+for tn in $(seq 1 $(POST_COUNT tag)); do
+  newtags="${newtags},$(POST tag $tn)"
+done
+newtags="${newtags},$(POST newtag |tr -d '\r')"
+
 for select in $(seq 1 $(POST_COUNT select)); do
-  file="$_DATA/$ITEM/$(POST select $select)"
+  file="$_DATA/$ITEM/$(POST select $select |PATH)"
   meta="${file%/*}/.index/meta"
 
-  fn="$(meta_name "$file")"
-  read -r length width height tags comment discard <<-EOF
+  read -r length width height tags comment fn <<-EOF
        $(meta_info "$file")
        EOF
-  [ "${length%%[1-9]*}" -o "${width%%[1-9]*}" -o "${height%%[1-9]*}" = 0 ] \
-  && read -r length width height discard <<-EOF
-       $(meta_line "$file"; echo Rereading meta for "$file" >&2)
-       EOF
-  [ "${tags%%tags=*}" ] && tags='tags=';
-  [ "${comment%%comment=*}" ] && comment='comment='
+
+  tags="$(UNSTRING "${tags#tags=}")"
+  tags="$(printf '%s\n' "${tags}" "${newtags}" |tr , '\n' |sort -u |tr '\n' , |STRING)"
+  tags="${tags#,}"; tags="${tags%,}"
 
   if LOCK "$meta"; then
     grep -avF "        $fn" "$meta" >"${meta}.tmp"
 
-    tags="$(UNSTRING "${tags#tags=}" |tr , '\n')"
-
-    for tn in $(seq 1 $(POST_COUNT tag)); do
-      tags="$(printf '%s\n%s' "$tags" "$(POST tag $tn)")"
-    done
-    tags="$(printf '%s\n%s' "$tags" "$(POST newtag |tr -d '\r')")"
-
-    tags="$(printf %s "$tags" |sort -u |tr '\n' ,)"
-    printf '%i\t%i\t%i\ttags=%s\t%s\t%s\n' \
-           "$length" "$width" "$height" \
-           "$(STRING "${tags#,}")" \
-           "$comment" "$fn" \
-    >>"${meta}.tmp"
+    printf '%i %i      %i      tags=%s comment=%s      %s\n' \
+           "$length" "$width" "$height" "$tags" \
+           "${comment#comment=}" "$fn" \
+      >>"${meta}.tmp"
     mv "${meta}.tmp" "$meta"
 
     RELEASE "$meta"

diff --git a/widgets.sh b/widgets.sh
index a7fb63381366fdb5b154845038d4727700ffcc40..45084750583ff4369bab691385337bfea6a4a4aa 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -26,7 +26,7 @@ w_ascii='
 
 w_tags="$_DATA/.index/tags.cache"; w_tagcategories="$_DATA/.index/tagcategories.cache"
 if [ ! -f "$w_tags" -o ! -f "$w_tagcategories" ] \
-   || [ "$(find "$_DATA/" -path '*/.index/meta' -newer "$w_tags" -quit)" ]
+   || [ "$(find "$_DATA/" -path '*/.index/meta' -newer "$w_tags")" ]
   then
   w_tags="$( { local cn=1
     find "$_DATA/" -path '*/.index/meta' -print0 \