@@ -4,20 +4,18 @@ fgaddon_url=https://sourceforge.net/p/flightgear/fgaddon/HEAD/tree/trunk/Aircraf

 fgaddon_svn=https://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft

 fgaddon_path=$HOME/.fgfs/flightgear-addons/Aircraft

-attribute_regex='s/^.*id="l[0-9]+" class="code_block">.*<span class="nt">&lt;__attribute__&gt;<.span>(.+)<span class="nt">&lt;.__attribute__&gt;<.span>.*$/\1/p'

-

 aircrafts=$(mktemp --dry-run /dev/shm/Aircraft-XXXXXXXXX)

 aircraft=$(mktemp --dry-run /dev/shm/aircraft-XXXXXXX)

 setxml=$(mktemp --dry-run /dev/shm/setxml-XXXXXXXX)

 in_ram_database=$(mktemp --dry-run /dev/shm/XXXXXXX)

 database=${DB:-$0.db}

-attributes=(description long_description author flight_model)

+attributes=(description long_description author flight_model type)

-function get_attribute () {

-    eval "unset $1"

-    result=$(sed -rn "${attribute_regex//__attribute__/${1//_/-}}" $setxml)

-    eval "$1=\$\"$result\""

+xmlgetnext () {

+   local IFS='>'

+   read -d '<' TAG VALUE

+   TAG=$(tr '\n' ' ' <<< $TAG | sed 's/  */ /g; s/ *$//')

 }

 function sqlite_request () {

@@ -36,6 +34,7 @@ function trap_exit () {

         rm -f $in_ram_database

         echo "no changes in $database"

     elif test -w "$database"; then

+        sqlite_request "vacuum"

         mv -f $in_ram_database "$database"

         echo "database $database updated"

     elif ! test -e "$database"; then

@@ -54,25 +53,47 @@ update_database () {

     dbupdate=$(sqlite_request "select revision from aircrafts where name is '$ac'")

     if test -z "$dbupdate"; then

-        sqlite_request "insert into aircrafts (name, revision, date, author) values ('$ac', $revision, $revdate, '$revauthor')"

-    elif test $dbupdate -lt $revision; then

-        sqlite_request "update aircrafts set revision = $revision, author = '$revauthor' where name is '$ac'"

+        sqlite_request "insert into aircrafts (name, revision, date, author)

+                        values ('$ac', ${revision[$ac]}, ${revdate[$ac]}, '${revauthor[$ac]}')"

+    elif test $dbupdate -lt ${revision[$ac]}; then

+        sqlite_request "update aircrafts set

+                            revision = ${revision[$ac]},

+                            author   = '${revauthor[$ac]}',

+                            date = ${revdate[$ac]}

+                        where name is '$ac'"

     fi

     id=$(sqlite_request "select id from aircrafts where name is '$ac'")

-    wget -qO- $fgaddon_url/$ac > $aircraft

-    for sx in $(sed -rn 's/<a class="icon" href="(.+)-set.xml" title=".+"><i class="fa fa-file-o">.+$/\1/p' $aircraft); do

+    for sx in ${setxmlmodified[$ac]}; do

+        test -n "${_sx[$ac/$sx]}" && continue

+        _sx[$ac/$sx]="already done"

+        unset description long_description author flight_model in_sim

         echo " -> $sx"

-        wget -qO- $fgaddon_url/$ac/$sx-set.xml > $setxml

-        for attribute in ${attributes[@]}; do

-            get_attribute $attribute

-        done

+        svn export --quiet --force --revision ${revision[$ac]} $fgaddon_svn/$ac/$sx-set.xml $setxml

+        while xmlgetnext; do

+            case "$TAG" in

+                ${attributes_case:0:${#attributes_case}-1})

+                    test -n "$in_sim" && eval "${TAG//-/_}=\"$VALUE\""

+                    test -n "$description" \

+                      -a -n "$long_description" \

+                      -a -n "$author" \

+                      -a -n "$flight_model" \

+                      -a -n "$type" && break

+                ;;

+                'sim') in_sim=1;;

+                '/sim') break;;

+            esac

+        done < $setxml

         if test -n "$description" -a -z "$flight_model"; then

             grep -qi 'jsbsim' <<< "$description" && flight_model='jsb'

             grep -qi 'yasim' <<< "$description" && flight_model='yasim'

         fi

+        if test -n "$long_description"; then

+            long_description=$(sed 's/^\s*//g' <<< $long_description | tr '\n' ' ')

+        fi

+

         known=$(sqlite_request "select variantof from setxml where file is '$sx'")

         if test -n "$known"; then

             for attribute in ${attributes[@]}; do

@@ -90,11 +111,6 @@ update_database () {

     done

 }

-xmlgetnext () {

-   local IFS='>'

-   read -d '<' TAG VALUE

-}

-

 trap trap_exit EXIT

 test -e $database && cp $database $in_ram_database

@@ -102,124 +118,63 @@ test -e $database && cp $database $in_ram_database

 sqlite_request "create table if not exists aircrafts (id integer primary key, name text, revision integer, date integer, author text)"

 sqlite_request "create table if not exists setxml (file text, variantof integer, description text, long_description text, author text, type text, flight_model text, installed integer)"

-test -z "$1" && echo "mode RSS"

-

-case ${1:-rss} in

-    'full')

-        echo "downloading the FGADDON list"

-        wget -qO- $fgaddon_url | sed -n '/<table>/,/<\/table>/p' > $aircrafts

-

-        total=$(grep -c '<a class="icon" href=".*class="fa fa-folder".*i>&nbsp;' $aircrafts)

-

-        while xmlgetnext; do

-            case "$TAG" in

-                'tr')

-                    unset ac revision revauthor

-                    ;;

-                'a class="icon" href='*)

-                    eval $(echo "${TAG#* }")

-                    ac=$href

-                    ;;

-                'span title='*)

