mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
f2946da9e8
* Add file context to minifier errors when publishing * Misc fixes (see issues) * Allow custom server error template in layouts/server/error.html To get to this, this commit also cleans up and simplifies the code surrounding errors and files. This also removes the usage of `github.com/pkg/errors`, mostly because of https://github.com/pkg/errors/issues/223 -- but also because most of this is now built-in to Go. Fixes #9852 Fixes #9857 Fixes #9863
64 lines
1.6 KiB
Go
64 lines
1.6 KiB
Go
// Copyright 2018 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package tplimpl
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/gohugoio/hugo/common/herrors"
|
|
"github.com/spf13/afero"
|
|
)
|
|
|
|
type templateInfo struct {
|
|
name string
|
|
template string
|
|
isText bool // HTML or plain text template.
|
|
|
|
// Used to create some error context in error situations
|
|
fs afero.Fs
|
|
|
|
// The filename relative to the fs above.
|
|
filename string
|
|
|
|
// The real filename (if possible). Used for logging.
|
|
realFilename string
|
|
}
|
|
|
|
func (t templateInfo) Name() string {
|
|
return t.name
|
|
}
|
|
|
|
func (t templateInfo) Filename() string {
|
|
return t.realFilename
|
|
}
|
|
|
|
func (t templateInfo) IsZero() bool {
|
|
return t.name == ""
|
|
}
|
|
|
|
func (t templateInfo) resolveType() templateType {
|
|
return resolveTemplateType(t.name)
|
|
}
|
|
|
|
func (info templateInfo) errWithFileContext(what string, err error) error {
|
|
err = fmt.Errorf(what+": %w", err)
|
|
fe := herrors.NewFileError(info.realFilename, err)
|
|
f, err := info.fs.Open(info.filename)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer f.Close()
|
|
return fe.UpdateContent(f, herrors.SimpleLineMatcher)
|
|
|
|
}
|