github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Better error handling for parsing front matter

Browse source
This commit is contained in:
spf13 2013-07-09 18:53:08 -04:00
parent 8403dba3ee
commit a6914e9c4c
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
hugolib/page.go
View file

@ -150,8 +150,13 @@ func (page *Page) parseYamlMetaData(data []byte) ([]string, error) {
var err error var err error
datum, lines := splitPageContent(data, "---", "---") datum, lines := splitPageContent(data, "---", "---")
d, err := page.handleYamlMetaData([]byte(strings.Join(datum, "\n")))
err = page.handleMetaData(page.handleYamlMetaData([]byte(strings.Join(datum, "\n")))) if err != nil {
return lines, err
}
err = page.handleMetaData(d)
return lines, err return lines, err
} }
@ -159,8 +164,13 @@ func (page *Page) parseTomlMetaData(data []byte) ([]string, error) {
var err error var err error
datum, lines := splitPageContent(data, "+++", "+++") datum, lines := splitPageContent(data, "+++", "+++")
d, err := page.handleTomlMetaData([]byte(strings.Join(datum, "\n")))
err = page.handleMetaData(page.handleTomlMetaData([]byte(strings.Join(datum, "\n")))) if err != nil {
return lines, err
}
err = page.handleMetaData(d)
return lines, err return lines, err
} }
@ -168,8 +178,13 @@ func (page *Page) parseJsonMetaData(data []byte) ([]string, error) {
var err error var err error
datum, lines := splitPageContent(data, "{", "}") datum, lines := splitPageContent(data, "{", "}")
d, err := page.handleJsonMetaData([]byte(strings.Join(datum, "\n")))
err = page.handleMetaData(page.handleJsonMetaData([]byte(strings.Join(datum, "\n")))) if err != nil {
return lines, err
}
err = page.handleMetaData(d)
return lines, err return lines, err
} }
@ -223,28 +238,28 @@ func (p *Page) Permalink() template.HTML {
} }
} }
func (page *Page) handleTomlMetaData(datum []byte) interface{} { func (page *Page) handleTomlMetaData(datum []byte) (interface{}, error) {
m := map[string]interface{}{} m := map[string]interface{}{}
if _, err := toml.Decode(string(datum), &m); err != nil { if _, err := toml.Decode(string(datum), &m); err != nil {
return fmt.Errorf("Invalid TOML in %s \nError parsing page meta data: %s", page.FileName, err) return m, fmt.Errorf("Invalid TOML in %s \nError parsing page meta data: %s", page.FileName, err)
} }
return m return m, nil
} }
func (page *Page) handleYamlMetaData(datum []byte) interface{} { func (page *Page) handleYamlMetaData(datum []byte) (interface{}, error) {
m := map[string]interface{}{} m := map[string]interface{}{}
if err := goyaml.Unmarshal(datum, &m); err != nil { if err := goyaml.Unmarshal(datum, &m); err != nil {
return fmt.Errorf("Invalid YAML in %s \nError parsing page meta data: %s", page.FileName, err) return m, fmt.Errorf("Invalid YAML in %s \nError parsing page meta data: %s", page.FileName, err)
} }
return m return m, nil
} }
func (page *Page) handleJsonMetaData(datum []byte) interface{} { func (page *Page) handleJsonMetaData(datum []byte) ( interface{}, error ) {
var f interface{} var f interface{}
if err := json.Unmarshal(datum, &f); err != nil { if err := json.Unmarshal(datum, &f); err != nil {
return fmt.Errorf("Invalide JSON in $v \nError parsing page meta data: %s", page.FileName, err) return f, fmt.Errorf("Invalid JSON in %v \nError parsing page meta data: %s", page.FileName, err)
} }
return f return f, nil
} }
func (page *Page) handleMetaData(f interface{}) error { func (page *Page) handleMetaData(f interface{}) error {