X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=multitag.sh;h=20b39391f9db1a9c103cda521c8ac145df334e33;hp=49bf273c9ed951f72cd19d031ff5d2ad69d024bb;hb=02812995d1df8b60f702be2ec8cf807782a7ab35;hpb=84232e55d22c7ae59ff9709e350d739813c6aaf6

diff --git a/multitag.sh b/multitag.sh
index 49bf273..20b3939 100644
--- a/multitag.sh
+++ b/multitag.sh
@@ -3,29 +3,47 @@
 . "$_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"
 
   read -r length width height tags comment fn <<-EOF
 	$(meta_info "$file")
 	EOF
 
-  if LOCK "$meta"; then
-    grep -vF "	$fn" "$meta" >"${meta}.tmp"
+  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')"
-
-    for tn in $(seq 1 $(POST_COUNT tag)); do
-      tags="$(printf '%s\n%s' "$tags" "$(POST tag $tn)")"
+    detag="${deltags},"; while [ "$detag" ]; do
+      tags="$(printf '%s\n' "$tags" |grep -vxFe "${detag%%,*}")"
+      detag="${detag#*,}"
     done
-    tags="$(printf '%s\n%s' "$tags" "$(POST newtag |tr -d '\r')")"
-
-    tags="$(printf %s "$tags" |sort -u |tr '\n' ,)"
-    printf '%i\t%i\t%i\ttags=%s\t%s\t%s\n' \
-           "$length" "$width" "$height" \
-           "$(STRING "${tags#,}")" \
-           "$comment" "$fn" \
-    >>"${meta}.tmp"
+    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 '%i	%i	%i	tags=%s	comment=%s	%s\n' \
+           "$length" "$width" "$height" "$tags" \
+           "${comment#comment=}" "$fn" \
+      >>"${meta}.tmp"
     mv "${meta}.tmp" "$meta"
 
     RELEASE "$meta"