fix bug in exclusive tag support

[serve0] / multitag.sh

diff --git a/multitag.sh b/multitag.sh
index 45798069f237adfab581e7bcbe7b9034de3168d2..20b39391f9db1a9c103cda521c8ac145df334e33 100644 (file)
--- a/multitag.sh
+++ b/multitag.sh
@@ -7,7 +7,8 @@ newtags=''
 for tn in $(seq 1 $(POST_COUNT tag)); do
   newtags="${newtags},$(POST tag $tn)"
 done
-newtags="${newtags},$(POST newtag |tr -d '\r')"
+newtags="${newtags},$(POST newtag |tr -d '\r' |tr '\n' ,)"
+[ "$(POST op)" = del ] && deltags="$newtags"
 
 for select in $(seq 1 $(POST_COUNT select)); do
   file="$_DATA/$ITEM/$(POST select $select |PATH)"
@@ -17,8 +18,23 @@ for select in $(seq 1 $(POST_COUNT select)); do
        $(meta_info "$file")
        EOF
 
-  tags="$(UNSTRING "${tags#tags=}")"
-  tags="$(printf '%s\n' "${tags}" "${newtags}" |tr , '\n' |sort -u |tr '\n' , |STRING)"
+  if [ ! "$deltags" ]; then
+    extags="$(printf '%s' "$newtags" |tr , '\n' |grep -e "^-" |cut -d: -f1 )"
+    tags="$(UNSTRING "${tags#tags=}" |tr , '\n' |grep -vwFe "$extags")"
+    if printf %s "$extags" |grep -vq :; then
+      tags="$(printf %s\\n "$tags" |grep -vE '^-[^:]+$')"
+    fi
+    tags="$(printf '%s\n' "${tags},${newtags}" \
+            | tr , '\n' |sort -u |tr '\n' , \
+            | STRING)"
+  else
+    tags="$(UNSTRING "${tags#tags=}" |tr , '\n')"
+    detag="${deltags},"; while [ "$detag" ]; do
+      tags="$(printf '%s\n' "$tags" |grep -vxFe "${detag%%,*}")"
+      detag="${detag#*,}"
+    done
+    tags="$(printf '%s\n' "$tags" |sort -u |tr '\n' , |STRING)"
+  fi
   tags="${tags#,}"; tags="${tags%,}"
 
   if LOCK "$meta"; then