danog/gojekyll
1
0
Fork 0
mirror of https://github.com/danog/gojekyll.git synced 2024-11-30 06:19:00 +01:00
Code Issues Projects Releases Wiki Activity

Posts obey config.permalink

Browse Source
This commit is contained in:
Oliver Steele 2017-08-27 14:18:57 -04:00
parent 1d02fe4fbe
commit 6451139756
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
collection/collection.go
View File

@ -93,6 +93,6 @@ func (c *Collection) ToLiquid() interface{} {
// PermalinkPattern returns the default permalink pattern for this collection.
func (c *Collection) PermalinkPattern() string {
pattern := c.strategy().defaultPermalinkPattern()
pattern := c.strategy().defaultPermalinkPattern(c.cfg)
return templates.VariableMap(c.Metadata).String("permalink", pattern)
}

2
collection/collection_test.go
View File

@ -36,7 +36,7 @@ func TestPermalinkPattern(t *testing.T) {
require.Equal(t, "out", c2.PermalinkPattern())
c3 := New(site, "posts", map[string]interface{}{})
require.Contains(t, c3.PermalinkPattern(), "/:year/:month/:day/:title")
require.Contains(t, c3.PermalinkPattern(), "date")
}
func Test_ReadPages(t *testing.T) {

11
collection/read.go
View File

@ -68,8 +68,8 @@ func (c *Collection) scanDirectory(dirname string) error {
})
}
func (c *Collection) readPost(abs string, rel string) error {
siteRel := utils.MustRel(c.cfg.Source, abs)
func (c *Collection) readPost(path string, rel string) error {
siteRel := utils.MustRel(c.cfg.Source, path)
strategy := c.strategy()
switch {
case !strategy.isCollectible(rel):
@ -77,13 +77,12 @@ func (c *Collection) readPost(abs string, rel string) error {
case strategy.isFuture(rel) && !c.cfg.Future:
return nil
}
pageDefaults := frontmatter.FrontMatter{
fm := frontmatter.FrontMatter{
"collection": c.Name,
"permalink": c.PermalinkPattern(),
}
fm := pageDefaults.Merged(c.cfg.GetFrontMatterDefaults(c.Name, siteRel))
}.Merged(c.cfg.GetFrontMatterDefaults(c.Name, siteRel))
strategy.parseFilename(rel, fm)
f, err := pages.NewFile(c.site, abs, filepath.ToSlash(rel), fm)
f, err := pages.NewFile(c.site, path, filepath.ToSlash(rel), fm)
switch {
case err != nil:
return err

10
collection/strategies.go
View File

@ -3,13 +3,14 @@ package collection
import (
"time"
"github.com/osteele/gojekyll/config"
"github.com/osteele/gojekyll/utils"
)
// A collectionStrategy encapsulates behavior differences between the `_post`
// collection and other collections.
type collectionStrategy interface {
defaultPermalinkPattern() string
defaultPermalinkPattern(*config.Config) string
isCollectible(filename string) bool
isFuture(filename string) bool
parseFilename(string, map[string]interface{})
@ -58,10 +59,13 @@ const DefaultCollectionPermalinkPattern = "/:collection/:path:output_ext"
// DefaultPostsCollectionPermalinkPattern is the default collection permalink pattern
const DefaultPostsCollectionPermalinkPattern = "/:categories/:year/:month/:day/:title.html"
func (s defaultStrategy) defaultPermalinkPattern() string {
func (s defaultStrategy) defaultPermalinkPattern(*config.Config) string {
return DefaultCollectionPermalinkPattern
}
func (s postsStrategy) defaultPermalinkPattern() string {
func (s postsStrategy) defaultPermalinkPattern(cfg *config.Config) string {
if s, ok := cfg.String("permalink"); ok {
return s
}
return DefaultPostsCollectionPermalinkPattern
}