X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=gopher.sh;h=f430d155355cb21fc703c08437d8663235088439;hb=8210ebede670fc8ac507809f979030883164d15c;hp=73256524e15020fcc0244ca330078f8bd42d712d;hpb=7f7487a64b9f441fcf38eb6e43a908a154ceb910;p=gofetch.git

diff --git a/gopher.sh b/gopher.sh
index 7325652..f430d15 100755
--- a/gopher.sh
+++ b/gopher.sh
@@ -43,22 +43,22 @@ SL=
 EL=
 if [ "$LINK_COLOR" != "-" ]; then
 	SL="`tput setf $LINK_COLOR``tput setaf $LINK_COLOR`"
-	EL="`tput init`";
+	EL="`tput init`"
+	export LESS="${LESS}-R"
 fi
 
-PREFIX="[0-9h]"
+PREFIX="[0-9hIg]"
 
 # $0 [FILE]
 # Display a gopher menu for the given resource
 cat_menu() {
 	i=0
 	cat "$1" | grep "^i\|^$PREFIX" | while read ln; do
-		ln="`echo "$ln" | cut -f1`"
 		if echo "$ln" | grep "^i" >/dev/null 2>&1; then
-			echo "$ln" | sed "s:^.:	:g"
+			echo "$ln" | cut -f1 | sed "s:^.:	:g"
 		elif echo "$ln" | grep "^$PREFIX" >/dev/null 2>&1; then
 			i=`expr $i + 1`
-			i=`printf %2.f $i`
+			[ $i -le 9 ] && i=0$i 
 			field="`echo "$ln" | cut -c1`"
 			case "$field" in
 				0) typ='TXT';;
@@ -66,14 +66,12 @@ cat_menu() {
 				7) typ='(?)';; # query
 				8) typ='TEL';; # TELnet (not TELephone)
 				h) typ='WEB';; # HTML
-				g) typ='GIF';;
 				I) typ='IMG';;
+				g) typ='GIF';;
 				+) typ='SVR';; # redundant server
 				*) typ='!!!';;
 			esac
-			echo "$ln" | sed "s:^.\\(.*\\):$typ $i	$SL\\1$EL:g"
-		#else
-			# Bad line
+			echo "$ln" | sed "s:^.\\([^\t]*\\).*:$typ $i	$SL\\1$EL:g"
 		fi
 	done
 }
@@ -90,9 +88,10 @@ getsel() {
 	cat "$1" | grep "^$PREFIX" | tail -n+"$2" | head -n 1 | cut -f"$3"
 }
 
+# Save page content to 'tmp' file
 tmp="`mktemp -t gofetch.current_page.XXXXXX`"
 finish() {
-  rm -rf "$tmp"
+  rm -rf "$tmp" "$tmp.jpg"
 }
 trap finish EXIT
 
@@ -102,6 +101,7 @@ else
 	echo "$SELECTOR" | nc "$SERVER" "$PORT" > "$tmp"
 fi
 
+# Process page content
 case "$MODE" in
 download)
 	# Special, fake mode, only from top-level
@@ -110,11 +110,12 @@ download)
 0)
 	cat "$tmp" | less
 ;;
-1)
+1|+)
 	CHOICE=start
 	while [ "$CHOICE" != "" ]; do
 		cat_menu "$tmp" | less
 		read -p "[$SELECTOR]: " CHOICE
+		[ "$CHOICE" = q ] && exit 255 # force-quit
 		index="`expr 1 \* "$CHOICE" 2>/dev/null`"
 		if [ "$index" != "" ]; then
 			goto_server="`getsel "$tmp" $index 3`"
@@ -122,6 +123,7 @@ download)
 			goto_port="`getsel "$tmp" $index 4`"
 			goto_mode="`getsel "$tmp" $index 1 | cut -c1`"
 			sh "$0" "$goto_server" "$goto_sel" "$goto_port" "$goto_mode"
+			[ $? = 255 ] && exit 255 # force-quit
 		fi
 	done
 ;;
@@ -138,8 +140,27 @@ download)
 9)
 	echo "<BINARY FILE>" | less
 ;;
+g|I)
+	if img2aa --help >/dev/null 2>&1; then
+		img2aa --mode=DITHERING \
+			--width=74 "$tmp" | less
+	elif jp2a -h >/dev/null 2>&1; then
+		if convert -h >/dev/null 2>&1; then
+			convert "$tmp" "$tmp.jpg"
+			jp2a --border --chars=" .-+=o8#"\
+				--width=74 "$tmp.jpg" | less
+		else
+			echo "required program not found to view images: convert" \
+				| less
+		fi
+	else
+		echo "required program not found to view images:" \
+			jp2a or img2aa | less
+	fi
+;;
 *)
 	echo "unknwon selector mode: <$MODE>" | less
 	exit 3
 ;;
 esac
+