X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=indexmeta.sh;h=2da085f9a0bf86fcdb630f8fd98443df7d99c423;hb=608e267413cf7f8399cacbbfc4269d3c3820a3aa;hp=37a617aa0fa6c860f44ceeb1f568568380d0ee89;hpb=71ab2a7fb405c5b0394509ac81acfe35fe2c5ffb;p=serve0

diff --git a/indexmeta.sh b/indexmeta.sh
index 37a617a..2da085f 100644
--- 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 -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
 }
 
@@ -80,6 +76,9 @@ meta_dir(){
   local dir meta v
   dir="${1}"
   meta="${dir}/.index/meta"
+  metat="${dir}/.index/meta.time"
+
+  [ -f "$metat" ] || touch -d @0 "$metat"
 
   if [ -d "$dir/.index" -a \! -f "$meta" ] && LOCK "$meta"; then
     touch "$meta"  # preliminary touch to prevent concurrent generators
@@ -90,17 +89,18 @@ meta_dir(){
     done >"$meta"
 
     RELEASE "$meta"
-  elif [ -d "$dir/.index" -a "$dir" -nt "$meta" ] && LOCK "$meta"; then
+  elif [ -d "$dir/.index" -a "$dir" -nt "$metat" ] && LOCK "$meta"; then
     cp -p "$meta" "$meta.ref"; touch "$meta"
-    find "$dir" -type f -mindepth 1 -maxdepth 1 \
+    find "$dir" -type f -newer "$metat" \
+         -mindepth 1 -maxdepth 1 \
     | grep -aE "$file_pattern" \
     | while read -r v; do
-      if [ "$v" -nt "$meta.ref" ]; then
-        grep -qF "	$(meta_name "$v")" "$meta" \
-        || meta_line "$v"
-      fi
+      grep -qF "	$(meta_name "$v")" "$meta" \
+      || meta_line "$v"
     done >>"$meta"
-    rm "$meta.ref"
+    sort -u "$meta" >"$meta.ref"
+    mv "$meta.ref" "$meta"
+    touch "$metat"
 
     RELEASE "$meta"
   fi