X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=gopher.sh;h=e433ac0a620c093acc9b39a423efaf437c669803;hb=538b88d61a557a1fb5cb3da452c19241805850bd;hp=0042756538be4be9758e701ce79fe04c462b2b0a;hpb=c6852b70b860baecf8efa526631f6ec42f0a693e;p=gofetch.git

diff --git a/gopher.sh b/gopher.sh
index 0042756..e433ac0 100755
--- a/gopher.sh
+++ b/gopher.sh
@@ -1,6 +1,17 @@
 #!/bin/sh
 
+# $0 [server] ([selector]) ([port]) ([mode])
+# 	server: the gopher server to dig to
+#	selector: the gopher selector (default is empty)
+#	port: the port to use (default is 70)
+#	mode: the filetype mode (default depends upon selector)
+#		0: plain text
+#		1: menu (dir-like)
+#		...
+#		download: fake mode to download the result without changes
+
 # ENV variables:
+#	LESS: will be used with 'less' (think: "export LESS=-r")
 #	LINK_COLOR: escape sequences colour (def: 2)
 #		- : means no escape sequence
 #		1 : means colour 1
@@ -36,23 +47,29 @@ if [ "$LINK_COLOR" != "-" ]; then
 	EL="`tput init`";
 fi
 
+PREFIX="[0-9h]"
+
 # $0 [FILE]
 # Display a gopher menu for the given resource
 cat_menu() {
 	i=0
-	cat "$1" | grep '^[i0-9]' | while read ln; do
+	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"
-		elif echo "$ln" | grep "^[0-9]" >/dev/null 2>&1; then
+		elif echo "$ln" | grep "^$PREFIX" >/dev/null 2>&1; then
 			i=`expr $i + 1`
 			i=`printf %2.f $i`
 			field="`echo "$ln" | cut -c1`"
 			case "$field" in
 				0) typ='TXT';;
-				1) typ='DIR';;
-				7) typ='(?)';;
-				8) typ='TEL';;
+				1) typ='DIR';; # menu, actually
+				7) typ='(?)';; # query
+				8) typ='TEL';; # TELnet (not TELephone)
+				h) typ='WEB';; # HTML
+				g) typ='GIF';;
+				I) typ='IMG';;
+				+) typ='SVR';; # redundant server
 				*) typ='!!!';;
 			esac
 			echo "$ln" | sed "s:^.\\(.*\\):$typ $i	$SL\\1$EL:g"
@@ -71,12 +88,13 @@ cat_menu() {
 # 	3 = server
 # 	4 = port
 getsel() {
-	cat "$1" | grep '^[0-9]' | tail -n+"$2" | head -n 1 | cut -f"$3"
+	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
 
@@ -86,7 +104,12 @@ else
 	echo "$SELECTOR" | nc "$SERVER" "$PORT" > "$tmp"
 fi
 
+# Process page content
 case "$MODE" in
+download)
+	# Special, fake mode, only from top-level
+	cat "$tmp"
+;;
 0)
 	cat "$tmp" | less
 ;;
@@ -118,6 +141,24 @@ case "$MODE" in
 9)
 	echo "<BINARY FILE>" | less
 ;;
+g|I)
+	if convert -h >/dev/null 2>&1; then
+		if ImageUtils.sh --help >/dev/null 2>&1; then
+			ImageUtils.sh --mode=DITHERING \
+				--width=74 "$tmp" | less
+		elif jp2a -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:" \
+				jp2a or ImageUtils.sh | less
+		fi
+	else
+		echo "required program not found to view images: convert" \
+			| less
+	fi
+;;
 *)
 	echo "unknwon selector mode: <$MODE>" | less
 	exit 3