fix rendering issues

Add arm64 build actions for darwin/macOS and linux.

.github/workflows/release.yml

@@ -9,10 +9,14 @@ jobs:
     strategy:
       matrix:
         goos: [linux, darwin, windows]
+        goarch: [amd64, arm64]
+        exclude:
+            - goarch: arm64
+              goos: windows
     steps:
     - uses: actions/checkout@v3
-    - uses: wangyoucao577/go-release-action@v1.30
+    - uses: wangyoucao577/go-release-action@v1.40
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         goos: ${{ matrix.goos }}
-        goarch: amd64
+        goarch: ${{ matrix.goarch }}

.gitignore

@@ -0,0 +1,13 @@
+.DS_Store
+links.txt
+links/2018.txt
+links/2019.txt
+links/2020.txt
+links/2021.txt
+links/2022.txt
+links/2023.txt
+links/2024.txt
+links/2025.txt
+papeer
+all-years.py
+all.py

README.md

@@ -40,7 +40,9 @@ Download [latest release](https://github.com/lapwat/papeer/releases/latest) for
 
 ## MOBI support
 
-Install kindlegen to convert websites, Linux only.
+> Kindle e-readers now support EPUB format
+
+Install kindlegen to export websites to Kindle compatible ebooks, Linux only.
 
 ```sh
 TMPDIR=$(mktemp -d -t papeer-XXXXX)

book/chapter.go

@@ -1,6 +1,7 @@
 package book
 
 type chapter struct {
+	url         string
 	body        string
 	name        string
 	author      string
@@ -10,11 +11,11 @@ type chapter struct {
 }
 
 func NewEmptyChapter() chapter {
-	return chapter{"", "", "", "", []chapter{}, NewScrapeConfigNoInclude()}
+	return chapter{"", "", "", "", "", []chapter{}, NewScrapeConfigNoInclude()}
 }
 
-func NewChapter(body, name, author, content string, subChapters []chapter, config *ScrapeConfig) chapter {
-	return chapter{body, name, author, content, subChapters, config}
+func (c chapter) URL() string {
+	return c.url
 }
 
 func (c chapter) Body() string {

book/format.go

@@ -2,6 +2,7 @@ package book
 
 import (
 	"fmt"
+	"html"
 	"log"
 	"os"
 	"os/exec"
@@ -10,6 +11,7 @@ import (
 	md "github.com/JohannesKaufmann/html-to-markdown"
 	"github.com/PuerkitoBio/goquery"
 	epub "github.com/bmaupin/go-epub"
+	"github.com/microcosm-cc/bluemonday"
 )
 
 func Filename(name string) string {
@@ -30,6 +32,11 @@ func ToMarkdownString(c chapter) string {
 		markdown += fmt.Sprintf("%s\n", c.Name())
 		markdown += fmt.Sprintf("%s\n\n", strings.Repeat("=", len(c.Name())))
 
+		// url
+		if c.config.PrintURL {
+			markdown += fmt.Sprintf("_%s_\n\n", c.URL())
+		}
+
 		// convert content to markdown
 		content, err := md.NewConverter("", true, nil).ConvertString(c.Content())
 		if err != nil {
@@ -56,7 +63,7 @@ func ToMarkdown(c chapter, filename string) string {
 	// write to file
 	f, err := os.Create(filename)
 	if err != nil {
-		log.Fatal(err)
+			log.Fatal(err)
 	}
 	_, err2 := f.WriteString(markdown)
 	if err2 != nil {
@@ -68,20 +75,28 @@ func ToMarkdown(c chapter, filename string) string {
 }
 
 func ToHtmlString(c chapter) string {
-	html := ""
+	htmlContent := ""
 
 	// chapter content
 	if c.config.Include {
-		html += fmt.Sprintf("<h1>%s</h1>", c.Name())
-		html += c.Content()
+		// title
+		htmlContent += fmt.Sprintf("<h1>%s</h1>\n", html.EscapeString(c.Name()))
+
+		// url
+		if c.config.PrintURL {
+			htmlContent += fmt.Sprintf("<p><i>%s</i></p>\n", html.EscapeString(c.URL()))
+		}
+
+		// content
+		htmlContent += c.Content()
 	}
 
 	// subchapters content
 	for _, sc := range c.SubChapters() {
-		html += ToHtmlString(sc)
+		htmlContent += ToHtmlString(sc)
 	}
 
-	return html
+	return htmlContent
 }
 
 func ToHtml(c chapter, filename string) string {
@@ -112,7 +127,27 @@ func ToEpub(c chapter, filename string) string {
 
 	// init ebook
 	e := epub.NewEpub(c.Name())
-	e.SetAuthor(c.Author())
+	author := c.Author()
+	if author == "" {
+		author = "Unknown Author"
+	}
+	e.SetAuthor(author)
+
+	// append table of content
+	if len(c.SubChapters()) > 1 {
+		html := "<h1>Table of Contents</h1>"
+
+		html += "<ol>"
+		for _, sc := range c.SubChapters() {
+			html += fmt.Sprintf("<li>%s</li>", sc.Name())
+		}
+		html += "</ol>"
+
+		_, err := e.AddSection(html, "Table of Contents", "", "")
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
 
 	AppendToEpub(e, c)
 
@@ -126,16 +161,18 @@ func ToEpub(c chapter, filename string) string {
 
 func AppendToEpub(e *epub.Epub, c chapter) {
 	content := ""
+	p := bluemonday.UGCPolicy()
+	safeHTML := p.Sanitize(c.Content())
 
 	// chapter content
 	if c.config.Include {
 
 		if c.config.ImagesOnly == false {
-			content = c.Content()
+			content = safeHTML
 		}
 
 		// parse content
-		doc, err := goquery.NewDocumentFromReader(strings.NewReader(c.Content()))
+		doc, err := goquery.NewDocumentFromReader(strings.NewReader(safeHTML))
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -146,23 +183,34 @@ func AppendToEpub(e *epub.Epub, c chapter) {
 			src = strings.Split(src, "?")[0] // remove query part
 			imagePath, _ := e.AddImage(src, "")
 
+			// Remove or fix invalid width/height attributes
+			s.RemoveAttr("width")
+			s.RemoveAttr("height")
+
 			if c.config.ImagesOnly {
 				imageTag, _ := goquery.OuterHtml(s)
-				content += strings.Replace(imageTag, src, imagePath, 1)
+				content += strings.ReplaceAll(imageTag, src, imagePath)
 			} else {
-				content = strings.Replace(content, src, imagePath, 1)
+				content = strings.ReplaceAll(content, src, imagePath)
 			}
 		})
 
-		html := ""
+		htmlContent := ""
 		// add title only if ImagesOnly = false
 		if c.config.ImagesOnly == false {
-			html += fmt.Sprintf("<h1>%s</h1>", c.Name())
+			htmlContent += fmt.Sprintf("<h1>%s</h1>\n", html.EscapeString(c.Name()))
 		}
-		html += content
+
+		// url
+		if c.config.PrintURL {
+			htmlContent += fmt.Sprintf("<p><i>%s</i></p>\n", html.EscapeString(c.URL()))
+		}
+
+		// content
+		htmlContent += content
 
 		//  write to epub file
-		_, err = e.AddSection(html, c.Name(), "", "")
+		_, err = e.AddSection(htmlContent, c.Name(), "", "")
 		if err != nil {
 			log.Fatal(err)
 		}

book/link.go

@@ -1,10 +1,13 @@
 package book
 
+import "time"
+
 type link struct {
-	Href string `json:"url"`
-	Text string `json:"name"`
+	Href string     `json:"url"`
+	Text string     `json:"name"`
+	Date *time.Time `json:"date"`
 }
 
-func NewLink(href, text string) link {
-	return link{href, text}
+func NewLink(href, text string, date *time.Time) link {
+	return link{href, text, date}
 }

book/scraper.go

@@ -30,14 +30,19 @@ type ScrapeConfig struct {
 	Include     bool
 	ImagesOnly  bool
 	UseLinkName bool
+	PrintURL    bool
 }
 
 func NewScrapeConfig() *ScrapeConfig {
-	return &ScrapeConfig{0, "", false, -1, 0, false, -1, -1, true, false, false}
+	return &ScrapeConfig{0, "", false, -1, 0, false, -1, -1, true, false, false, false}
+}
+
+func NewScrapeConfigQuiet() *ScrapeConfig {
+	return &ScrapeConfig{0, "", true, -1, 0, false, -1, -1, true, false, false, false}
 }
 
 func NewScrapeConfigNoInclude() *ScrapeConfig {
-	return &ScrapeConfig{0, "", false, -1, 0, false, -1, -1, false, false, false}
+	return &ScrapeConfig{0, "", false, -1, 0, false, -1, -1, false, false, false, false}
 }
 
 func NewScrapeConfigs(selectors []string) []*ScrapeConfig {
@@ -237,7 +242,6 @@ func NewChapterFromURL(url, linkName string, configs []*ScrapeConfig, index int,
 			content = ""
 			doc.Find("img").Each(func(i int, s *goquery.Selection) {
 				imageTag, _ := goquery.OuterHtml(s)
-				// imageTag = strings.ReplaceAll(imageTag, "\n", "")
 				content += imageTag
 			})
 
@@ -252,7 +256,7 @@ func NewChapterFromURL(url, linkName string, configs []*ScrapeConfig, index int,
 
 	}
 
-	return chapter{string(body), name, article.Byline, content, subchapters, config}
+	return chapter{url, string(body), name, article.Byline, content, subchapters, config}
 }
 
 func tableOfContent(url string, config *ScrapeConfig, subConfig *ScrapeConfig, quiet bool) ([]chapter, chapter) {
@@ -370,7 +374,7 @@ func GetLinks(url *urllib.URL, selector string, limit, offset int, reverse, incl
 				log.Fatal(err)
 			}
 
-			links = append(links, NewLink(u.String(), item.Title))
+			links = append(links, NewLink(u.String(), item.Title, item.PublishedParsed))
 		}
 
 		pathMax = "RSS"
@@ -405,7 +409,7 @@ func GetLinks(url *urllib.URL, selector string, limit, offset int, reverse, incl
 				// if selector is set, we use the selector specified by the user
 
 				key = selector
-				pathLinks[key] = append(pathLinks[key], NewLink(href, text))
+				pathLinks[key] = append(pathLinks[key], NewLink(href, text, &time.Time{}))
 				pathCount[key] += 1
 				pathMax = key
 
@@ -419,7 +423,7 @@ func GetLinks(url *urllib.URL, selector string, limit, offset int, reverse, incl
 
 				// we count this key if the link text is not empty
 				if text != "" {
-					pathLinks[key] = append(pathLinks[key], NewLink(href, text))
+					pathLinks[key] = append(pathLinks[key], NewLink(href, text, &time.Time{}))
 					pathCount[key] += len(text)
 
 					if pathCount[key] > pathCount[pathMax] {
@@ -449,7 +453,7 @@ func GetLinks(url *urllib.URL, selector string, limit, offset int, reverse, incl
 
 	// include home page
 	if include {
-		l := NewLink(url.String(), home.Name())
+		l := NewLink(url.String(), home.Name(), &time.Time{})
 		links = append([]link{l}, links...)
 	}
 

cmd/get.go

@@ -1,10 +1,12 @@
 package cmd
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io/ioutil"
 	"log"
+	"os"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -32,6 +34,7 @@ type GetOptions struct {
 	threads     int
 	include     bool
 	useLinkName bool
+	printURL    bool
 }
 
 var getOpts *GetOptions
@@ -41,10 +44,11 @@ func init() {
 
 	getCmd.Flags().StringVarP(&getOpts.name, "name", "n", "", "book name (default: page title)")
 	getCmd.Flags().StringVarP(&getOpts.author, "author", "a", "", "book author")
-	getCmd.Flags().StringVarP(&getOpts.Format, "format", "f", "md", "file format [md, html, epub, mobi]")
+	getCmd.Flags().StringVarP(&getOpts.Format, "format", "f", "md", "file format [md, json, html, epub, mobi]")
 	getCmd.Flags().StringVarP(&getOpts.output, "output", "", "", "file name (default: book name)")
 	getCmd.Flags().BoolVarP(&getOpts.stdout, "stdout", "", false, "print to standard output")
 	getCmd.Flags().BoolVarP(&getOpts.images, "images", "", false, "retrieve images only")
+	getCmd.Flags().BoolVarP(&getOpts.printURL, "print-url", "", false, "print url after chapter title")
 	getCmd.Flags().BoolVarP(&getOpts.quiet, "quiet", "q", false, "hide progress bar")
 
 	// common with list command
@@ -73,6 +77,7 @@ var getCmd = &cobra.Command{
 		// check provided format is in list
 		formatEnum := map[string]bool{
 			"md":   true,
+			"json": true,
 			"html": true,
 			"epub": true,
 			"mobi": true,
@@ -145,6 +150,7 @@ var getCmd = &cobra.Command{
 			config.ImagesOnly = getOpts.images
 			config.Include = getOpts.include
 			config.UseLinkName = getOpts.useLinkName
+			config.PrintURL = getOpts.printURL
 
 			// do not use link name for root level as there is not parent link
 			if index == 0 {
@@ -175,6 +181,7 @@ var getCmd = &cobra.Command{
 				if err != nil {
 					log.Fatal(err)
 				}
+				os.Remove(filename)
 
 				fmt.Println(string(bytesRead))
 			} else {
@@ -182,6 +189,27 @@ var getCmd = &cobra.Command{
 			}
 		}
 
+		if getOpts.Format == "json" {
+			filename := book.ToMarkdown(c, getOpts.output)
+
+			bytesRead, err := ioutil.ReadFile(filename)
+			if err != nil {
+				log.Fatal(err)
+			}
+			os.Remove(filename)
+
+			book := make(map[string]interface{})
+			book["name"] = c.Name()
+			book["content"] = string(bytesRead)
+
+			bookJson, err := json.Marshal(book)
+			if err != nil {
+				log.Fatal(err)
+			}
+
+			fmt.Println(string(bookJson))
+		}
+
 		if getOpts.Format == "html" {
 			filename := book.ToHtml(c, getOpts.output)
 
@@ -190,6 +218,7 @@ var getCmd = &cobra.Command{
 				if err != nil {
 					log.Fatal(err)
 				}
+				os.Remove(filename)
 
 				fmt.Println(string(bytesRead))
 			} else {
@@ -205,6 +234,7 @@ var getCmd = &cobra.Command{
 				if err != nil {
 					log.Fatal(err)
 				}
+				os.Remove(filename)
 
 				fmt.Println(string(bytesRead))
 			} else {
@@ -220,6 +250,7 @@ var getCmd = &cobra.Command{
 				if err != nil {
 					log.Fatal(err)
 				}
+				os.Remove(filename)
 
 				fmt.Println(string(bytesRead))
 			} else {

cmd/version.go

@@ -14,6 +14,6 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print the version number of papeer",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("papeer v0.7.0")
+		fmt.Println("papeer v0.8.5")
 	},
 }

go.mod

@@ -24,6 +24,7 @@ require (
 	github.com/antchfx/htmlquery v1.3.0 // indirect
 	github.com/antchfx/xmlquery v1.3.15 // indirect
 	github.com/antchfx/xpath v1.2.4 // indirect
+	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.1 // indirect
 	github.com/go-shiori/dom v0.0.0-20210627111528-4e4722cd0d65 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
@@ -31,11 +32,13 @@ require (
 	github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/gorilla/css v1.0.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kennygrant/sanitize v1.2.4 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
 	github.com/mmcdole/goxpp v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -45,9 +48,9 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/temoto/robotstxt v1.1.2 // indirect
 	github.com/vincent-petithory/dataurl v1.0.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 )

go.sum

@@ -25,6 +25,8 @@ github.com/antchfx/xpath v1.2.3/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwq
 github.com/antchfx/xpath v1.2.4 h1:dW1HB/JxKvGtJ9WyVGJ0sIoEcqftV3SqIstujI+B9XY=
 github.com/antchfx/xpath v1.2.4/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/bmaupin/go-epub v1.0.1 h1:LLbczYCXO/1sGpFd4/QRaDiEhevo4PYQxBQClZPRoco=
@@ -105,6 +107,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
+github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gosuri/uilive v0.0.4 h1:hUEBpQDj8D8jXgtCdBu7sWsy5sbW/5GhuO8KBwJ2jyY=
 github.com/gosuri/uilive v0.0.4/go.mod h1:V/epo5LjjlDE5RJUcqx8dbw+zc93y5Ya3yg8tfZ74VI=
@@ -141,6 +145,8 @@ github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
+github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mmcdole/gofeed v1.2.1 h1:tPbFN+mfOLcM1kDF1x2c/N68ChbdBatkppdzf/vDe1s=
@@ -273,6 +279,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -303,6 +311,8 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
@@ -319,6 +329,8 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=