Merge branch 'cgilite' of git.plutz.net:serve0 into cgilite

[serve0] / indexmeta.sh

diff --git a/indexmeta.sh b/indexmeta.sh
index 2e4e74f16494305ce92f77578208447096e1b192..4545df93118bff9869839b0d9dbebcee3011c19e 100644 (file)
--- a/indexmeta.sh
+++ b/indexmeta.sh
@@ -40,7 +40,7 @@ meta_file(){
   name="$(meta_name "$file")"
 
   if [ -d "${meta%/meta}" ] && LOCK "$meta"; then
-    grep -vF " ${name}" "$meta" >"$meta.tmp"
+    grep -avF "        ${name}" "$meta" >"$meta.tmp"
     meta_line "$file" \
     | tee -a "$meta.tmp"
     mv "$meta.tmp" "$meta"
@@ -48,14 +48,28 @@ meta_file(){
   fi
 }
 
+meta_purge(){
+  local file meta name
+  file="$1"
+  meta="${file%/*}/.index/meta"
+  name="$(meta_name "$file")"
+
+  if [ -d "${meta%/meta}" ] && LOCK "$meta"; then
+    grep -avF "        ${name}" "$meta" >"$meta.tmp"
+    grep -aF " ${name}" "$meta" >>"$meta.trash"
+    mv "$meta.tmp" "$meta"
+    RELEASE "$meta"
+  fi
+}
+
 meta_info(){
   local file meta
   file="$1"
   meta="${file%/*}/.index/meta"
 
   if [ -d "${meta%/meta}" ]; then
-    grep -m1 -F "      $(meta_name "$file")" "$meta" \
-    | grep -xE '[0-9]+ [0-9]+  [0-9]+  tags=[^ ]*      comment=[^      ]*      .+' \
+    grep -aF " $(meta_name "$file")" "$meta" \
+    | grep -m1 -xE '[0-9]+     [0-9]+  [0-9]+  tags=[^ ]*      comment=[^      ]*      .+' \
     || meta_file "$file"
   else
     printf '0\t0\t0\ttags=\tcomment=\t\r'