From b48dc7499d7e9f3453ce38d2a9529fd319b37bfe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20H=C3=A4nsch?= Date: Wed, 17 Nov 2021 02:28:55 +0100 Subject: [PATCH] use unified DB functions --- multitag.sh | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/multitag.sh b/multitag.sh index 9848ac3..888ff9d 100755 --- a/multitag.sh +++ b/multitag.sh @@ -1,7 +1,6 @@ #!/bin/sh -. "$_EXEC/cgilite/storage.sh" -. "$_EXEC/indexmeta.sh" +. "$_EXEC/db_meta.sh" newtags='' for tn in $(seq 1 $(POST_COUNT tag)); do @@ -15,14 +14,10 @@ while [ "${newtags%${BR}}" != "${newtags}" ]; do newtags="${newtags%${BR}}"; don [ "$(POST op)" = del ] && deltags="$newtags" for select in $(seq 1 $(POST_COUNT select)); do - file="$_DATA/$ITEM/$(POST select $select |PATH)" - meta="${file%/*}/.index/meta" + file="$(POST select $select)" - read -r length width height tags comment fn <<-EOF - $(meta_info "$file") - EOF - [ "$fn" ] || continue - tags="$(UNSTRING "${tags#tags=}" |tr , '\n')" + read_meta "${file%.*}" || continue + tags="$(printf %s\\n "$META_TAGS" |tr , \\n)" if [ ! "$deltags" ]; then extags="$(printf '%s' "${newtags}" |grep -e "^-" |cut -d: -f1 )" @@ -31,26 +26,15 @@ for select in $(seq 1 $(POST_COUNT select)); do tags="$(printf %s\\n "$tags" |grep -vEe '^-[^:]+$')" fi tags="$(printf '%s\n' "${tags},${newtags}" \ - | tr , '\n' |sort -u |tr '\n' , \ - | STRING)" + | 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' , |STRING)" + 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 -- 2.39.2