From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sat, 25 Mar 2017 08:56:00 +0000 (+0100)
Subject: hugolib: Correctly identify "my_index_page.md"
X-Git-Tag: v0.20~112
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=17b21e0af1e716bdc7f80b0b2b19b5e469344b34;p=brevno-suite%2Fhugo

hugolib: Correctly identify "my_index_page.md"

The above example was earlier identified as a section page and not a regular page.

Fixes #3234
---

diff --git a/hugolib/page.go b/hugolib/page.go
index e23434a7..141a7142 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -1859,8 +1859,15 @@ func sectionsFromFilename(filename string) []string {
 	return sections
 }
 
+const (
+	regularPageFileNameDoesNotStartWith = "_index"
+
+	// There can be "my_regular_index_page.md but not /_index_file.md
+	regularPageFileNameDoesNotContain = helpers.FilePathSeparator + regularPageFileNameDoesNotStartWith
+)
+
 func kindFromFilename(filename string) string {
-	if !strings.Contains(filename, "_index") {
+	if !strings.HasPrefix(filename, regularPageFileNameDoesNotStartWith) && !strings.Contains(filename, regularPageFileNameDoesNotContain) {
 		return KindPage
 	}
 
diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 7919ba37..b8a5eb21 100644
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -201,6 +201,20 @@ func TestLastChange(t *testing.T) {
 	require.Equal(t, 2017, s.Info.LastChange.Year(), "Site.LastChange should be set to the page with latest Lastmod (year 2017)")
 }
 
+// Issue #_index
+func TestPageWithUnderScoreIndexInFilename(t *testing.T) {
+	t.Parallel()
+
+	cfg, fs := newTestCfg()
+
+	writeSource(t, fs, filepath.Join("content", "sect/my_index_file.md"), "---\ntitle: doc1\nweight: 1\ndate: 2014-05-29\n---\n# doc1\n*some content*")
+
+	s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
+
+	require.Len(t, s.RegularPages, 1)
+
+}
+
 // Issue #957
 func TestCrossrefs(t *testing.T) {
 	t.Parallel()