mirror/gohugoio-hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-05-11 05:54:58 +00:00
Code Issues Releases Activity

better handling of detecting markup format

Browse Source
This commit is contained in:
spf13
2013-12-06 23:56:51 -05:00
parent f432b187a0
commit d0ef3d43bd
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
hugolib/page.go
View File

@@ -490,17 +490,35 @@ func (p *Page) ExecuteTemplate(layout string) *bytes.Buffer {
} }
func (page *Page) guessMarkupType() string { func (page *Page) guessMarkupType() string {
// First try the explicitly set markup from the frontmatter
if page.Markup != "" { if page.Markup != "" {
return page.Markup format := guessType(page.Markup)
if format != "unknown" {
return format
}
} }
if strings.HasSuffix(page.FileName, ".md") { // Then try to guess from the extension
return "md" ext := strings.ToLower(path.Ext(page.FileName))
if strings.HasPrefix(ext, ".") {
return guessType(ext[1:])
} }
return "unknown" return "unknown"
} }
func guessType(in string) string {
switch in {
case "md", "markdown", "mdown":
return "markdown"
case "rst":
return "rst"
case "html", "htm":
return "html"
}
return "unknown"
}
func (page *Page) parse(reader io.Reader) error { func (page *Page) parse(reader io.Reader) error {
p, err := parser.ReadFrom(reader) p, err := parser.ReadFrom(reader)
if err != nil { if err != nil {
@@ -530,14 +548,10 @@ func (page *Page) parse(reader io.Reader) error {
func (page *Page) Convert() error { func (page *Page) Convert() error {
switch page.guessMarkupType() { switch page.guessMarkupType() {
case "md", "markdown", "mdown": case "markdown":
page.convertMarkdown(bytes.NewReader([]byte(page.Content))) page.convertMarkdown(bytes.NewReader([]byte(page.Content)))
case "rst": case "rst":
page.convertRestructuredText(bytes.NewReader([]byte(page.Content))) page.convertRestructuredText(bytes.NewReader([]byte(page.Content)))
case "html":
fallthrough
default:
page.Content = template.HTML(page.Content)
} }
return nil return nil
} }

2
hugolib/site_test.go
View File

@@ -229,6 +229,7 @@ func TestSkipRender(t *testing.T) {
{"sect/doc5.html", []byte("<!doctype html><html>{{ template \"head\" }}<body>body5</body></html>"), "sect"}, {"sect/doc5.html", []byte("<!doctype html><html>{{ template \"head\" }}<body>body5</body></html>"), "sect"},
{"sect/doc6.html", []byte("<!doctype html><html>{{ template \"head_abs\" }}<body>body5</body></html>"), "sect"}, {"sect/doc6.html", []byte("<!doctype html><html>{{ template \"head_abs\" }}<body>body5</body></html>"), "sect"},
{"doc7.html", []byte("<html><body>doc7 content</body></html>"), ""}, {"doc7.html", []byte("<html><body>doc7 content</body></html>"), ""},
{"sect/doc8.html", []byte("---\nmarkup: md\n---\n# title\nsome *content*"), "sect"},
} }
s := &Site{ s := &Site{
@@ -267,6 +268,7 @@ func TestSkipRender(t *testing.T) {
{"sect/doc5.html", "<!doctype html><html><head><script src=\"script.js\"></script></head><body>body5</body></html>"}, {"sect/doc5.html", "<!doctype html><html><head><script src=\"script.js\"></script></head><body>body5</body></html>"},
{"sect/doc6.html", "<!doctype html><html><head><script src=\"http://auth/bub/script.js\"></script></head><body>body5</body></html>"}, {"sect/doc6.html", "<!doctype html><html><head><script src=\"http://auth/bub/script.js\"></script></head><body>body5</body></html>"},
{"doc7.html", "<html><body>doc7 content</body></html>"}, {"doc7.html", "<html><body>doc7 content</body></html>"},
{"sect/doc8.html", "<h1>title</h1>\n\n<p>some <em>content</em></p>\n"},
} }
for _, test := range tests { for _, test := range tests {