X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=multitag.sh;h=bbbf946425d28419fb90c7d83099acde73b0825c;hb=2c973a1497b88df3b970b7df316d5ece7730858d;hp=45798069f237adfab581e7bcbe7b9034de3168d2;hpb=1b79a90402ee3fe450575085470b3ec6d084d78b;p=serve0

diff --git a/multitag.sh b/multitag.sh
old mode 100644
new mode 100755
index 4579806..bbbf946
--- a/multitag.sh
+++ b/multitag.sh
@@ -1,35 +1,40 @@
 #!/bin/sh
 
-. "$_EXEC/cgilite/storage.sh"
-. "$_EXEC/indexmeta.sh"
+. "$_EXEC/db_meta.sh"
 
 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')"
+newtags="$(POST newtagn |tr -d '\r' |tr , '\n')${BR}${newtags}"
 
-for select in $(seq 1 $(POST_COUNT select)); do
-  file="$_DATA/$ITEM/$(POST select $select |PATH)"
-  meta="${file%/*}/.index/meta"
+while [ "${newtags#${BR}}" != "${newtags}" ]; do newtags="${newtags#${BR}}"; done
+while [ "${newtags%${BR}}" != "${newtags}" ]; do newtags="${newtags%${BR}}"; done
 
-  read -r length width height tags comment fn <<-EOF
-	$(meta_info "$file")
-	EOF
+[ "$(POST op)" = del ] && deltags="$newtags"
 
-  tags="$(UNSTRING "${tags#tags=}")"
-  tags="$(printf '%s\n' "${tags}" "${newtags}" |tr , '\n' |sort -u |tr '\n' , |STRING)"
+for select in $(seq 1 $(POST_COUNT select)); do
+  file="$(POST select $select)"
+
+  read_meta "${file%.*}" || continue
+  tags="$(printf %s\\n "$META_TAGS" |tr , \\n)"
+
+  if [ ! "$deltags" ]; then
+    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' ,)"
+  else
+    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' ,)"
+  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"
-  fi
+  update_meta "$META_NAME" tags="${tags}"
 done