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

[serve0] / multitag.sh

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"