diff options
| author | Shulhan <ms@kilabit.info> | 2024-03-15 13:49:49 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2024-03-15 13:49:49 +0700 |
| commit | 0a20cfd1fe3e5e359edb75b0f4d44e4ce5a12554 (patch) | |
| tree | 39c7c66ebacd3947136f88a31b2ed5e2be190b9c | |
| parent | b947c36942369177bb6f6afc02e1d76b333c2d70 (diff) | |
| download | ciigo-0a20cfd1fe3e5e359edb75b0f4d44e4ce5a12554.tar.xz | |
go.mod: update module "pakakeh.go" to tip
| -rw-r--r-- | cmd/ciigo-example/static.go | 4 | ||||
| -rw-r--r-- | go.mod | 6 | ||||
| -rw-r--r-- | go.sum | 12 | ||||
| -rw-r--r-- | server.go | 18 |
4 files changed, 18 insertions, 22 deletions
diff --git a/cmd/ciigo-example/static.go b/cmd/ciigo-example/static.go index 603b7f9..4dcc4d2 100644 --- a/cmd/ciigo-example/static.go +++ b/cmd/ciigo-example/static.go @@ -196,7 +196,7 @@ func init() { Opts: &memfs.Options{ Root: "_example", MaxFileSize: 5242880, - Includes: []string{ + Includes: []string{ }, Excludes: []string{ `.*\.adoc$`, @@ -204,7 +204,7 @@ func init() { `^\..*`, }, Embed: memfs.EmbedOptions{ - CommentHeader: `// SPDX-FileCopyrightText: 2019 Shulhan <ms@kilabit.info> + CommentHeader: `// SPDX-FileCopyrightText: 2019 Shulhan <ms@kilabit.info> // SPDX-License-Identifier: GPL-3.0-or-later `, PackageName: "main", @@ -7,14 +7,14 @@ go 1.20 require ( git.sr.ht/~shulhan/asciidoctor-go v0.5.2-0.20240305110034-dc67158aeeb6 - git.sr.ht/~shulhan/pakakeh.go v0.53.2-0.20240305092154-76510776395b + git.sr.ht/~shulhan/pakakeh.go v0.53.2-0.20240314175935-b9e12300d905 github.com/yuin/goldmark v1.7.0 github.com/yuin/goldmark-meta v1.1.0 ) require ( - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) @@ -1,15 +1,15 @@ git.sr.ht/~shulhan/asciidoctor-go v0.5.2-0.20240305110034-dc67158aeeb6 h1:/0I9F83ZgfDjVDRTSNGxYaZroOxGg3o5m9GlqnWmYXs= git.sr.ht/~shulhan/asciidoctor-go v0.5.2-0.20240305110034-dc67158aeeb6/go.mod h1:ht3glgf7w0J2HxyKoy/ZMg//okyw3F6GrwH4/KlwhxA= -git.sr.ht/~shulhan/pakakeh.go v0.53.2-0.20240305092154-76510776395b h1:LtSlSrDg3Zw1ASfUi5enaHqefPWiWsPEDK+IlzSO72g= -git.sr.ht/~shulhan/pakakeh.go v0.53.2-0.20240305092154-76510776395b/go.mod h1:C43kVQ9Dai9Ol3bCHi8VKeOtYzp+E8617jNBaIsmd8o= +git.sr.ht/~shulhan/pakakeh.go v0.53.2-0.20240314175935-b9e12300d905 h1:93zGHcnle3Q8J5PhRSkwAkA9Vk9zDU7ZKou6aJOxNiQ= +git.sr.ht/~shulhan/pakakeh.go v0.53.2-0.20240314175935-b9e12300d905/go.mod h1:tTHoHDHuBxj5q1zwpLZGCKrdc6i0I3sP8kPp+JEs16c= github.com/yuin/goldmark v1.7.0 h1:EfOIvIMZIzHdB/R/zVrikYLPPwJlfMcNczJFMs1m6sA= github.com/yuin/goldmark v1.7.0/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc= github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= @@ -28,15 +28,7 @@ type server struct { // The htmlTemplate parameter is optional, if not set its default to // embedded HTML template. func newServer(opts *ServeOptions) (srv *server, err error) { - var ( - logp = `newServer` - - tmplNode *memfs.Node - httpdOpts *libhttp.ServerOptions - epInSearch *libhttp.Endpoint - - pathHTMLTemplate string - ) + var logp = `newServer` if opts.Mfs == nil { opts.Mfs = &memfs.MemFS{ @@ -54,7 +46,7 @@ func newServer(opts *ServeOptions) (srv *server, err error) { opts: *opts, } - httpdOpts = &libhttp.ServerOptions{ + var httpdOpts = libhttp.ServerOptions{ Memfs: opts.Mfs, Address: opts.Address, } @@ -64,7 +56,7 @@ func newServer(opts *ServeOptions) (srv *server, err error) { return nil, fmt.Errorf(`%s: %w`, logp, err) } - epInSearch = &libhttp.Endpoint{ + var epInSearch = libhttp.Endpoint{ Method: libhttp.RequestMethodGet, Path: `/_internal/search`, RequestType: libhttp.RequestTypeQuery, @@ -77,6 +69,8 @@ func newServer(opts *ServeOptions) (srv *server, err error) { return nil, fmt.Errorf(`%s: %w`, logp, err) } + var pathHTMLTemplate string + if opts.IsDevelopment { pathHTMLTemplate = opts.HTMLTemplate } @@ -87,6 +81,8 @@ func newServer(opts *ServeOptions) (srv *server, err error) { } if !opts.IsDevelopment { + var tmplNode *memfs.Node + tmplNode, _ = opts.Mfs.Get(internalTemplatePath) if tmplNode != nil { srv.converter.tmpl, err = srv.converter.tmpl.Parse(string(tmplNode.Content)) |
