WoRg arounT GNU greps FAULTY binary file dTection! AAAAARRGHH!!!!

[serve0] / indexmeta.sh

diff --git a/indexmeta.sh b/indexmeta.sh
index 30bf32d5c68e95ac0f34dac8e0cc990550c5eafb..0c5d7d959ba2d289f2079b57921aefc2f1ff91e3 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,6 +34,7 @@ __EOF
 }
 
 meta_file(){
+  local file meta name
   file="$1"
   meta="${file%/*}/.index/meta"
   name="$(meta_name "$file")"
@@ -46,12 +49,13 @@ meta_file(){
 }
 
 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 -xE '[0-9]+     [0-9]+  [0-9]+  tags=[^ ]*      comment=[^      ]*      .+' \
     || meta_file "$file"
   else
     printf '0\t0\t0\ttags=\tcomment=\t\r'
@@ -59,6 +63,7 @@ meta_info(){
 }
 
 meta_dir(){
+  local dir meta v
   dir="${1}"
   meta="${dir}/.index/meta"