search: features & fixes

1 files changed, 61 insertions, 6 deletions

diff --git a/search b/search
index 191882e..63f05ff 100755
--- a/search
+++ b/search
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+set -f
 set -o pipefail
 shopt -s lastpipe
 
@@ -24,6 +25,30 @@ search_url()
         echo https://search.f-droid.org/'?q='"$q"${p:+'&page='$p}'&lang='${lang:-en}
 }
 
+showpage()
+{
+        (
+                out=$(mktemp)
+                trap 'rm -f "$out"' EXIT
+                # wget -q "$1" -c -O "$out"
+                curl --fail -s -S -L "$1" -o "$out"
+                show_pkg "$out" | less -E
+                rm -f "$out"
+                trap - EXIT
+        )
+}
+
+show_pkg()
+{
+        for x in name summary description
+        do
+                hxextract .package-$x "$1" |
+                        w3m -T text/html |
+                        sed -e '/^$/d'
+                echo
+        done
+}
+
 search()
 {
         page=${page:-1}
@@ -43,6 +68,8 @@ search()
         hxclean < "$out" |
                 hxselect -s '\n' span.package-summary |
                 mapfile -t summary
+        rm -f "$out"
+        trap - EXIT
         [ ${#href[@]} = ${#name[@]} ]
         [ ${#href[@]} = ${#summary[@]} ]
         OPTIONS=()
@@ -59,7 +86,12 @@ search()
                 s=$(w3m -T text/html <<<"$s")
                 OPTIONS+=("$(printf "%40s: %s" "$n" "$s")")
         done
-        PS3='Choose <number> to install, [n]ext, [p]revious, or m<number> for [m]ore> '
+        if [ ${#OPTIONS[@]} = 0 ]
+        then
+                echo "No results for ${@@Q}" >&2
+                return
+        fi
+        PS3='Choose <number> to install, s<number> to [s]how, or [n]ext/[p]revious page> '
         select i in "${OPTIONS[@]}"
         do
                 if [ "$i" ]
@@ -67,11 +99,18 @@ search()
                         i=$((REPLY - 1))
                         (
                                 set -x
-                                mkdir repo/"${href[$i]##*/}"
+                                mkdir -p repo/"${href[$i]##*/}"
                         )
                         continue
                 fi
                 case "${REPLY@L}" in
+                        q )
+                                return
+                                ;;
+                        q* )
+                                page=1 search ${REPLY#?}
+                                return
+                                ;;
                         n )
                                 let ++page
                                 search "$@"
@@ -82,19 +121,35 @@ search()
                                 search "$@"
                                 return
                                 ;;
-                        m*[^0-9\ ] )
+                        s*[^0-9\ ] )
                                 continue
                                 ;;
-                        m*[0-9]* )
+                        s*[0-9]* )
                                 i=${REPLY#?}
                                 i=$((i - 1))
                                 if [ $i -gt 0 -a $i -lt ${#OPTIONS[@]} ]
                                 then
-                                        w3m "${href[$i]}"
+                                        showpage "${href[$i]}"
                                 fi
                                 ;;
                 esac
         done
 }
 
-search "${@:-music}"
+isearch()
+{
+        while read -e -p 'Search f-droid.org> '
+        do
+                if [ "$REPLY" ]
+                then
+                        search $REPLY
+                fi
+        done
+}
+
+if [ $# -gt 0 ]
+then
+        search "$@"
+else
+        isearch
+fi