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

diff --git a/multitag.sh b/multitag.sh
index 20b3939..353ead6 100644
--- a/multitag.sh
+++ b/multitag.sh
@@ -5,9 +5,13 @@
 
 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"
 
 for select in $(seq 1 $(POST_COUNT select)); do
@@ -17,21 +21,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