forks
/
amfora
1
0
Fork 0
Code Releases Activity

Strip ANSI codes from page based on config - fixes #79 (#86)

This commit is contained in:
Jansen Price 2020-09-04 11:42:01 -05:00 committed by GitHub
parent 3e27338881
commit 7b27bd02dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.go
View File

@ -206,6 +206,7 @@ func Init() error {
viper.SetDefault("a-general.http", "default") viper.SetDefault("a-general.http", "default")
viper.SetDefault("a-general.search", "gus.guru/search") viper.SetDefault("a-general.search", "gus.guru/search")
viper.SetDefault("a-general.color", true) viper.SetDefault("a-general.color", true)
viper.SetDefault("a-general.ansi", true)
viper.SetDefault("a-general.bullets", true) viper.SetDefault("a-general.bullets", true)
viper.SetDefault("a-general.left_margin", 0.15) viper.SetDefault("a-general.left_margin", 0.15)
viper.SetDefault("a-general.max_width", 100) viper.SetDefault("a-general.max_width", 100)

3
config/default.go
View File

@ -33,6 +33,9 @@ search = "gemini://gus.guru/search"
# Whether colors will be used in the terminal # Whether colors will be used in the terminal
color = true color = true
# Whether ANSI codes from the page content should be rendered
ansi = true
# Whether to replace list asterisks with unicode bullets # Whether to replace list asterisks with unicode bullets
bullets = true bullets = true

3
default-config.toml
View File

@ -30,6 +30,9 @@ search = "gemini://gus.guru/search"
# Whether colors will be used in the terminal # Whether colors will be used in the terminal
color = true color = true
# Whether ANSI codes from the page content should be rendered
ansi = true
# Whether to replace list asterisks with unicode bullets # Whether to replace list asterisks with unicode bullets
bullets = true bullets = true

13
renderer/renderer.go
View File

@ -7,6 +7,7 @@ package renderer
import ( import (
"fmt" "fmt"
urlPkg "net/url" urlPkg "net/url"
"regexp"
"strconv" "strconv"
"strings" "strings"
@ -15,12 +16,17 @@ import (
"gitlab.com/tslocum/cview" "gitlab.com/tslocum/cview"
) )
// Regex for identifying ANSI color codes
var ansiRegex = regexp.MustCompile(`\x1b\[[0-9;]*m`)
// RenderANSI renders plain text pages containing ANSI codes. // RenderANSI renders plain text pages containing ANSI codes.
// Practically, it is used for the text/x-ansi. // Practically, it is used for the text/x-ansi.
func RenderANSI(s string, leftMargin int) string { func RenderANSI(s string, leftMargin int) string {
s = cview.Escape(s) s = cview.Escape(s)
if viper.GetBool("a-general.color") { if viper.GetBool("a-general.color") && viper.GetBool("a-general.ansi") {
s = cview.TranslateANSI(s) s = cview.TranslateANSI(s)
} else {
s = ansiRegex.ReplaceAllString(s, "")
} }
var shifted string var shifted string
lines := strings.Split(s, "\n") lines := strings.Split(s, "\n")
@ -277,9 +283,12 @@ func convertRegularGemini(s string, numLinks, width int, proxied bool) (string,
// If it's not a gemini:// page, set this to true. // If it's not a gemini:// page, set this to true.
func RenderGemini(s string, width, leftMargin int, proxied bool) (string, []string) { func RenderGemini(s string, width, leftMargin int, proxied bool) (string, []string) {
s = cview.Escape(s) s = cview.Escape(s)
if viper.GetBool("a-general.color") { if viper.GetBool("a-general.color") && viper.GetBool("a-general.ansi") {
s = cview.TranslateANSI(s) s = cview.TranslateANSI(s)
} else {
s = ansiRegex.ReplaceAllString(s, "")
} }
lines := strings.Split(s, "\n") lines := strings.Split(s, "\n")
links := make([]string, 0) links := make([]string, 0)