X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=indexmeta.sh;h=2da085f9a0bf86fcdb630f8fd98443df7d99c423;hp=8f0c971c81765becddf59d01368bf0680c766263;hb=608e267413cf7f8399cacbbfc4269d3c3820a3aa;hpb=d5eed6ee7e2ff547dd06023838b6aed031ba8174 diff --git a/indexmeta.sh b/indexmeta.sh index 8f0c971..2da085f 100644 --- a/indexmeta.sh +++ b/indexmeta.sh @@ -52,9 +52,9 @@ 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 } @@ -68,7 +68,7 @@ meta_info(){ | 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 } @@ -76,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 @@ -86,16 +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 -newer "$meta.ref" \ + find "$dir" -type f -newer "$metat" \ -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" + sort -u "$meta" >"$meta.ref" + mv "$meta.ref" "$meta" + touch "$metat" RELEASE "$meta" fi