Skip to content

Commit cf5f9fa

Browse files
authoredDec 29, 2017
Merge pull request skip2#15 from chris-rock/chris-rock/text-as-lib
moves cli output generator to lib
2 parents 6eeeae4 + 0a5d819 commit cf5f9fa

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed
 

‎qrcode.go

+17
Original file line numberDiff line numberDiff line change
@@ -535,3 +535,20 @@ func (q *QRCode) addPadding() {
535535
log.Panicf("BUG: got len %d, expected %d", q.data.Len(), numDataBits)
536536
}
537537
}
538+
539+
// ToString produces a multi-line string that forms a QR-code image.
540+
func (q *QRCode) ToString(inverseColor bool) string {
541+
bits := q.Bitmap()
542+
var buf bytes.Buffer
543+
for y := range bits {
544+
for x := range bits[y] {
545+
if bits[y][x] != inverseColor {
546+
buf.WriteString(" ")
547+
} else {
548+
buf.WriteString("██")
549+
}
550+
}
551+
buf.WriteString("\n")
552+
}
553+
return buf.String()
554+
}

‎qrcode/main.go

+1-19
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package main
55

66
import (
7-
"bytes"
87
"flag"
98
"fmt"
109
"os"
@@ -54,7 +53,7 @@ Usage:
5453
checkError(err)
5554

5655
if *textArt {
57-
art := qr2String(q, *negative)
56+
art := q.ToString(*negative)
5857
fmt.Println(art)
5958
return
6059
}
@@ -84,20 +83,3 @@ func checkError(err error) {
8483
os.Exit(1)
8584
}
8685
}
87-
88-
// qr2String produces a multi-line string that forms a QR-code image.
89-
func qr2String(qr *qrcode.QRCode, inverseColor bool) string {
90-
bits := qr.Bitmap()
91-
var buf bytes.Buffer
92-
for y := range bits {
93-
for x := range bits[y] {
94-
if bits[y][x] != inverseColor {
95-
buf.WriteString(" ")
96-
} else {
97-
buf.WriteString("██")
98-
}
99-
}
100-
buf.WriteString("\n")
101-
}
102-
return buf.String()
103-
}

0 commit comments

Comments
 (0)