Bugfix: Umlaute falsch in den PDFs
This commit is contained in:
1 parent
66659d9a23
commit
b3afa3ef32
3 files changed
+175
-27
No files matched your search
@@ -2,6 +2,8 @@ package pdf
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"compress/zlib"
|
||||
"io"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -33,6 +35,138 @@ func sampleRows() (domain.DayRange, []domain.DayPlanRow, []domain.Church, []doma
|
||||
return r, []domain.DayPlanRow{row}, []domain.Church{church}, []domain.Person{person}
|
||||
}
|
||||
|
||||
func umlautRows() (domain.DayRange, []domain.DayPlanRow, []domain.Church, []domain.Person) {
|
||||
location := "Mariä-Himmelfahrt-Kapelle"
|
||||
church := domain.Church{ID: "c1", Name: "St. Mariä Himmelfahrt", ShortName: "Mariä",
|
||||
Symbol: domain.SymbolBasilica, ColorHex: "#9B5B44", Address: "Andreasstraße 1", SortIndex: 0}
|
||||
person := domain.Person{ID: "p1", FirstName: "Jürgen", LastName: "Müller",
|
||||
Roles: []domain.Role{domain.RoleLector}, Active: true}
|
||||
service := domain.ServiceOccurrence{
|
||||
ID: "s1", ChurchID: "c1", Date: domain.MustDate("2026-11-15"),
|
||||
TimeMinutes: 9*60 + 30, Title: "Hochamt für die Gemeinde", Location: &location,
|
||||
LectorsNeeded: 1, HelpersNeeded: 1, Kind: domain.KindRegular, CreatedAt: time.Now(),
|
||||
}
|
||||
assignment := domain.Assignment{ID: "a1", ServiceID: "s1", PersonID: "p1", Role: domain.RoleLector}
|
||||
liturgy := domain.LiturgicalDay{
|
||||
Date: domain.MustDate("2026-11-15"), Title: "Hochfest Mariä Himmelfahrt",
|
||||
Rank: domain.RankSolemnity, Color: domain.ColorWhite,
|
||||
Readings: domain.Readings{First: "Jes 61, 9a.10b", Gospel: "Lk 1, 39-56"},
|
||||
IsObligation: true, Source: "test",
|
||||
}
|
||||
row := domain.DayPlanRow{
|
||||
Date: domain.MustDate("2026-11-15"), LiturgicalDay: &liturgy,
|
||||
Services: []domain.ServiceWithAssignments{{Service: service, Church: church, Assignments: []domain.Assignment{assignment}}},
|
||||
}
|
||||
r := domain.NewDayRange(domain.MustDate("2026-11-15"), domain.MustDate("2026-11-15"))
|
||||
return r, []domain.DayPlanRow{row}, []domain.Church{church}, []domain.Person{person}
|
||||
}
|
||||
|
||||
// pdfContentStreams returns the decoded page content streams of a PDF. Text
|
||||
// written with core fonts is stored there as single-byte cp1252 strings.
|
||||
func pdfContentStreams(t *testing.T, data []byte) []byte {
|
||||
t.Helper()
|
||||
var out bytes.Buffer
|
||||
for {
|
||||
open := bytes.Index(data, []byte("stream"))
|
||||
if open < 0 {
|
||||
break
|
||||
}
|
||||
start := open + len("stream")
|
||||
if start < len(data) && data[start] == '\r' {
|
||||
start++
|
||||
}
|
||||
if start < len(data) && data[start] == '\n' {
|
||||
start++
|
||||
}
|
||||
end := bytes.Index(data[start:], []byte("endstream"))
|
||||
if end < 0 {
|
||||
break
|
||||
}
|
||||
raw := bytes.TrimRight(data[start:start+end], "\r\n")
|
||||
if reader, err := zlib.NewReader(bytes.NewReader(raw)); err == nil {
|
||||
decoded, err := io.ReadAll(reader)
|
||||
reader.Close()
|
||||
if err == nil {
|
||||
out.Write(decoded)
|
||||
out.WriteByte('\n')
|
||||
}
|
||||
} else {
|
||||
out.Write(raw)
|
||||
out.WriteByte('\n')
|
||||
}
|
||||
data = data[start+end+len("endstream"):]
|
||||
}
|
||||
if out.Len() == 0 {
|
||||
t.Fatal("no content streams found in PDF")
|
||||
}
|
||||
return out.Bytes()
|
||||
}
|
||||
|
||||
func TestPDFUmlautsAreEncoded(t *testing.T) {
|
||||
r, rows, churches, people := umlautRows()
|
||||
person := people[0]
|
||||
cover := CoverData{
|
||||
TenantName: "Köln", Diocese: "Erzbistum Köln", Range: r, Person: person,
|
||||
Intro: "Grüße aus dem Pfarrbüro.",
|
||||
Greeting: "Herzliche Grüße",
|
||||
Assignments: []DispatchAssignment{{
|
||||
Date: domain.MustDate("2026-11-15"), TimeMinutes: 9*60 + 30,
|
||||
Church: "St. Mariä Himmelfahrt", Title: "Hochamt für die Gemeinde", Role: domain.RoleLector,
|
||||
}},
|
||||
GeneratedAt: time.Now(),
|
||||
}
|
||||
|
||||
documents := []struct {
|
||||
name string
|
||||
render func(io.Writer) error
|
||||
present []string
|
||||
}{
|
||||
{
|
||||
name: "full",
|
||||
render: func(w io.Writer) error {
|
||||
return FullPlan(w, r, rows, churches, people, Options{TenantName: "Köln", Diocese: "Erzbistum Köln"})
|
||||
},
|
||||
present: []string{"K\xf6ln", "M\xfcller", "Andreasstra\xdfe", "Mari\xe4", "f\xfcr"},
|
||||
},
|
||||
{
|
||||
name: "compact",
|
||||
render: func(w io.Writer) error {
|
||||
return CompactPlan(w, r, rows, people, Options{TenantName: "Köln", Diocese: "Erzbistum Köln"})
|
||||
},
|
||||
present: []string{"K\xd6LN", "M\xfcller", "Mari\xe4", "f\xfcr"},
|
||||
},
|
||||
{
|
||||
name: "cover",
|
||||
render: func(w io.Writer) error { return Cover(w, cover) },
|
||||
present: []string{
|
||||
"K\xf6ln", "M\xfcller", "Mari\xe4", "f\xfcr", "Gr\xfc\xdfe",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, document := range documents {
|
||||
t.Run(document.name, func(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
if err := document.render(&buf); err != nil {
|
||||
t.Fatalf("render: %v", err)
|
||||
}
|
||||
content := pdfContentStreams(t, buf.Bytes())
|
||||
for _, want := range document.present {
|
||||
if !bytes.Contains(content, []byte(want)) {
|
||||
t.Errorf("cp1252 sequence %q missing from PDF content", want)
|
||||
}
|
||||
}
|
||||
for _, raw := range []string{
|
||||
"K\xc3\xb6ln", "M\xc3\xbcller", "Andreasstra\xc3\x9fe", "Mari\xc3\xa4", "f\xc3\xbcr", "Gr\xc3\xbc\xc3\x9fe",
|
||||
} {
|
||||
if bytes.Contains(content, []byte(raw)) {
|
||||
t.Errorf("raw UTF-8 sequence %q found in PDF content", raw)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestFullPlan(t *testing.T) {
|
||||
r, rows, churches, people := sampleRows()
|
||||
var buf bytes.Buffer
|
||||
|
||||
Reference in new issue
Block a user