Formatting cleanup

This commit is contained in:
Noah Campbell 2013-08-13 14:58:50 -07:00 committed by spf13
parent ec821739bc
commit c713beba4d
2 changed files with 4 additions and 6 deletions

View file

@ -1,8 +1,8 @@
package hugolib
import (
"testing"
"strings"
"testing"
)
func TestSitePossibleIndexes(t *testing.T) {
@ -14,5 +14,3 @@ func TestSitePossibleIndexes(t *testing.T) {
t.Fatalf("possible indexes do not match [tags categories]. Got: %s", indexes)
}
}

View file

@ -326,9 +326,9 @@ func (s *Site) setOutFile(p *Page) {
if len(strings.TrimSpace(p.Slug)) > 0 {
// Use Slug if provided
if s.Config.UglyUrls {
outfile = p.Slug + "." + p.Extension
outfile = strings.TrimSpace(p.Slug) + "." + p.Extension
} else {
outfile = p.Slug + slash + "index." + p.Extension
outfile = filepath.Join(strings.TrimSpace(p.Slug), "index."+p.Extension)
}
} else {
// Fall back to filename
@ -337,7 +337,7 @@ func (s *Site) setOutFile(p *Page) {
outfile = replaceExtension(strings.TrimSpace(t), p.Extension)
} else {
file, _ := fileExt(strings.TrimSpace(t))
outfile = file + slash + "index." + p.Extension
outfile = filepath.Join(file, "index."+p.Extension)
}
}