X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=multitag.sh;h=649fb7858d5a05f33cbe0c9b6e669b3358f60ffd;hb=6505a2726aa04b8b0b37af689535bde67f99238a;hp=0a8e9d4858d1e6d4e7c969251cb4f8bc36a6ce36;hpb=3f9026072887cc5723948ec151dd108cf874225d;p=serve0

diff --git a/multitag.sh b/multitag.sh
index 0a8e9d4..649fb78 100644
--- a/multitag.sh
+++ b/multitag.sh
@@ -1,27 +1,37 @@
 #!/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##*/}"
 
-  if LOCK "$meta"; then
-    grep -vF "	$fn" "$meta" >"${meta}.tmp"
-    read length width height tags comment x <<-EOF
-	$(grep -F "	$fn" "$meta")
+  fn="$(meta_name "$file")"
+  read -r length width height tags comment discard <<-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="$(printf '%s' "${tags#tags=}" | tr , '\n')"
+  [ "${tags%%tags=*}" ] && tags='tags=';
+  [ "${comment%%comment=*}" ] && comment='comment='
+
+  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="$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"