@@ -5,7 +5,7 @@ hangar[path]=$HOME/.fgfs/flightgear-fgaddon/Aircraft

 hangar[name]=FGADDON

 hangar[source]=sourceforge

 hangar[type]=svn

-hangar[url]=https://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft

+hangar[url]=https://svn.code.sourceforge.net/p/flightgear/fgaddon/trunk/Aircraft

 hangar[active]=1

 function getfromrepo () {

@@ -14,6 +14,8 @@ cmake     -DVSP_USE_SYSTEM_LIBXML2=true \

           -DPYTHON_INCLUDE_DIR='/usr/include/python3.9' \

           -DPYTHON_INCLUDE_PATH='/usr/include' \

           -DCMAKE_BUILD_TYPE=Release \

+          -DCMAKE_CXX_COMPILER=g++-11 \

+          -DCMAKE_CC_COMPILER=gcc-11 \

           $fgfs_source/OpenVSP/Libraries \

 && make -j$simultaneous \

 && cmake_options+=("-DVSP_LIBRARY_PATH=$fgfs_build/OpenVSPlibs") \

@@ -4,26 +4,34 @@ pdf="$1"

 size=$(pdfinfo "$pdf" | awk '/^Page size:/{

 	a = $3

 	b = $5

-	if (a >= 419  && a <= 421  && b >= 594  && b <= 596 ) print "a5"

-	if (a >= 594  && a <= 596  && b >= 419  && b <= 421 ) print "a5"

-	if (a >= 594  && a <= 596  && b >= 841  && b <= 843 ) print "a4"

-	if (a >= 841  && a <= 843  && b >= 594  && b <= 596 ) print "a4"

-	if (a >= 841  && a <= 843  && b >= 1189 && b <= 1191) print "a3"

-	if (a >= 1189 && a <= 1191 && b >= 841  && b <= 843 ) print "a3"

+	if (a >= 419  && a <= 421  && b >= 594  && b <= 596 ) print "a5 portrait"

+	if (a >= 594  && a <= 596  && b >= 419  && b <= 421 ) print "a5 paysage"

+	if (a >= 594  && a <= 596  && b >= 841  && b <= 843 ) print "a4 portrait"

+	if (a >= 841  && a <= 843  && b >= 594  && b <= 596 ) print "a4 paysage"

+	if (a >= 841  && a <= 843  && b >= 1189 && b <= 1191) print "a3 portrait"

+	if (a >= 1189 && a <= 1191 && b >= 841  && b <= 843 ) print "a3 paysage"

 }')

 pages=$(pdfinfo "$pdf" | awk '/Pages:/{print $2}')

 output=$(mktemp --dry-run /dev/shm/XXXXXXXX.pdf)

 recto=$(mktemp --directory /dev/shm/XXXXXXXX)

 verso=$(mktemp --directory /dev/shm/XXXXXXXX)

-if test "${size,,}" != "a5"; then

+if test "${size% *}" != "a5"; then

     gs -o $output -sDEVICE=pdfwrite -sPAPERSIZE=a5 -dFIXEDMEDIA -dPDFFitPage -dCompatibilityLevel=1.6 "$pdf"

 else

     cp "$pdf" $output

 fi

-pdfjam --paper a4paper --nup '2x1' --landscape --outfile $recto -- "$output" 1 "$output" 1

+if test "${size#* }" = "portrait"; then

+    pdfjam --paper a4paper --nup '2x1' --landscape --outfile $recto -- "$output" 1 "$output" 1

+else

+    pdfjam --paper a4paper --nup '1x2' --no-landscape --outfile $recto -- "$output" 1 "$output" 1

+fi

 if test $pages -eq 2; then

-    pdfjam --paper a4paper --nup '2x1' --landscape --outfile $verso -- "$output" 2 "$output" 2

+    if test "${size#* }" = "portrait"; then

+        pdfjam --paper a4paper --nup '2x1' --landscape --outfile $verso -- "$output" 2 "$output" 2

+    else

+        pdfjam --paper a4paper --nup '1x2' --no-landscape --outfile $verso -- "$output" 2 "$output" 2

+    fi

     pdftk A=$(find $recto -name "*pdf") B=$(find $verso -name "*pdf") cat A B output "$output"

 else

     mv $(find $recto -name "*pdf") $output

@@ -120,3 +120,24 @@ function piwigo_private () {

     _turn 20 || return

     test "$(curl --silent 'http://192.168.0.71/photos/ws.php?format=json&method=pwg.categories.getList' | sum)" = "00569     1" || echo "albums visibles publiquement"

 }

+

+function snappymail_version () {

+    _turn 24 || return

+    local installed_version=$(</var/www/rainloop/data/VERSION)

+    local release_url='https://api.github.com/repos/the-djmaze/snappymail/releases/latest'

+    local version=$(curl -sL -H "Accept: application/vnd.github+json" $release_url | jq -r '.name | ltrimstr("v")')

+    if test $version != $installed_version; then

+        echo "nouvelle version dispo: $version"

+    fi

+}

+

+function navidrome_version () {

+    _turn 24 || return

+    local installed_version=$(find ~navidrome/navidrome -printf "%C@")

+    local release_url='https://api.github.com/repos/navidrome/navidrome/releases/latest'

+    local version=$(curl -sL -H "Accept: application/vnd.github+json" $release_url \

+                  | jq -r '.assets | .[] | select(.name | contains("linux_armv7")) | .updated_at | fromdateiso8601')

+    if test $version -gt ${installed_version%.*}; then

+        echo "nouvelle version dispo"

+    fi

+}

@@ -38,16 +38,14 @@ for i in 2 3; do

         ${prtInputMaxCapacity}.$i \

         ${prtInputCurrentLevel}.$i \

         ${prtInputMediaDimFeedDirChosen}.$i \

-        ${prtInputMediaDimXFeedDirChosen}.$i | awk -v inputslot=$((i - 1)) '

+        ${prtInputMediaDimXFeedDirChosen}.$i | awk -v inputslot=$((i - 1)) -v output=${1:-normal} '

         BEGIN {

             i = 0

             format["82667 x 116900"] = "A4 portrait / A5 paysage"

             format["116900 x 82667"] = "A4 paysage"

             format["165333 x 117000"] = "A3 paysage"

-            is[1] = "A"

-            is[2] = "B"

-            is[3] = "C"

-            is[4] = "D"

+            is[1] = "B"

+            is[2] = "A"

         }

         { 

             a[i] = $NF

@@ -56,7 +54,10 @@ for i in 2 3; do

         END {

             size = a[2] " x " a[3]

             f = format[size] ? format[size] : "format inconnu : " a[2] " x " a[3]

-            printf("bac %d (InputSlot=PF730%s): %d%% (%s)\n", inputslot, is[inputslot], a[1]/a[0]*100, f)

+	    if (output == "normal")

+                printf("bac %d (InputSlot=PF500%s): %d%% (%s)\n", inputslot, is[inputslot], a[1]/a[0]*100, f)

+            else

+                printf("bac %d (%s): %d%%\n", inputslot, f, a[1]/a[0]*100)

         }

     '

 done

@@ -46,8 +46,8 @@ function help (rc) {

         if (/^#help:BEGIN/) help_started = 1

         if (/^#help:END/) help_started = 0

         if (help_started) {

-            if (/^[[:blank:]]*case \/\^(.+)\$\/[[:blank:]]*\:[[:blank:]]*$/) {

-                option = gensub(/^[[:blank:]]*case \/\^(.+)\$\/[[:blank:]]*\:[[:blank:]]*$/, "\\1", "1")

+            if (/^[[:blank:]]*case \/\^(.+)\$\/[[:blank:]]*:[[:blank:]]*$/) {

+                option = gensub(/^[[:blank:]]*case \/\^(.+)\$\/[[:blank:]]*:[[:blank:]]*$/, "\\1", "1")

                 line = line "\n\n\033[1m" option "\033[0m"

             }

             else if (/^#help:/ && option != "") {

@@ -1,5 +1,9 @@

 #!/bin/bash

+set -e

+

+test $USER = www-data

+

 thumbnailsconf=${1:-${0##*/}.conf}

 test -r "$thumbnailsconf" || exit 1

 shift

@@ -13,6 +17,7 @@ imgsize[medium]=" 792   594"

 imgsize[small]="  576   432"

 imgsize[xsmall]=" 432   324"

 imgsize[2small]=" 240   180"

+imgsize[square]=" 120   120"

 if test $# -gt 0; then

     filter=$(echo $@ | sed 's/ /|/g')

@@ -47,7 +52,7 @@ if ! which convert > /dev/null; then

     exit 1

 fi

-sqlcmd="select path from ${dbprefix}images

+sqlcmd="select distinct path from ${dbprefix}images

            where id in (

               select distinct image_id from ${dbprefix}image_category

                   where category_id in (

@@ -55,35 +60,60 @@ sqlcmd="select path from ${dbprefix}images

                   )

            )"

-IFS=$'\n'

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

-    format=""

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

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

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

-    test $fnExt = 'mp4' && continue

-    cmd="sudo -u www-data convert \"$site/$file\" -write mpr:image +delete "

-    count=0

-    for size in ${!imgsize[@]}; do

-        if ! test -e "${destDir}/${fnNoExt}-${size:0:2}.$fnExt" -a -z "$FORCE"; then

-            format+="$size "

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

-            cmd+="-resize ${width[$size]}x${height[$size]} -write \"${destDir}/${fnNoExt}-${size:0:2}.$fnExt\" +delete "

-            let count++

-        fi

+function get_ext_fn () {

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

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

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

+}

+

+function get_formats () {

+    local IFS=$'\n'

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

+        get_ext_fn "$file"

+        test $fnExt = 'mp4' && continue

+        for size in ${!imgsize[@]}; do

+            if ! test -e "${destDir}/${fnNoExt}-${size:0:2}.$fnExt" -a -z "$FORCE"; then

+                formats[$file]+="$size "

+                let total_ext++

+            fi

+        done

     done

-    if test -n "$format"; then

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

-        if test -n "$LIST"; then

-            continue

-        fi

-        echo -n "please wait... "

-        cmd=$(sed -r 's/^(.+) -write (.*) \+delete $/\1 \2/' <<< $cmd)

-        eval $(echo -e nice -20 $cmd)

+}

+

+function calc_left () {

+    local format=(${formats[$file]})

+    unset formats[$file]

+    total_ext=$(( $total_ext - ${#format[@]} ))

+}

+

+declare -A formats

+total_ext=1

+get_formats

+let total_ext--

+

+if test -n "$LIST"; then

+    for file in "${!formats[@]}"; do

+        echo "[${#formats[@]}/$total_ext] $file : ${formats[$file]}"

+        calc_left

+    done

+else

+    for file in "${!formats[@]}"; do

+        unset cmd

+        sleep_duration=1

+        get_ext_fn "$file"

+        for size in ${formats[$file]}; do

+            cmd+=(mpr:image -resize ${width[$size]}x${height[$size]} -write "${destDir}/${fnNoExt}-${size:0:2}.$fnExt" +delete)

+            let sleep_duration++

+        done

+        printf "\r\033[K[${#formats[@]}/$total_ext] $file : ${formats[$file]}"

+        cmd[-1]="null:"

+        nice -20 convert \

+            -filter Lanczos -strip -auto-orient -quality 95 -interlace line -sampling-factor 4:2:2 \

+            "$site/$file" +write "${cmd[@]}"

         for size in ${!imgsize[@]}; do

-            test -s "${destDir}/${fnNoExt}-${size:0:2}.$fnExt" || echo "missing extension ${size:0:2}.$fnExt"

+            test -s "${destDir}/${fnNoExt}-${size:0:2}.$fnExt" || echo -e "\nmissing extension ${size:0:2}.$fnExt"

         done

-        echo "done, sleeping..."

-        sleep $(( 2 + $count ))

-    fi

-done

+        sleep $sleep_duration

+        calc_left

+    done

+fi