Deuxfleurs/alps
23
1
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

Use %q to quote values in format strings

Browse source
This commit is contained in:
Simon Ser 2020-01-20 22:06:47 +01:00
parent 9fdccc3a4b
commit 3347e69480
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
renderer.go
View file

@ -99,13 +99,13 @@ func (r *renderer) Render(w io.Writer, name string, data interface{}, ectx echo.
var ok bool var ok bool
renderData, ok = data.(RenderData) renderData, ok = data.(RenderData)
if !ok { if !ok {
return fmt.Errorf("data passed to template '%v' doesn't implement RenderData", name) return fmt.Errorf("data passed to template %q doesn't implement RenderData", name)
} }
} }
for _, plugin := range ctx.Server.plugins { for _, plugin := range ctx.Server.plugins {
if err := plugin.Inject(ctx, name, renderData); err != nil { if err := plugin.Inject(ctx, name, renderData); err != nil {
return fmt.Errorf("failed to run plugin '%v': %v", plugin.Name(), err) return fmt.Errorf("failed to run plugin %q: %v", plugin.Name(), err)
} }
} }
@ -136,7 +136,7 @@ func (r *renderer) Load(plugins []Plugin) error {
for _, p := range plugins { for _, p := range plugins {
if err := p.LoadTemplate(base); err != nil { if err := p.LoadTemplate(base); err != nil {
return fmt.Errorf("failed to load template for plugin '%v': %v", p.Name(), err) return fmt.Errorf("failed to load template for plugin %q: %v", p.Name(), err)
} }
} }
@ -152,16 +152,16 @@ func (r *renderer) Load(plugins []Plugin) error {
continue continue
} }
r.logger.Printf("Loading theme '%v'", fi.Name()) r.logger.Printf("Loading theme %q", fi.Name())
var err error var err error
if themes[fi.Name()], err = loadTheme(fi.Name(), base); err != nil { if themes[fi.Name()], err = loadTheme(fi.Name(), base); err != nil {
return fmt.Errorf("failed to load theme '%v': %v", fi.Name(), err) return fmt.Errorf("failed to load theme %q: %v", fi.Name(), err)
} }
} }
if r.defaultTheme != "" { if r.defaultTheme != "" {
if _, ok := themes[r.defaultTheme]; !ok { if _, ok := themes[r.defaultTheme]; !ok {
return fmt.Errorf("failed to find default theme '%v'", r.defaultTheme) return fmt.Errorf("failed to find default theme %q", r.defaultTheme)
} }
} }