changes in meta format, improved code abstraction

[serve0] / multitag.sh

diff --git a/multitag.sh b/multitag.sh
index 0a8e9d4858d1e6d4e7c969251cb4f8bc36a6ce36..49bf273c9ed951f72cd19d031ff5d2ad69d024bb 100644 (file)
--- a/multitag.sh
+++ b/multitag.sh
@@ -1,27 +1,29 @@
 #!/bin/sh
 
 . "$_EXEC/cgilite/storage.sh"
+. "$_EXEC/indexmeta.sh"
 
 for select in $(seq 1 $(POST_COUNT select)); do
   file="$_DATA/$ITEM/$(POST select $select)"
   meta="${file%/*}/.index/meta"
-  fn="${file##*/}"
+
+  read -r length width height tags comment fn <<-EOF
+       $(meta_info "$file")
+       EOF
 
   if LOCK "$meta"; then
     grep -vF " $fn" "$meta" >"${meta}.tmp"
-    read length width height tags comment x <<-EOF
-       $(grep -F "     $fn" "$meta")
-       EOF
-    tags="$(printf '%s' "${tags#tags=}" | tr , '\n')"
+    tags="$(UNSTRING "${tags#tags=}" |tr , '\n')"
 
     for tn in $(seq 1 $(POST_COUNT tag)); do
-      tags="$tags${BR}$(POST tag $tn |sed -r 's;\t;\\t;g; s;\r;;g;')"
+      tags="$(printf '%s\n%s' "$tags" "$(POST tag $tn)")"
     done
-    tags="$tags${BR}$(POST newtag |sed -r 's;\t;\\t;g; s;\r;;g;')"
+    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" \
-           "$(printf %s "$tags" |sort -u |tr '\n' ,)" \
+           "$(STRING "${tags#,}")" \
            "$comment" "$fn" \
     >>"${meta}.tmp"
     mv "${meta}.tmp" "$meta"