-                    eval $(echo "${TAG#* }")

-                    revdate=$(date +%s -d "$title")

-                    ;;

-                'a href="/p/flightgear/fgaddon/'*)

-                    eval $(echo "${TAG#* }")

-                    revision=$(tr -cd '[:digit:]' <<< $href)

-                    ;;

-                'span class="icon emboss x16" style="text-align:center;" title="User"'*)

-                    user=1

-                    ;;

-                '/span')

-                    test -n "$user" && revauthor=$(tr -cd '[:alnum:]' <<< $VALUE) && unset user

-                    ;;

-                '/tr')

-                    test -n "$revision" -a -n "$revauthor" -a -n "$ac" -a -n "$revdate" && update_database

-                    ;;

-            esac

-        done < $aircrafts

-    ;;

-    'rss')

-        get_updates_from_rss () {

-            while xmlgetnext; do

-                case "$TAG" in

-                    'item')

-                        let entry++

-                        unset link revdate revauthor revision title;;

-                    'link')

-                        link="$VALUE";;

-                    'title')

-                        title="$VALUE";;

-                    'dc:creator'*)

-                        revauthor="$VALUE";;

-                    'guid isPermaLink="false"')

-                        revision=$(sed -r 's,^.+/([0-9]+)/$,\1,' <<< $VALUE)

-                        if test $revision -eq ${latest_revision:-0}; then

-                            test $entry -eq 1 && echo "no new updates" >&2

-                            break

-                        fi

-                    ;;

-                    'pubDate')

-                        revdate=$(date +%s -d "$VALUE")

-                    ;;

-                    '/item')

-                        echo "$revision ($(date +"%d %B" -d@$revdate), $revauthor): $title" >&2

-                        wget -qO- "$link" | awk -v data="revision=$revision revdate=$revdate revauthor=$revauthor" '

-                            />\/trunk\/Aircraft\/.+</ {

-                                ac[gensub("^.+>/trunk/Aircraft/([^/]+).+<.*$", "ac=\\1", "1", $0)]++

-                            }

-                            END {

-                                for (i in ac) print data " " i

-                            }'

-                    ;;

-                    '/channel')

-                        if test ${latest_revision:-0} -lt $revision; then

-                            echo "WARNING: $(( ($revision - ${latest_revision:-0}) )) revisions between the oldest RSS entry and last DB entry" >&2

