From 05d1f60c14c6b0a6fbb84bb025036757c671feb0 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 17 Jul 2022 09:16:53 +0200 Subject: [PATCH] make format=txt display the textual QR code contents This allows for easy comparison with QR codes extracted from PDFs: pdfimages -png invoice.pdf invoice && \ zbarimg --raw invoice*.png > code.txt --- cmd/qrbill-api/api.go | 3 +-- cmd/qrbill-api/api_gokrazy.go | 1 + qrbill.go | 4 ++++ third_party/goembed/goembed.go | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/qrbill-api/api.go b/cmd/qrbill-api/api.go index d31a183..44a28ca 100644 --- a/cmd/qrbill-api/api.go +++ b/cmd/qrbill-api/api.go @@ -27,7 +27,6 @@ import ( "os" "strings" - "github.com/davecgh/go-spew/spew" "github.com/mattn/go-isatty" "github.com/stapelberg/qrbill" @@ -184,7 +183,7 @@ func logic() error { case "txt": w.Header().Add("Content-Type", "text/plain; charset=utf-8") - spew.Fdump(w, qrch.Validate()) + fmt.Fprintf(w, "%s", bill.EncodeToString()) case "html": debugHTML(w, r, prefix, qrch) diff --git a/cmd/qrbill-api/api_gokrazy.go b/cmd/qrbill-api/api_gokrazy.go index 710338a..ec3ad33 100644 --- a/cmd/qrbill-api/api_gokrazy.go +++ b/cmd/qrbill-api/api_gokrazy.go @@ -1,3 +1,4 @@ +//go:build gokrazy // +build gokrazy // Copyright 2020 Google LLC diff --git a/qrbill.go b/qrbill.go index bd73fd5..e393a19 100644 --- a/qrbill.go +++ b/qrbill.go @@ -263,6 +263,10 @@ type Bill struct { qrcontents string } +func (b *Bill) EncodeToString() string { + return b.qrcontents +} + func (b *Bill) EncodeToSVG() ([]byte, error) { var err error code, err := encoder.Encoder_encode(b.qrcontents, decoder.ErrorCorrectionLevel_M, qrEncodeHints()) diff --git a/third_party/goembed/goembed.go b/third_party/goembed/goembed.go index d6705f2..8e29713 100644 --- a/third_party/goembed/goembed.go +++ b/third_party/goembed/goembed.go @@ -1,5 +1,6 @@ // copied from https://github.com/dsymonds/goembed/ with pull requests applied +//go:build ignore // +build ignore // goembed - Embed data in Go source code