slight code improvements

[serve0] / indexmeta.sh

diff --git a/indexmeta.sh b/indexmeta.sh
index 0c5d7d959ba2d289f2079b57921aefc2f1ff91e3..371c51f5dc010d9eb4394e401e536810e4bff932 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,6 +48,20 @@ 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"
@@ -71,7 +85,7 @@ meta_dir(){
     touch "$meta"  # preliminary touch to prevent concurrent generators
     find "$dir" -type f -mindepth 1 -maxdepth 1 \
     | grep -E "$file_pattern" \
-    | while v="$(line)"; do
+    | while read -r v; do
       meta_line "$v"
     done >"$meta"
 
@@ -80,7 +94,7 @@ meta_dir(){
     touch "$meta"
     find "$dir" -type f -mindepth 1 -maxdepth 1 \
     | grep -E "$file_pattern" \
-    | while v="$(line)"; do
+    | while read -r v; do
       if [ "$v" -nt "$meta" ]; then
         grep -qF "     $(meta_name "$v")" "$meta" \
         || meta_line "$v"