nova/covergen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Compare commits

base: nova:ec3dbbaf3a73ccd300b105756d62b1971d4e7206
Branches Tags
nova:main nova:ci nova:feat/frontend nova:chore/minio
..
compare: nova:05ac24254c610384219bb5aab891af269ac50b64
Branches Tags
nova:main nova:ci nova:feat/frontend nova:chore/minio

4 Commits
ec3dbbaf3a ... 05ac24254c

Author SHA1 Message Date
Jur van den Berg
05ac24254c Generate that beautiful double page 2021-12-17 22:07:00 +01:00
Jur van den Berg
72a245610a Remove sha256 debug output 2021-12-17 21:47:20 +01:00
Jur van den Berg
7040909625 Add split-output to cli 2021-12-17 21:46:13 +01:00
Jur van den Berg
ec9426b59c Remove compiled wasm 2021-12-17 21:37:29 +01:00
6 changed files with 122 additions and 30 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
covergen covergen
!covergen/ !covergen/
*.pdf *.pdf
assets/*.wasm

BIN
assets/covergen.wasm
View File

Binary file not shown.

50
assets/index.html
View File

@@ -9,7 +9,7 @@
}); });
function makeCover(args) { function makeCover(args) {
const result = window.covergen(args); const result = window.generateCover(args);
if (result.error) { if (result.error) {
throw result.error; throw result.error;
} }
@@ -17,19 +17,44 @@
return new File([result], 'cover.pdf', {type: 'application/pdf'}); return new File([result], 'cover.pdf', {type: 'application/pdf'});
} }
function makeSplitCover(args) {
const result = window.generateSplitCover(args);
if (result.error) {
throw result.error;
}
return Object.fromEntries(['front', 'back'].map((side) => [side, new File([result[side]], `${side}.pdf`, {type: 'application/pdf'})]));
}
function letsfuckinggo() { function letsfuckinggo() {
document.getElementById('cover').src = window.URL.createObjectURL(makeCover({ const covers = makeSplitCover({
customer: document.getElementById('customer').value, customer: document.getElementById('customer').value,
number: document.getElementById('number').value, number: document.getElementById('number').value,
})); numberPrefix: document.getElementById('prefix').value,
hlColor: document.getElementById('color').value,
})
document.getElementById('front').src = window.URL.createObjectURL(covers.front);
document.getElementById('back').src = window.URL.createObjectURL(covers.back);
} }
</script> </script>
<style> <style>
html, body, #cover { html, body {
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
.covers {
height: 100%;
width: 90%;
display: flex;
flex-direction: row;
}
.covers iframe {
flex-grow: 1;
}
</style> </style>
</head> </head>
<body> <body>
@@ -39,15 +64,30 @@
<textarea id="customer"></textarea> <textarea id="customer"></textarea>
</label> </label>
</div> </div>
<div>
<label>
Prefix:
<input id="prefix" type="text" value="offerte">
</label>
</div>
<div> <div>
<label> <label>
Number: Number:
<input id="number" type="text"> <input id="number" type="text">
</label> </label>
</div> </div>
<div>
<label>
Color:
<input id="color" type="color" value="#FF69B4">
</label>
</div>
<div> <div>
<button onclick="letsfuckinggo()">Fuck it!</button> <button onclick="letsfuckinggo()">Fuck it!</button>
</div> </div>
<iframe id="cover"></iframe> <div class="covers">
<iframe id="front"></iframe>
<iframe id="back"></iframe>
</div>
</body> </body>
</html> </html>

27
cmd/covergen/main.go
View File

@@ -26,6 +26,7 @@ var customer = pflag.StringP("customer", "c", "", "Customer name for cover")
var numberPrefix = pflag.String("number-prefix", "offerte", "Prefix to use for number") var numberPrefix = pflag.String("number-prefix", "offerte", "Prefix to use for number")
var color = pflag.String("color", "random", "Selects a color to use for the grid highlight. Valid choices: ['random', 'red', 'blue', 'yellow', 'green']") var color = pflag.String("color", "random", "Selects a color to use for the grid highlight. Valid choices: ['random', 'red', 'blue', 'yellow', 'green']")
var output = pflag.StringP("output", "o", "cover.pdf", "File to output to") var output = pflag.StringP("output", "o", "cover.pdf", "File to output to")
var output2 = pflag.StringP("output-back", "b", "", "Output front and back separately")
func init() { func init() {
log.Logger = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}).With().Timestamp().Logger() log.Logger = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}).With().Timestamp().Logger()
@@ -69,13 +70,15 @@ func main() {
} }
*customer = strings.ReplaceAll(*customer, "\\n", "\n") *customer = strings.ReplaceAll(*customer, "\\n", "\n")
settings := covergen.CoverSettings{
pdf, err := covergen.GenerateInvoice(covergen.CoverSettings{
Number: *number, Number: *number,
NumberPrefix: *numberPrefix, NumberPrefix: *numberPrefix,
CustomerName: *customer, CustomerName: *customer,
HLColor: chosenColor, HLColor: chosenColor,
}) }
if *output2 == "" {
pdf, err := covergen.GenerateInvoice(settings)
if err != nil { if err != nil {
log.Fatal().Err(err).Msg("Failed to render invoice") log.Fatal().Err(err).Msg("Failed to render invoice")
@@ -84,4 +87,22 @@ func main() {
if err := pdf.OutputFileAndClose(*output); err != nil { if err := pdf.OutputFileAndClose(*output); err != nil {
log.Fatal().Err(err).Msg("Failed to write invoice to disk") log.Fatal().Err(err).Msg("Failed to write invoice to disk")
} }
} else {
front, err := covergen.GenerateFrontCover(settings)
if err != nil {
log.Fatal().Err(err).Msg("Failed to render front")
}
if err := front.OutputFileAndClose(*output); err != nil {
log.Fatal().Err(err).Msg("Failed to write front to disk")
}
back, err := covergen.GenerateBackCover(settings)
if err != nil {
log.Fatal().Err(err).Msg("Failed to render back")
}
if err := back.OutputFileAndClose(*output2); err != nil {
log.Fatal().Err(err).Msg("Failed to write back to disk")
}
}
} }

5
cmd/wasm/main.go
View File

@@ -2,8 +2,6 @@ package main
import ( import (
"bytes" "bytes"
"crypto/sha256"
"encoding/hex"
"errors" "errors"
"fmt" "fmt"
"syscall/js" "syscall/js"
@@ -104,9 +102,6 @@ func generateCover(this js.Value, args []js.Value) interface{} {
} }
s := buf.Bytes() s := buf.Bytes()
sum := sha256.Sum256(s)
fmt.Println("shasum", hex.EncodeToString(sum[:]))
ta := js.Global().Get("Uint8Array").New(len(s)) ta := js.Global().Get("Uint8Array").New(len(s))
js.CopyBytesToJS(ta, s) js.CopyBytesToJS(ta, s)
return ta return ta

59
pkg/covergen/render.go
View File

@@ -6,7 +6,6 @@ import (
"strings" "strings"
"github.com/go-pdf/fpdf" "github.com/go-pdf/fpdf"
"github.com/rs/zerolog/log"
) )
const margin = 20 const margin = 20
@@ -44,17 +43,58 @@ type CoverSettings struct {
} }
func GenerateInvoice(settings CoverSettings) (*fpdf.Fpdf, error) { func GenerateInvoice(settings CoverSettings) (*fpdf.Fpdf, error) {
pdf, err := GenerateFrontCover(settings)
if err != nil {
return nil, err
}
pdf.AddPage()
drawCustomerName(pdf, settings)
if pdf.Err() {
return nil, pdf.Error()
}
return pdf, nil
}
func GenerateFrontCover(settings CoverSettings) (*fpdf.Fpdf, error) {
pdf, err := generateBaseInvoice(settings)
if err != nil {
return nil, err
}
drawInvoiceNumber(pdf, settings)
drawMiwebbLink(pdf)
if pdf.Err() {
return nil, pdf.Error()
}
return pdf, nil
}
func GenerateBackCover(settings CoverSettings) (*fpdf.Fpdf, error) {
pdf, err := generateBaseInvoice(settings)
if err != nil {
return nil, err
}
return pdf, err
}
func generateBaseInvoice(settings CoverSettings) (*fpdf.Fpdf, error) {
pdf := fpdf.New("P", scaleUnit, "A4", "") pdf := fpdf.New("P", scaleUnit, "A4", "")
if err := addEmbeddedFont(pdf, "Mark Medium", "", "Mark-Medium"); err != nil { if err := addEmbeddedFont(pdf, "Mark Medium", "", "Mark-Medium"); err != nil {
log.Fatal().Err(err).Msg("Error adding font") return nil, fmt.Errorf("error adding font: %w", err)
} }
if err := addEmbeddedFont(pdf, "Mark Light", "", "Mark-Light"); err != nil { if err := addEmbeddedFont(pdf, "Mark Light", "", "Mark-Light"); err != nil {
log.Fatal().Err(err).Msg("Error adding font") return nil, fmt.Errorf("error adding font: %w", err)
} }
miwebbLogo, err := addEmbeddedLogo(pdf, miwebbLogoName, miwebbLogoPath) miwebbLogo, err := addEmbeddedLogo(pdf, miwebbLogoName, "miwebb.white.png")
if err != nil { if err != nil {
log.Fatal().Err(err).Msg("Error adding logo") return nil, fmt.Errorf("error adding logo: %w", err)
} }
pdf.SetMargins(margin, margin, margin) pdf.SetMargins(margin, margin, margin)
@@ -67,21 +107,16 @@ func GenerateInvoice(settings CoverSettings) (*fpdf.Fpdf, error) {
pdf.Image(miwebbLogoName, margin-5, margin, miwebbLogo.Width()*logoScale, miwebbLogo.Height()*logoScale, false, "", 0, "") pdf.Image(miwebbLogoName, margin-5, margin, miwebbLogo.Width()*logoScale, miwebbLogo.Height()*logoScale, false, "", 0, "")
}) })
pdf.AddPage()
drawCustomerName(pdf, settings)
drawInvoiceNumber(pdf, settings)
drawMiwebbLink(pdf)
pdf.AddPage() pdf.AddPage()
drawCustomerName(pdf, settings) drawCustomerName(pdf, settings)
if pdf.Err() { if pdf.Err() {
return nil, pdf.Error() return nil, fmt.Errorf("error generating invoice: %w", pdf.Error())
} }
return pdf, nil return pdf, nil
} }
func drawInvoiceNumber(pdf *fpdf.Fpdf, settings CoverSettings) { func drawInvoiceNumber(pdf *fpdf.Fpdf, settings CoverSettings) {
_, pageHeight := pdf.GetPageSize() _, pageHeight := pdf.GetPageSize()