avoid filtering with empty filters

[serve0] / pages / common.sh

diff --git a/pages/common.sh b/pages/common.sh
index 6257aad6e3fba469e17f8143c2cd05dcae9ab5fb..e03e6f5da8e5e9c7e2f413594713f7f82c448f2c 100755 (executable)
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -39,6 +39,14 @@ taglist=$(
   done |sort -u |grep -xv '' |tee ${_DATA}/cache/taglist
 )
 
+genthumb(){
+  videofile="$(printf %s "$1" |sed -r "s;';'\\'';g")"
+      thumb="$(printf %s "$2" |sed -r "s;';'\\'';g")"
+
+  printf '%s\n' "${_EXEC}/helpers/genthumb.sh '$videofile' '$thumb' >/dev/null 2>/dev/null" \
+  | batch
+}
+
 _printVideo(){
   info="$1"
   cache="${_DATA}/cache/$info.cache"
@@ -48,9 +56,9 @@ _printVideo(){
     cat "$cache"
   else
     videofile="${_DATA}/videos/$info"
-    thumb="${_DATA}/thumbs/$info.jpg"
-    [ -r "$meta"  ] || ${_EXEC}/helpers/genmeta.sh "$videofile" "$meta" >/dev/null
-    [ -r "$thumb" ] || ${_EXEC}/helpers/genthumb.sh "$videofile" "$thumb" >/dev/null
+    thumb="${_DATA}/thumbs/${info}.jpg"
+    [ -r "$thumb" ] || genthumb "$videofile" "$thumb"
+    [ -r "$meta"  ] || "${_EXEC}/helpers/genmeta.sh" "$videofile" "$meta" >/dev/null
 
     head -n1 "$meta" |read length width height filename
     [ -z "$length" ] && length=0
@@ -84,9 +92,9 @@ VIDEOend
 
 genlist(){
   case "$order" in
-    Date)   ls -c ${_DATA}/videos/ |egrep -i "$file_pattern";;
-    Length) sed -sn 1p "${_DATA}/meta/"*.meta |sort -n |sed -r 's;^[0-9\t]+\t;;';;
-    Name)   printf '%s\n' "${_DATA}/meta/"*meta |sed -r 's;^.*/;;;s;\.meta$;;';;
+    Date)   ls -c "${_DATA}"/videos/ |egrep -i "$file_pattern";;
+    Length) sed -sn 1p "${_DATA}"/meta/*.meta |sort -n |sed -r 's;^[0-9\t]+\t;;';;
+    Name)   printf '%s\n' "${_DATA}"/videos/* |sed -r 's;^.*/;;;';;
   esac
 }
 
@@ -104,13 +112,16 @@ thumblist() {
       
     genlist \
     | if [ -n "$search" ] ; then
+      debug "Applying search: ${search}"
       xargs -d '\n' printf "${_DATA}/meta/%s.meta\n" \
       | xargs -d '\n' egrep -sil "$search" \
       | sed -r 's;^.*/;;;s;\.meta$;;'
-    elif [ "$filterex" != "q0" ]; then
+    elif [ -n "$filter" ]; then
+      debug "Applying filters: ${filter} ++ ${filterex}"
       xargs -d '\n' printf "${_DATA}/meta/%s.meta\n" \
       | xargs -d '\n' sed -srn ":a;N;2!ba;{${filterex}}"
     else
+      debug "No search or filtering"
       cat
     fi \
     | sed -n "$page,$(($page + $pagesize - 1))p" \