Fix: Default characters in config - Fixes #33

Author: mdp

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.23'
 
       - name: Build
         run: go build -v ./...

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.2.1
+
+- Fix #33 - Default config to standard characters if not specified.
+
 ## 3.2.0
 
 - Update to add sixel support #29

go.mod

@@ -3,12 +3,12 @@ module github.com/mdp/qrterminal/v3
 go 1.20
 
 require (
-	github.com/mattn/go-colorable v0.1.13
+	github.com/mattn/go-colorable v0.1.14
 	rsc.io/qr v0.2.0
 )
 
 require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/term v0.13.0
 )

go.sum

@@ -1,12 +1,10 @@
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY=

qrterminal.go

@@ -211,14 +211,27 @@ func GenerateWithConfig(text string, config Config) {
 	}
 	w := config.Writer
 	code, _ := qr.Encode(text, config.Level)
+
+	// Set default values for characters if not provided
+	if config.BlackChar == "" {
+		config.BlackChar = BLACK_BLACK
+	}
+	if config.WhiteBlackChar == "" {
+		config.WhiteBlackChar = WHITE_BLACK
+	}
+	if config.WhiteChar == "" {
+		config.WhiteChar = WHITE_WHITE
+	}
+	if config.BlackWhiteChar == "" {
+		config.BlackWhiteChar = BLACK_WHITE
+	}
+
 	if config.HalfBlocks {
 		config.writeHalfBlocks(w, code)
+	} else if config.WithSixel {
+		config.writeSixel(w, code)
 	} else {
-		if config.WithSixel {
-			config.writeSixel(w, code)
-		} else {
-			config.writeFullBlocks(w, code)
-		}
+		config.writeFullBlocks(w, code)
 	}
 }