1 files changed, 26 insertions, 21 deletions

diff --git a/fdroids.sh b/update-fdroids.bash
index 8830a18..aa2804b 100755
--- a/fdroids.sh
+++ b/update-fdroids.bash
@@ -46,32 +46,37 @@ parse_pkgname()
         esac
 }
 
+show_pkg()
+{
+        for x in name summary description
+        do
+                hxextract .package-$x "$1" |
+                        w3m -T text/html |
+                        sed -e '/^$/d'
+                echo
+        done
+}
+
 fetch_pkg()
 {
         local pkg="$1"
-        url=$baseurl/en/packages/$url
-        if wget_with_log -c -O index.html "$url"
+        url=$baseurl/en/packages/$pkg
+        if wget_with_log -O index.html.part "$url"
         then
-                # Wget might not touch file if it is up-to-date
-                # with server
-                touch "$pkgdir"/index.html
+                mv -T index.html.part index.html
         else
                 echo "failed to fetch url ${url@Q}" >&2
-                return
+                return 1
         fi
 
-        if hxwls "$pkgdir"/index.html |
+        hxwls index.html |
                 egrep "^$baseurl/repo/${pkg}_[0-9]+\.apk\$" |
                 sort -n |
                 tail -n1 |
                 read link &&
-                [ "$link" ]
-        then
-                (cd "$pkgdir" &&
-                wget_with_log -c "$link" "$link.asc")
-        else
-                echo "failed to fetch package ${pkg@Q}" >&2
-        fi
+                [ "$link" ] || return
+        show_pkg index.html >&2
+        wget_with_log -c "$link" "$link.asc"
 }
 
 quiet dpkg-query -W html-xml-utils || sudo apt install html-xml-utils
@@ -89,13 +94,13 @@ do
         fi
         pkgdir=repo/$pkg
         mkdir -p "$pkgdir"
-        if stale "$pkgdir"/index.html
+        stale "$pkgdir"/stamp || continue
+        stale "$pkgdir"/failstamp || continue
+        echo "$pkg" >&2
+        if ( cd "$pkgdir" && fetch_pkg "$pkg" )
         then
-                echo "$pkg" >&2
-                (
-                        cd "$pkgdir"
-                        fetch_pkg "$pkg"
-                )
-                break
+                touch "$pkgdir"/stamp
+        else
+                touch "$pkgdir"/failstamp
         fi
 done