Merge commit 'b931bbd0c30907b9cc956d3707b26b449bf41f76'

[serve0] / multitag.sh

diff --git a/multitag.sh b/multitag.sh
old mode 100644 (file)
new mode 100755 (executable)
index 20b3939..c66ff14
--- a/multitag.sh
+++ b/multitag.sh
@@ -1,51 +1,73 @@
 #!/bin/sh
 
-. "$_EXEC/cgilite/storage.sh"
-. "$_EXEC/indexmeta.sh"
+. "$_EXEC/db_meta.sh"
+. "$_EXEC/cgilite/session.sh" nocookie
+. "$_EXEC/widgets.sh"
+
+# newtags=''  # tags selected in ui
+# tags=''     # taglist from database
+# detag=''    # temporary remove list
+# extags=''   # exclusive tags, tags that preclude others within their categorie
+# group=''    # id for grouping videos (videos in a group get a common group id)
+# op=''       # operation: add | del | flip
 
 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' ,)"
-[ "$(POST op)" = del ] && deltags="$newtags"
+newtags="$(POST newtag |tr -d '\r' |tr , '\n')${BR}${newtags}"
+
+if [ "$(POST makegroup)" = true ]; then
+  group="$(timeid)"
+fi
+
+# strip leading and trailing line breaks
+while [ "${newtags#${BR}}" != "${newtags}" ]; do newtags="${newtags#${BR}}"; done
+while [ "${newtags%${BR}}" != "${newtags}" ]; do newtags="${newtags%${BR}}"; done
+
+op="$(POST op)"
 
 for select in $(seq 1 $(POST_COUNT select)); do
-  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 [ ! "$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 '^-[^:]+$')"
+  file="$(POST select $select)"
+  read_meta "${file%.*}" || continue
+
+  tags="$(printf %s\\n "$META_TAGS" |tr , \\n)"
+
+  if [ "$op" = add ]; 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' , \
-            | STRING)"
-  else
-    tags="$(UNSTRING "${tags#tags=}" |tr , '\n')"
-    detag="${deltags},"; while [ "$detag" ]; do
-      tags="$(printf '%s\n' "$tags" |grep -vxFe "${detag%%,*}")"
-      detag="${detag#*,}"
+    tags="${tags}${BR}${newtags}"
+
+  elif [ "$op" = del ]; then
+    detag="${newtags}${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
-  tags="${tags#,}"; tags="${tags%,}"
 
-  if LOCK "$meta"; then
-    grep -avF "        $fn" "$meta" >"${meta}.tmp"
+  elif [ "$op" = flip ]; then
+    fliptag="${newtags}${BR}"; while [ "$fliptag" ]; do
+      comp="$tags"
+      tags="$(printf '%s\n' "$tags" |grep -vxFe "${fliptag%%${BR}*}")"
+      [ "$comp" = "$tags" ] && tags="${tags}${BR}${fliptag%%${BR}*}"
+      fliptag="${fliptag#*${BR}}"
+    done
 
-    printf '%i %i      %i      tags=%s comment=%s      %s\n' \
-           "$length" "$width" "$height" "$tags" \
-           "${comment#comment=}" "$fn" \
-      >>"${meta}.tmp"
-    mv "${meta}.tmp" "$meta"
+  fi
+  tags="$(printf '%s\n' "$tags" |sort -u |tr '\n' ,)"
+  tags="${tags#,}"; tags="${tags%,}"
 
-    RELEASE "$meta"
+  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 &
+) &