astro

commit c815d5b9d9d5b2b27f4b46774229464e095451f8
parent 8966a450a6d7a2ec65bef2ffd904ebc049e371fe
Author: blmayer <bleemayer@gmail.com>
Date:   Fri, 16 Jul 2021 12:33:58 -0300

Improved relative link parsing

Diffstat:
M
astro
 | 
11
++++++++---

1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/astro b/astro
@@ -192,14 +192,19 @@ fetch() {
 				printf "Enter link number: "
 				read -r -u 1 i
 				url="$(grep -G "^$i	" "$cachedir/links.txt" | cut -d'	' -f2)"
+				[ "$debug" ] && echo "Link is: $url"
 				;;
 			52) url="$prev" ;;
 			53) url="$(printf "%s://%s:%s/%s" $(parseurl "$homepage"))" ;;
 		esac
 
-		# Add domain for incomplete links
-		echo "$url" | grep -q "//" || url="$2/$url"
-		[ "$debug" ] && echo "Seeking link: $url" >&2
+		# Relative links
+		echo "$url" | grep -q -E '[^/]+/[^/]+' || {
+			echo "$4" | grep -q "/" && url="${4%\/*}/$url"
+			url="$2:$3/$url"
+		}
+
+		[ "$debug" ] && echo "Seeking link: $url" >&2 && sleep 2
 		fetch $(parseurl "$url")
 	}
 }