X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=multitag.sh;h=353ead6dbf838d331d25c45a24ce41a2a34d181c;hp=649fb7858d5a05f33cbe0c9b6e669b3358f60ffd;hb=608e267413cf7f8399cacbbfc4269d3c3820a3aa;hpb=f34cc723fb9a552d65e40b6f4846160599eaa8b5

diff --git a/multitag.sh b/multitag.sh
index 649fb78..353ead6 100644
--- a/multitag.sh
+++ b/multitag.sh
@@ -3,37 +3,51 @@
 . "$_EXEC/cgilite/storage.sh"
 . "$_EXEC/indexmeta.sh"
 
+newtags=''
+for tn in $(seq 1 $(POST_COUNT tag)); do
+  newtags="$(POST tag $tn)${BR}${newtags}"
+done
+newtags="$(POST newtag |tr -d '\r' |tr , '\n')${BR}${newtags}"
+
+while [ "${newtags#${BR}}" != "${newtags}" ]; do newtags="${newtags#${BR}}"; done
+while [ "${newtags%${BR}}" != "${newtags}" ]; do newtags="${newtags%${BR}}"; done
+
+[ "$(POST op)" = del ] && deltags="$newtags"
+
 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=}" |tr , '\n')"
+
+  if [ ! "$deltags" ]; then
+    extags="$(printf '%s' "${newtags}" |grep -e "^-" |cut -d: -f1 )"
+    [ "$extags" ] && tags="$(printf %s\\n "$tags" |grep -vwFe "$extags")"
+    if printf %s "${newtags}" |grep -e "^-" |grep -qEe "^-[^:]+$"; then
+      tags="$(printf %s\\n "$tags" |grep -vEe '^-[^:]+$')"
+    fi
+    tags="$(printf '%s\n' "${tags},${newtags}" \
+            | tr , '\n' |sort -u |tr '\n' , \
+            | STRING)"
+  else
+    detag="${deltags}${BR}"; while [ "$detag" ]; do
+      tags="$(printf '%s\n' "$tags" |grep -vxFe "${detag%%${BR}*}")"
+      detag="${detag#*${BR}}"
+    done
+    tags="$(printf '%s\n' "$tags" |sort -u |tr '\n' , |STRING)"
+  fi
+  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"