X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=multitag.sh;h=12117cdf86ea852b7ea430a5aedd00c9f8eb4969;hb=5265f0fb5c0b960a89be7fcd9c9e7cc12d1bcde4;hp=43484e63fb9e28698f15258ca4a841992ddf9427;hpb=f99cce3548251966cd0b7c9ead81460e2f14466c;p=serve0

diff --git a/multitag.sh b/multitag.sh
old mode 100644
new mode 100755
index 43484e6..12117cd
--- a/multitag.sh
+++ b/multitag.sh
@@ -1,35 +1,56 @@
 #!/bin/sh
 
+. "$_EXEC/db_meta.sh"
+. "$_EXEC/cgilite/session.sh" nocookie
+. "$_EXEC/widgets.sh"
+
+newtags=''
+for tn in $(seq 1 $(POST_COUNT tag)); do
+  newtags="$(POST tag $tn)${BR}${newtags}"
+done
+newtags="$(POST newtagn |tr -d '\r' |tr , '\n')${BR}${newtags}"
+
+if [ "$(POST makegroup)" = true ]; then
+  group="$(timeid)"
+fi
+
+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
-  file="$_DATA/$ITEM/$(POST select $select)"
-  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")
-	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;')"
-
-  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"
-
-  rm "${meta}.lock/pid"; rmdir "${meta}.lock"
+  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 [ "$group" ]; then
+    update_meta "$META_NAME" tags="${tags}" group="${group}"
+  else
+    update_meta "$META_NAME" tags="${tags}"
+  fi
 done
+
+( if [ $(POST_COUNT select) -gt 0 ]; then
+    taglist >"$c_tags.$$"
+    mv -- "$c_tags.$$" "$c_tags"
+  fi &
+) &