pkg/pools: Use pool for strings.Builder everywhere

This commit is contained in:
Tom Wiesing 2023-01-24 10:52:15 +01:00
parent 8af2213d5a
commit a63bb2f669
No known key found for this signature in database
7 changed files with 44 additions and 25 deletions

View file

@ -4,14 +4,16 @@ import (
"encoding/json"
"fmt"
"io"
"strings"
"github.com/FAU-CDI/wisski-distillery/pkg/countwriter"
"github.com/FAU-CDI/wisski-distillery/pkg/pools"
)
func (snapshot Snapshot) String() string {
var builder strings.Builder
snapshot.Report(&builder)
builder := pools.GetBuilder()
defer pools.ReleaseBuilder(builder)
snapshot.Report(builder)
return builder.String()
}
@ -63,8 +65,10 @@ func (snapshot Snapshot) Report(w io.Writer) (int, error) {
// Strings turns this backup into a string for the BackupReport.
func (backup Backup) String() string {
var builder strings.Builder
backup.Report(&builder)
builder := pools.GetBuilder()
defer pools.ReleaseBuilder(builder)
backup.Report(builder)
return builder.String()
}

View file

@ -12,6 +12,7 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/server/templating"
"github.com/FAU-CDI/wisski-distillery/internal/status"
"github.com/FAU-CDI/wisski-distillery/pkg/httpx"
"github.com/FAU-CDI/wisski-distillery/pkg/pools"
)
//go:embed "public.html"
@ -58,13 +59,17 @@ func (home *Home) publicHandler(ctx context.Context) http.Handler {
return pc, httpx.ErrNotFound
}
// get a builder
builder := pools.GetBuilder()
defer pools.ReleaseBuilder(builder)
// prepare about
pc.aboutContext.Instances = home.homeInstances.Get(nil)
pc.aboutContext.SelfRedirect = home.Config.SelfRedirect.String()
// render the about template
var builder strings.Builder
if err := about.Execute(&builder, pc.aboutContext); err != nil {
if err := about.Execute(builder, pc.aboutContext); err != nil {
return pc, nil
}

View file

@ -12,6 +12,7 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/server/assets"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/server/templating"
"github.com/FAU-CDI/wisski-distillery/pkg/pools"
"github.com/rs/zerolog"
"github.com/yuin/goldmark"
gmmeta "github.com/yuin/goldmark-meta"
@ -89,7 +90,8 @@ var newsFS embed.FS
// Items returns a list of all news items
func Items() ([]Item, error) {
var builder strings.Builder
builder := pools.GetBuilder()
defer pools.ReleaseBuilder(builder)
files, err := fs.Glob(newsFS, "NEWS/*.md")
if err != nil {
@ -99,7 +101,7 @@ func Items() ([]Item, error) {
items := make([]Item, len(files))
for i, file := range files {
items[i].ID = file[len("NEWS/") : len(file)-len(".md")]
if err := items[i].parse(file, &builder); err != nil {
if err := items[i].parse(file, builder); err != nil {
return nil, err
}
}

View file

@ -7,10 +7,10 @@ import (
"html/template"
"net/http"
"reflect"
"strings"
"time"
"github.com/FAU-CDI/wisski-distillery/pkg/httpx"
"github.com/FAU-CDI/wisski-distillery/pkg/pools"
"github.com/gorilla/csrf"
"github.com/rs/zerolog"
)
@ -159,7 +159,9 @@ func (ctx *tContext[C]) renderSafe(name string, t *template.Template, c any) (te
}
value, err, panicked := func() (value template.HTML, err error, panicked bool) {
var builder strings.Builder
// get a builder
builder := pools.GetBuilder()
defer pools.ReleaseBuilder(builder)
defer func() {
if panicked {
@ -173,7 +175,7 @@ func (ctx *tContext[C]) renderSafe(name string, t *template.Template, c any) (te
}()
panicked = true
err = t.Execute(&builder, c)
err = t.Execute(builder, c)
panicked = false
if err != nil {