X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=indexmeta.sh;h=45a3bac008b2ee469719d6ac2b91b3a0976b9178;hb=6505a2726aa04b8b0b37af689535bde67f99238a;hp=0c5d7d959ba2d289f2079b57921aefc2f1ff91e3;hpb=8d556a468ad07e58f6e06397e558e0b353f8c8d9;p=serve0

diff --git a/indexmeta.sh b/indexmeta.sh
index 0c5d7d9..45a3bac 100644
--- 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"
@@ -55,7 +69,7 @@ meta_info(){
 
   if [ -d "${meta%/meta}" ]; then
     grep -aF "	$(meta_name "$file")" "$meta" \
-    | grep -m1 -xE '[0-9]+	[0-9]+	[0-9]+	tags=[^	]*	comment=[^	]*	.+' \
+    | grep -m1 -axE '[0-9]+	[0-9]+	[0-9]+	tags=[^	]*	comment=[^	]*	.+' \
     || meta_file "$file"
   else
     printf '0\t0\t0\ttags=\tcomment=\t\r'
@@ -70,8 +84,8 @@ meta_dir(){
   if [ -d "$dir/.index" -a \! -f "$meta" ] && LOCK "$meta"; then
     touch "$meta"  # preliminary touch to prevent concurrent generators
     find "$dir" -type f -mindepth 1 -maxdepth 1 \
-    | grep -E "$file_pattern" \
-    | while v="$(line)"; do
+    | grep -aE "$file_pattern" \
+    | while read -r v; do
       meta_line "$v"
     done >"$meta"
 
@@ -79,8 +93,8 @@ meta_dir(){
   elif [ -d "$dir/.index" -a "$dir" -nt "$meta" ] && LOCK "$meta"; then
     touch "$meta"
     find "$dir" -type f -mindepth 1 -maxdepth 1 \
-    | grep -E "$file_pattern" \
-    | while v="$(line)"; do
+    | grep -aE "$file_pattern" \
+    | while read -r v; do
       if [ "$v" -nt "$meta" ]; then
         grep -qF "	$(meta_name "$v")" "$meta" \
         || meta_line "$v"