fix bug in exclusive tag support

[serve0] / multitag.sh

diff --git a/multitag.sh b/multitag.sh
index 43484e63fb9e28698f15258ca4a841992ddf9427..20b39391f9db1a9c103cda521c8ac145df334e33 100644 (file)
--- a/multitag.sh
+++ b/multitag.sh
@@ -1,35 +1,51 @@
 #!/bin/sh
 
+. "$_EXEC/cgilite/storage.sh"
+. "$_EXEC/indexmeta.sh"
+
+newtags=''
+for tn in $(seq 1 $(POST_COUNT tag)); do
+  newtags="${newtags},$(POST tag $tn)"
+done
+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)"
+  file="$_DATA/$ITEM/$(POST select $select |PATH)"
   meta="${file%/*}/.index/meta"
-  fn="${file##*/}"
-
-  while ! mkdir "${meta}.lock"; do
-    sleep 1
-    ps -o pid \
-    | grep -q "$(cat "${meta}.lock/pid")" \
-    || break
-  done
-  printf '%i\n' >"${meta}.lock/pid"
-
-  grep -vF "   $fn" "$meta" >"${meta}.lock/mtmp"
-  read length width height tags comment x <<-EOF
-       $(grep -F "     $fn" "$meta")
+
+  read -r length width height tags comment fn <<-EOF
+       $(meta_info "$file")
        EOF
-  tags="$(printf '%s' "${tags#tags=}" | tr , '\n')"
 
-  for tn in $(seq 1 $(POST_COUNT tag)); do
-    tags="$tags${BR}$(POST tag $tn |sed -r 's;\t;\\t;g; s;\r;;g;')"
-  done
-  tags="$tags${BR}$(POST newtag |sed -r 's;\t;\\t;g;')"
+  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
+    grep -avF "        $fn" "$meta" >"${meta}.tmp"
 
-  printf '%s\t%s\t%s\ttags=%s\t%s\t%s\n' \
-         "$length" "$width" "$height" \
-         "$(printf %s "$tags" |sort -u |tr '\n' ,)" \
-         "$comment" "$fn" \
-  >>"${meta}.lock/mtmp"
-  mv "${meta}.lock/mtmp" "$meta"
+    printf '%i %i      %i      tags=%s comment=%s      %s\n' \
+           "$length" "$width" "$height" "$tags" \
+           "${comment#comment=}" "$fn" \
+      >>"${meta}.tmp"
+    mv "${meta}.tmp" "$meta"
 
-  rm "${meta}.lock/pid"; rmdir "${meta}.lock"
+    RELEASE "$meta"
+  fi
 done