further increase thumbnail quality (though still using jpeg ;-)

[serve0] / indexmeta.sh

diff --git a/indexmeta.sh b/indexmeta.sh
index 30bf32d5c68e95ac0f34dac8e0cc990550c5eafb..45a3bac008b2ee469719d6ac2b91b3a0976b9178 100644 (file)
--- a/indexmeta.sh
+++ b/indexmeta.sh
@@ -7,6 +7,7 @@ include_indexmeta="$0"
 file_pattern='^.*\.(mov|ts|mpg|mpeg|mp4|m4v|avi|mkv|flv|sfv|wmv|ogm|ogv|webm|iso|rmvb)$'
 
 meta_name() {
+  local fn
   fn="$1"
   fn="${fn##*/}"
   fn="${fn%.*}"
@@ -15,6 +16,7 @@ meta_name() {
 }
 
 meta_line() {
+  local video l w h
   video="$1"
 
   read l h w <<__EOF
@@ -32,12 +34,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,13 +48,28 @@ 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"
   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'
@@ -59,14 +77,15 @@ meta_info(){
 }
 
 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"
 
@@ -74,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"