From 7fa7e23d944f1f1cbb8b9e4aa2c737d90c3d276b Mon Sep 17 00:00:00 2001
From: David Rabkin <david@rabkin.co.il>
Date: Sun, 12 Nov 2023 17:49:58 +0200
Subject: [PATCH] speed: error handling

---
 app/speed | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/speed b/app/speed
index 490820e..5929bc1 100755
--- a/app/speed
+++ b/app/speed
@@ -8,7 +8,7 @@
 # shellcheck disable=SC1091,SC2034 # File not following, appears unused.
 set -- "$@" --quiet
 readonly \
-	BASE_APP_VERSION=0.9.20230604 \
+	BASE_APP_VERSION=0.9.20231112 \
 	BASE_MIN_VERSION=0.9.20230505
 . base.sh
 
@@ -21,6 +21,7 @@ main() {
 	while :; do
 		[ $((i % 30)) -eq 0 ] && title
 		test_speed
+		sleep 1
 		i=$((i + 1))
 	done
 }
@@ -30,31 +31,29 @@ main() {
 test_speed() {
 	url_exists google.com >/dev/null || {
 		loge Check internet connection.
-		sleep 1
 		return 0
 	}
-	local down host out up
-	if out="$(speedtest-cli 2>&1)"; then
-		down="$(
-			printf %s "$out" |
-				grep -E '^Download: ' |
-				gawk '{print $2}'
-		)"
-		up="$(
-			printf %s "$out" |
-				grep -E '^Upload: ' |
-				gawk '{print $2}'
-		)"
-		host="$(
-			printf %s "$out" |
-				grep -E '^Hosted by ' |
-				cut -c11-
-		)"
-		tsout "| $(printf %6s "$down") | $(printf %6s "$up") | $host"
-	else
+	local out
+	out="$(speedtest-cli 2>&1)" || {
 		loge "$(printf %s "$out" | xargs)"
-		sleep 1
-	fi
+		return 0
+	}
+	local down
+	down="$(printf %s "$out" | grep -E '^Download: ' | gawk '{print $2}')" || {
+		loge "$out: $down"
+		return 0
+	}
+	local up
+	up="$(printf %s "$out" | grep -E '^Upload: ' | gawk '{print $2}' )" || {
+		loge "$out: $up"
+		return 0
+	}
+	local host
+	host="$(printf %s "$out" | grep -E '^Hosted by ' | cut -c11- )" || {
+		loge "$out: $host"
+		return 0
+	}
+	tsout "| $(printf %6s "$down") | $(printf %6s "$up") | $host"
 }
 
 # Prints top title.