X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=multitag.sh;h=649fb7858d5a05f33cbe0c9b6e669b3358f60ffd;hb=3bec8918198647fff324dc30ecc8b0690e7aff0c;hp=43484e63fb9e28698f15258ca4a841992ddf9427;hpb=f99cce3548251966cd0b7c9ead81460e2f14466c;p=serve0

diff --git a/multitag.sh b/multitag.sh
index 43484e6..649fb78 100644
--- a/multitag.sh
+++ b/multitag.sh
@@ -1,35 +1,41 @@
 #!/bin/sh
 
+. "$_EXEC/cgilite/storage.sh"
+. "$_EXEC/indexmeta.sh"
+
 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")
+
+  fn="$(meta_name "$file")"
+  read -r length width height tags comment discard <<-EOF
+	$(meta_info "$file")
+	EOF
+  [ "${length%%[1-9]*}" -o "${width%%[1-9]*}" -o "${height%%[1-9]*}" = 0 ] \
+  && read -r length width height discard <<-EOF
+	$(meta_line "$file"; echo Rereading meta for "$file" >&2)
 	EOF
-  tags="$(printf '%s' "${tags#tags=}" | tr , '\n')"
+  [ "${tags%%tags=*}" ] && tags='tags=';
+  [ "${comment%%comment=*}" ] && comment='comment='
+
+  if LOCK "$meta"; then
+    grep -avF "	$fn" "$meta" >"${meta}.tmp"
+
+    tags="$(UNSTRING "${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;')"
+    for tn in $(seq 1 $(POST_COUNT tag)); do
+      tags="$(printf '%s\n%s' "$tags" "$(POST tag $tn)")"
+    done
+    tags="$(printf '%s\n%s' "$tags" "$(POST newtag |tr -d '\r')")"
 
-  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"
+    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"
+    mv "${meta}.tmp" "$meta"
 
-  rm "${meta}.lock/pid"; rmdir "${meta}.lock"
+    RELEASE "$meta"
+  fi
 done