@@ -20,7 +20,7 @@ set_imgsize '2small' 144 144

 set_imgsize 'thumb' 120 120

 if which readconf > /dev/null; then

-    eval $(readconf --conf "$thumbnailsconf" -s mysql -s galeries -s path --case-sensitive --array=galerie)

+    eval $(readconf --conf "$thumbnailsconf" --section=mysql --section=path --case-sensitive)

 else

     echo readconf needed !

     echo PATH = $PATH

@@ -33,39 +33,46 @@ if ! which convert > /dev/null; then

     exit 1

 fi

-for ((g=0; g<${#galerie[@]}; g++)); do

-    sqlcmd="select concat('file=', path, ';rotation=', rotation * 90) from ${dbprefix}images \

-               where id in ( \

-                  select image_id from ${dbprefix}image_category \

-                      where category_id in ( \

-                          select id from ${dbprefix}categories where name = '${galerie[$g]}' \

-                      ) \

-               )"

+sqlcmd="select path, rotation from ${dbprefix}images \

+           where id in ( \

+              select image_id from ${dbprefix}image_category \

+                  where category_id in ( \

+                      select id from ${dbprefix}categories where dir is NULL \

+                  ) \

+           )"

-    for image in $(mysql -N -u $dbuser -p${dbpasswd} $dbname <<< $sqlcmd); do

-        eval "$image"

-        format=""

-        fnNoExt="${file%.*}"

-        fnExt="${file##*.}"

-        fnPath="${file%/*}"

-        mkdir -p $destDir/$fnPath

-        cmd="nice -n20 convert $site/$file -write mpr:image +delete "

-        for ((i=0; i<${#imgsize[@]}; i+=3)); do

-            if ! test -e ${destDir}/${fnNoExt}-${imgsize[i]:0:2}.$fnExt; then

-                format+="${imgsize[i]} "

-                cmd+="mpr:image -filter Lanczos -strip -quality 95 -interlace line -sampling-factor 4:2:2 "

-                if test $rotation -ne 0; then

-                    cmd+="-rotate -$rotation -orient top-left "

-                fi

-                cmd+="-resize ${imgsize[i+1]}x${imgsize[i+2]} -write ${destDir}/${fnNoExt}-${imgsize[i]:0:2}.$fnExt +delete "

+for image in $(mysql -N -u $dbuser -p${dbpasswd} $dbname <<< $sqlcmd | awk '{printf("file=%s;rotation=%s\n",$1,$2*90)}'); do

+    eval "$image"

+    format=""

+    fnNoExt="${file%.*}"

+    fnExt="${file##*.}"

+    fnPath="${file%/*}"

+    mkdir -p $destDir/$fnPath

+    cmd="convert $site/$file -write mpr:image +delete "

+    for ((i=0; i<${#imgsize[@]}; i+=3)); do

+        if ! test -e ${destDir}/${fnNoExt}-${imgsize[i]:0:2}.$fnExt; then

+            format+="${imgsize[i]} "

+            cmd+="mpr:image -filter Lanczos -strip -quality 95 -interlace line -sampling-factor 4:2:2 "

+            if test $rotation -ne 0; then

+                cmd+="-rotate -$rotation -orient top-left "

             fi

-        done

-        cmd=$(sed 's/\s*+delete\s*$//' <<< $cmd)

-        if test -n "$format"; then

-            echo "$site/$file : $format"

-            eval "$(echo -e $cmd)"

-            echo done

-            sleep 30

+            cmd+="-resize ${imgsize[i+1]}x${imgsize[i+2]} -write ${destDir}/${fnNoExt}-${imgsize[i]:0:2}.$fnExt +delete "

         fi

     done

+    cmd=$(awk '{for (i=1; i<=NF - 3; i++) printf("%s ", $i); printf("%s", $(NF-1))}' <<< $cmd)

+    if test -n "$format"; then

+        echo "$site/$file : $format"

+        echo -n "please wait... "

+        if test -z "$2"; then

+            eval "$(echo -e sudo -u www-data nice -20 $cmd)"

+            for ((i=0; i<${#imgsize[@]}; i+=3)); do

+                test -s ${destDir}/${fnNoExt}-${imgsize[i]:0:2}.$fnExt || echo "missing extension ${imgsize[i]:0:2}.$fnExt"

+            done

+            echo "done, sleeping..."

+            sleep 10

+        else

+            echo $cmd

+            echo

+        fi

+    fi

 done