mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-26 22:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support index.html indexes in content directory

Browse Source 
If a file named index.html exists in a directory, or root, it will be
rendered as if ugly urls are turned on.  This allows for top level
content to not need a supporting layout file and content in content.
This change should not affect anyone who is using the perscribed way.

I also cleaned up a bunch of one off functions in site.go.
This commit is contained in:
Noah Campbell
2013-09-24 21:24:49 -07:00
parent 4250bf8e30
commit db50154e75
4 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
hugolib/site.go
View File

@@ -28,21 +28,13 @@ import (
"os"
"strings"
"time"
"net/url"
)
var DefaultTimer = nitro.Initalize()
func MakePermalink(domain string, path string) string {
return strings.TrimRight(domain, "/") + "/" + strings.TrimLeft(path, "/")
}
func FatalErr(str string) {
fmt.Println(str)
os.Exit(1)
}
func PrintErr(str string, a ...interface{}) {
fmt.Fprintln(os.Stderr, str, a)
func MakePermalink(base *url.URL, path *url.URL) (*url.URL) {
return base.ResolveReference(path)
}
// Site contains all the information relevent for constructing a static
@@ -86,10 +78,6 @@ type SiteInfo struct {
Config *Config
}
func (s *Site) getFromIndex(kind string, name string) Pages {
return s.Indexes[kind][name]
}
func (s *Site) timerStep(step string) {
if s.timer == nil {
s.timer = DefaultTimer
@@ -191,8 +179,10 @@ func (s *Site) checkDescriptions() {
}
}
func (s *Site) initialize() {
s.checkDirectories()
func (s *Site) initialize() (err error) {
if err = s.checkDirectories(); err != nil {
return err
}
staticDir := s.Config.GetAbsPath(s.Config.StaticDir + "/")
@@ -204,6 +194,7 @@ func (s *Site) initialize() {
s.initializeSiteInfo()
s.Shortcodes = make(map[string]ShortcodeFunc)
return
}
func (s *Site) initializeSiteInfo() {
@@ -239,13 +230,14 @@ func (s *Site) absPublishDir() string {
return s.Config.GetAbsPath(s.Config.PublishDir)
}
func (s *Site) checkDirectories() {
func (s *Site) checkDirectories() (err error) {
if b, _ := dirExists(s.absLayoutDir()); !b {
FatalErr("No layout directory found, expecting to find it at " + s.absLayoutDir())
return fmt.Errorf("No layout directory found, expecting to find it at " + s.absLayoutDir())
}
if b, _ := dirExists(s.absContentDir()); !b {
FatalErr("No source directory found, expecting to find it at " + s.absContentDir())
return fmt.Errorf("No source directory found, expecting to find it at " + s.absContentDir())
}
return
}
func (s *Site) ProcessShortcodes() {
@@ -289,7 +281,9 @@ func (s *Site) BuildSiteMeta() (err error) {
s.Indexes[plural].Add(idx, p)
}
} else {
PrintErr("Invalid " + plural + " in " + p.File.FileName)
if s.Config.Verbose {
fmt.Fprintf(os.Stderr, "Invalid %s in %s\n", plural, p.File.FileName)
}
}
}
}
@@ -344,7 +338,11 @@ func inStringArray(arr []string, el string) bool {
func (s *Site) RenderAliases() error {
for _, p := range s.Pages {
for _, a := range p.Aliases {
if err := s.WriteAlias(a, p.Permalink()); err != nil {
plink, err := p.Permalink()
if err != nil {
return err
}
if err := s.WriteAlias(a, template.HTML(plink)); err != nil {
return err
}
}
@@ -538,8 +536,18 @@ func (s *Site) Stats() {
}
}
func permalink(s *Site, plink string) template.HTML {
return template.HTML(MakePermalink(string(s.Info.BaseUrl), plink))
func permalink(s *Site, plink string) (template.HTML) {
base, err := url.Parse(string(s.Config.BaseUrl))
if err != nil {
panic(err)
}
path, err := url.Parse(plink)
if err != nil {
panic(err)
}
return template.HTML(MakePermalink(base, path).String())
}
func (s *Site) NewNode() *Node {