Merge pull request #14 from AbeEstrada/sixel

Add sixel encoder option

Author: mrusme

README.md

@@ -42,6 +42,14 @@ Read from stdin:
 curl -o - https://superhighway84.com | reader -
 ```
 
+Render images using the SIXEL graphics encoder:
+
+```sh
+reader -s https://xn--gckvb8fzb.com/travel-aruba/
+```
+
+![sixel](sixel.png)
+
 More options:
 
 ```sh

cmd/root.go

@@ -1,14 +1,22 @@
 package cmd
 
 import (
+	"bytes"
 	"fmt"
+	"image"
 	"image/color"
+	"net/http"
 	"os"
 	"regexp"
 	"strconv"
 
+	_ "image/gif"
+	_ "image/jpeg"
+	_ "image/png"
+
 	"github.com/charmbracelet/glamour"
 	"github.com/eliukblau/pixterm/pkg/ansimage"
+	"github.com/mattn/go-sixel"
 
 	md "github.com/JohannesKaufmann/html-to-markdown"
 	"github.com/spf13/cobra"
@@ -21,6 +29,7 @@ import (
 var verbose bool
 var noImages bool
 var noPretty bool
+var sixelEncoder bool
 
 type InlineImage struct {
 	URL   string
@@ -113,6 +122,30 @@ func RenderMarkdown(title, markdown string, images []InlineImage) (string, error
 				imgTitle := images[imgIndex].Title
 				imgURL := images[imgIndex].URL
 
+				if sixelEncoder == true {
+					res, err := http.Get(imgURL)
+					if err != nil {
+						return md
+					}
+
+					defer res.Body.Close()
+
+					im, _, err := image.Decode(res.Body)
+					if err != nil {
+						return md
+					}
+
+					var b bytes.Buffer
+					enc := sixel.NewEncoder(&b)
+					enc.Dither = true
+					err = enc.Encode(im)
+					if err != nil {
+						return md
+					}
+
+					return fmt.Sprintf("\n%s\n  %s", string(b.Bytes()), imgTitle)
+				}
+
 				pix, err := ansimage.NewScaledFromURL(
 					imgURL,
 					int((float64(width) * 0.75)),
@@ -181,11 +214,11 @@ var rootCmd = &cobra.Command{
 
 func Execute() {
 	rootCmd.Flags().BoolVarP(
-		&noImages,
-		"no-images",
-		"i",
+		&sixelEncoder,
+		"sixel-encoder",
+		"s",
 		false,
-		"disable image rendering",
+		"use sixel graphics encoder",
 	)
 	rootCmd.Flags().BoolVarP(
 		&noPretty,
@@ -194,6 +227,13 @@ func Execute() {
 		false,
 		"disable pretty output, output raw markdown instead",
 	)
+	rootCmd.Flags().BoolVarP(
+		&noImages,
+		"no-images",
+		"i",
+		false,
+		"disable image rendering",
+	)
 	rootCmd.Flags().BoolVarP(
 		&verbose,
 		"verbose",

go.mod

@@ -59,6 +59,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mattn/go-sixel v0.0.5 // indirect
 	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/memclutter/go-cloudflare-scraper v0.0.0-20220907170638-a1faa8b189bd // indirect
 	github.com/microcosm-cc/bluemonday v1.0.25 // indirect
@@ -77,6 +78,7 @@ require (
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/robertkrimen/otto v0.2.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/soniakeys/quant v1.0.0 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect

go.sum

@@ -483,6 +483,8 @@ github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRC
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-sixel v0.0.5 h1:55w2FR5ncuhKhXrM5ly1eiqMQfZsnAHIpYNGZX03Cv8=
+github.com/mattn/go-sixel v0.0.5/go.mod h1:h2Sss+DiUEHy0pUqcIB6PFXo5Cy8sTQEFr3a9/5ZLNw=
 github.com/mattn/go-slim v0.0.0-20200618151855-bde33eecb5ee/go.mod h1:ma9TUJeni8LGZMJvOwbAv/FOwiwqIMQN570LnpqCBSM=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
@@ -623,6 +625,8 @@ github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYl
 github.com/smartystreets/assertions v1.2.1/go.mod h1:wDmR7qL282YbGsPy6H/yAsesrxfxaaSlJazyFLYVFx8=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
+github.com/soniakeys/quant v1.0.0 h1:N1um9ktjbkZVcywBVAAYpZYSHxEfJGzshHCxx/DaI0Y=
+github.com/soniakeys/quant v1.0.0/go.mod h1:HI1k023QuVbD4H8i9YdfZP2munIHU4QpjsImz6Y6zds=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=