fix bug in exclusive tag support

diff --git a/multitag.sh b/multitag.sh
index 20b39391f9db1a9c103cda521c8ac145df334e33..c9a7e8f4d2d420b756cec7799485304bc36d54c0 100644 (file)
--- a/multitag.sh
+++ b/multitag.sh
@@ -5,11 +5,17 @@
 
 newtags=''
 for tn in $(seq 1 $(POST_COUNT tag)); do
-  newtags="${newtags},$(POST tag $tn)"
+  newtags="$(POST tag $tn)${BR}${newtags}"
 done
-newtags="${newtags},$(POST newtag |tr -d '\r' |tr '\n' ,)"
+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"
 
+echo "x $newtags x" >&2
+
 for select in $(seq 1 $(POST_COUNT select)); do
   file="$_DATA/$ITEM/$(POST select $select |PATH)"
   meta="${file%/*}/.index/meta"
@@ -17,21 +23,21 @@ for select in $(seq 1 $(POST_COUNT select)); do
   read -r length width height tags comment fn <<-EOF
        $(meta_info "$file")
        EOF
+  tags="$(UNSTRING "${tags#tags=}" |tr , '\n')"
 
   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 '^-[^:]+$')"
+    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
-    tags="$(UNSTRING "${tags#tags=}" |tr , '\n')"
-    detag="${deltags},"; while [ "$detag" ]; do
-      tags="$(printf '%s\n' "$tags" |grep -vxFe "${detag%%,*}")"
-      detag="${detag#*,}"
+    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