-                            echo "a \`$0 full' may be useful" >&2

-                        fi

-                    ;;

-                esac

-            done < $aircrafts | awk '

+attributes_case=$(printf "'%s'|" "${attributes[@]}")

+latest_revision=$(sqlite_request "select max(revision) from aircrafts")

+

+echo "downloading FGADDON history from revision ${latest_revision:-0}"

+svn log --revision ${latest_revision:-0}:HEAD --xml --verbose $fgaddon_svn > $aircrafts

+

+while xmlgetnext; do

+    case "$TAG" in

+        'logentry revision='*)

+            eval $(echo ${TAG#* })

+            unset revdate revauthor ac path_list setxmlmodified

+        ;;

+        'author')

+            revauthor=$VALUE

+        ;;

+        'date')

+            revdate=$(date +%s -d "$VALUE")

+        ;;

+        'path '*)

+            path_list[${#path_list[@]}]="$VALUE"

+        ;;

+        '/logentry')

+            revlog[${#revlog[@]}]=$(

+                printf '%s\n' "${path_list[@]}" | awk -F/ -v revision=$revision -v revauthor=$revauthor -v revdate=$revdate -v dq='"' '

                 {

-                    if (a[$4] == "") a[$4]=$0

+                    a[$4]++

+                    if ($5 ~ "-set.xml$") b[$4]=b[$4] " " gensub("-set.xml$", "", "1", $5)

                 }

                 END {

-                    for (i in a) {

-                        total++

-                        command = command a[i] " update_database;"

-                    }

-                    printf("total=%i;%s", total, command)

-                }'

-        }

-        latest_revision=$(sqlite_request "select max(revision) from aircrafts")

-        wget -qO- https://sourceforge.net/p/flightgear/fgaddon/feed > $aircrafts

-        eval "$(get_updates_from_rss)"

-    ;;

-    get)

-        test -z "$2" && exit 1

-        ac=$(sqlite_request "select distinct(name) from aircrafts inner join setxml where aircrafts.id = setxml.variantof and (setxml.file = '$2' or aircrafts.name = '$2');")

-        if test -n "$ac"; then

-            if test -d $fgaddon_path/$ac; then

-                echo "$ac already installed"

-                test -d $fgaddon_path/$ac/.svn && echo "and seems to already be a subversion clone"

-                exit

-            elif test ! -w $fgaddon_path; then

-                echo "can't write in $fgaddon_path"

-            else

-                svn clone $fgaddon_svn/$ac $fgaddon_path/$ac

-            fi

-        else

-            echo "unknown aircraft $2"

-        fi

-    ;;

-        *)

-            echo "usage: [DB=path/to/database] $0 [rss|full]"

-            echo "usage: [DB=path/to/database] $0 get <aircraft>"

-            echo

-            echo "rss: updates only last repo changes"

-            echo "full: updates from all repo"

-            echo "get <aircraft>: svn clone aircraft if not installed"

-            exit 1

-    ;;

-esac

+                    for (i in a)

+                        printf("<revision[%s]=%i;revauthor[%s]=%s;revdate[%s]=%i;%s>",

+                                i, revision,

+                                i, revauthor,

+                                i, revdate,

+                                b[i] != "" ? "setxmlmodified[" i "]=" dq gensub("^ ", "", "g", b[i]) " ${setxmlmodified[" i "]}" dq ";" : "")

+                }')

+        ;;

+        '/log')

+            unset revision revauthor revdate setxmlmodified

+            declare -A revision revauthor revdate setxmlmodified

+            analyse () {

+                while xmlgetnext; do

+                    test -z "$TAG" -a ${#revision[@]} -eq 0 && continue

+                    case $TAG in

+                        'BEGIN') continue;;

+                        'END'  ) break 2;;

+                    esac

+                    echo $TAG

+                done <<< "<BEGIN>${revlog[@]}<END>"

+            }

+            eval $(analyse)

+            total=${#revision[@]}

+            declare -A _sx

+            for ac in "${!revision[@]}"; do

+                update_database

+            done

+            break

+        ;;

+    esac

+done < $aircrafts