From 8481ce84548f4ccdf911667bf0fdcd20e6192c5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20H=C3=A4nsch?= Date: Tue, 8 Jan 2019 18:44:01 +0100 Subject: [PATCH] fix bug in exclusive tag support --- multitag.sh | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/multitag.sh b/multitag.sh index 20b3939..c9a7e8f 100644 --- 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 -- 2.39.2