diff options
| -rw-r--r-- | contrib/fs/dir.go | 2 | ||||
| -rw-r--r-- | gemini/gemtext/htmlconv/convert.go | 6 | ||||
| -rw-r--r-- | handler.go | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/contrib/fs/dir.go b/contrib/fs/dir.go index 6292f67..4328c8f 100644 --- a/contrib/fs/dir.go +++ b/contrib/fs/dir.go @@ -75,7 +75,7 @@ func DirectoryDefault(fileSystem fs.FS, fileNames ...string) gus.Handler { func DirectoryListing(fileSystem fs.FS, template *template.Template) gus.Handler { return func(ctx context.Context, req *gus.Request) *gus.Response { path, dirFile, resp := handleDir(req, fileSystem) - if resp != nil { + if dirFile == nil { return resp } defer dirFile.Close() diff --git a/gemini/gemtext/htmlconv/convert.go b/gemini/gemtext/htmlconv/convert.go index 5028766..2af4eea 100644 --- a/gemini/gemtext/htmlconv/convert.go +++ b/gemini/gemtext/htmlconv/convert.go @@ -12,8 +12,10 @@ import ( // // Templates can be provided to override the output for different line types. // The templates supported are: -// - "header" is called before any lines and is passed the full Document. -// - "footer" is called after the lines and is passed the full Document. +// - "header" is called before any lines and is passed the full Document. It should, +// at a minimum, produce opening <html> and <body> tags. +// - "footer" is called after the lines and is passed the full Document. It should, +// at a minimum, provide closing </body> and </html> tags. // - "textline" is called once per line of text and is passed a gemtext.TextLine. // - "linkline" is called once per link line and is passed an object which wraps // a gemtext.LinkLine but also supports a ValidatedURL() method returning a @@ -29,11 +29,11 @@ func FallthroughHandler(handlers ...Handler) Handler { } } -// Filter builds a middleware which only calls the wrapped under a condition. +// Filter builds a middleware which only calls the wrapped Handler under a condition. // -// When the condition function returns false it instead invokes the -// test-failure handler. The failure handler may also be nil, in which case -// the final handler will return a nil response whenever the condition fails. +// When the condition function returns false it instead invokes the test-failure +// handler. The failure handler may also be nil, in which case the final handler will +// return a nil response whenever the condition fails. func Filter( condition func(context.Context, *Request) bool, failure Handler, |