X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=indexmeta.sh;h=00741d44881793000fce5b4f2e24142d8e6cf51f;hp=30bf32d5c68e95ac0f34dac8e0cc990550c5eafb;hb=d59b95791a1b6c94e2e83d9edc90314e572fcd5f;hpb=84232e55d22c7ae59ff9709e350d739813c6aaf6

diff --git a/indexmeta.sh b/indexmeta.sh
index 30bf32d..00741d4 100644
--- a/indexmeta.sh
+++ b/indexmeta.sh
@@ -7,14 +7,13 @@ include_indexmeta="$0"
 file_pattern='^.*\.(mov|ts|mpg|mpeg|mp4|m4v|avi|mkv|flv|sfv|wmv|ogm|ogv|webm|iso|rmvb)$'
 
 meta_name() {
-  fn="$1"
-  fn="${fn##*/}"
-  fn="${fn%.*}"
-  STRING "$fn"
-  printf '\r'
+  local fn
+  fn="$1"; fn="${fn##*/}"; fn="${fn%.*}"
+  STRING "$fn"; printf '\r'
 }
 
 meta_line() {
+  local video l w h
   video="$1"
 
   read l h w <<__EOF
@@ -32,12 +31,13 @@ __EOF
 }
 
 meta_file(){
+  local file meta name
   file="$1"
   meta="${file%/*}/.index/meta"
   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"
@@ -45,42 +45,57 @@ meta_file(){
   fi
 }
 
-meta_info(){
+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 -axE '[0-9]+	[0-9]+	[0-9]+	tags=[^	]*	comment=[^	]*	.+' \
     || meta_file "$file"
   else
-    printf '0\t0\t0\ttags=\tcomment=\t\r'
+    printf '0\t0\t0\ttags=\tcomment=\t%s\r' "$(meta_name "$file")"
   fi
 }
 
 meta_dir(){
+  local dir meta v
   dir="${1}"
   meta="${dir}/.index/meta"
 
   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"
 
     RELEASE "$meta"
   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
-      if [ "$v" -nt "$meta" ]; then
-        grep -qF "	$(meta_name "$v")" "$meta" \
-        || meta_line "$v"
-      fi
+    cp -p "$meta" "$meta.ref"; touch "$meta"
+    find "$dir" -type f -newer "$meta.ref" \
+         -mindepth 1 -maxdepth 1 \
+    | grep -aE "$file_pattern" \
+    | while read -r v; do
+      grep -qF "	$(meta_name "$v")" "$meta" \
+      || meta_line "$v"
     done >>"$meta"
+    rm "$meta.ref"
 
     RELEASE "$meta"
   fi