troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 12:49:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request 'Update module github.com/buildkite/terminal-to-html/v3 to v3.16.0 (forgejo)' (#5239) from renovate/forgejo-github.com-buildkite-terminal-to-html-v3-3.x into forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5239
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
This commit is contained in:
Gusted 2024-09-07 08:09:09 +00:00
commit 0a86d1e843
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -23,7 +23,7 @@ require (
github.com/alecthomas/chroma/v2 v2.14.0 github.com/alecthomas/chroma/v2 v2.14.0
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
github.com/blevesearch/bleve/v2 v2.4.2 github.com/blevesearch/bleve/v2 v2.4.2
github.com/buildkite/terminal-to-html/v3 v3.15.0 github.com/buildkite/terminal-to-html/v3 v3.16.0
github.com/caddyserver/certmagic v0.21.0 github.com/caddyserver/certmagic v0.21.0
github.com/chi-middleware/proxy v1.1.1 github.com/chi-middleware/proxy v1.1.1
github.com/djherbis/buffer v1.2.0 github.com/djherbis/buffer v1.2.0

4
go.sum
View file

@ -141,8 +141,8 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
github.com/buildkite/terminal-to-html/v3 v3.15.0 h1:wYZmEsdqYB7g2cSJGbue3Q+vZzcRhty/9fzLxcd+C/8= github.com/buildkite/terminal-to-html/v3 v3.16.0 h1:BbAgSK3tLEVocul3QLWn5pazyMzWilEeSmnq2LGcFAM=
github.com/buildkite/terminal-to-html/v3 v3.15.0/go.mod h1:gBOS1jmZ+/ze1lpunGDIZpjCk3MkYZ4E80Y7/26Um0c= github.com/buildkite/terminal-to-html/v3 v3.16.0/go.mod h1:gBOS1jmZ+/ze1lpunGDIZpjCk3MkYZ4E80Y7/26Um0c=
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
github.com/caddyserver/certmagic v0.21.0 h1:yDoifClc4hIxhHer3AxUj4buhF+NzRR6torw/AOnuUE= github.com/caddyserver/certmagic v0.21.0 h1:yDoifClc4hIxhHer3AxUj4buhF+NzRR6torw/AOnuUE=
github.com/caddyserver/certmagic v0.21.0/go.mod h1:OgUZNXYV/ylYoFJNmoYVR5nntydLNMQISePPgqZTyhc= github.com/caddyserver/certmagic v0.21.0/go.mod h1:OgUZNXYV/ylYoFJNmoYVR5nntydLNMQISePPgqZTyhc=

7
modules/markup/console/console.go
View file

@ -58,13 +58,16 @@ func (Renderer) CanRender(filename string, input io.Reader) bool {
// Render renders terminal colors to HTML with all specific handling stuff. // Render renders terminal colors to HTML with all specific handling stuff.
func (Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error { func (Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error {
screen := &trend.Screen{} screen, err := trend.NewScreen()
if err != nil {
return err
}
if _, err := io.Copy(screen, input); err != nil { if _, err := io.Copy(screen, input); err != nil {
return err return err
} }
buf := screen.AsHTML() buf := screen.AsHTML()
buf = strings.ReplaceAll(buf, "\n", `<br>`) buf = strings.ReplaceAll(buf, "\n", `<br>`)
_, err := output.Write([]byte(buf)) _, err = output.Write([]byte(buf))
return err return err
} }