fix bug in exclusive tag support

[serve0] / indexmeta.sh

diff --git a/indexmeta.sh b/indexmeta.sh
index 4545df93118bff9869839b0d9dbebcee3011c19e..fb893e14195bd8ba2554adb121097a5f8c021eb9 100644 (file)
--- a/indexmeta.sh
+++ b/indexmeta.sh
@@ -8,11 +8,8 @@ file_pattern='^.*\.(mov|ts|mpg|mpeg|mp4|m4v|avi|mkv|flv|sfv|wmv|ogm|ogv|webm|iso
 
 meta_name() {
   local fn
-  fn="$1"
-  fn="${fn##*/}"
-  fn="${fn%.*}"
-  STRING "$fn"
-  printf '\r'
+  fn="$1"; fn="${fn##*/}"; fn="${fn%.*}"
+  STRING "$fn"; printf '\r'
 }
 
 meta_line() {
@@ -55,24 +52,23 @@ meta_purge(){
   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"
+    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"
+  file="$1"; meta="${file%/*}/.index/meta"
 
   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'
+    printf '0\t0\t0\ttags=\tcomment=\t%s\r' "$(meta_name "$file")"
   fi
 }
 
@@ -84,22 +80,23 @@ 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"
 
     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"
+    sort -u "$meta" >"$meta.ref"
+    mv "$meta.ref" "$meta"
 
     RELEASE "$meta"
   fi