422057f607
This commit removes the fragile front matter decoding, and takes the provided archetype file as-is and processes it as a template.
This also means that we no longer will attempt to fill in default values for `title` and `date`.
The upside is that it is now easy to create these values in a dynamic way:
```toml
+++
title = {{ .BaseFileName | title }}
date = {{ .Date }}
draft = true
+++
```
You can currently use all of Hugo's template funcs, but the data context is currently very shallow:
* `.Type` gives the archetype kind provided
* `.Name` gives the target file name without extension.
* `.Path` gives the target file name
* `.Date` gives the current time as RFC3339 formatted string
The above will probably be extended in #1629.
Fixes #452
Updates #1629
105 lines
3.2 KiB
Go
105 lines
3.2 KiB
Go
// Copyright 2016 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
// Package create provides functions to create new content.
|
|
package create
|
|
|
|
import (
|
|
"bytes"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
"github.com/gohugoio/hugo/hugolib"
|
|
jww "github.com/spf13/jwalterweatherman"
|
|
)
|
|
|
|
// NewContent creates a new content file in the content directory based upon the
|
|
// given kind, which is used to lookup an archetype.
|
|
func NewContent(s *hugolib.Site, kind, targetPath string) error {
|
|
jww.INFO.Println("attempting to create ", targetPath, "of", kind)
|
|
|
|
archetypeFilename := findArchetype(s, kind)
|
|
|
|
var (
|
|
content []byte
|
|
err error
|
|
)
|
|
|
|
content, err = executeArcheTypeAsTemplate(s, kind, targetPath, archetypeFilename)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
contentPath := s.PathSpec.AbsPathify(filepath.Join(s.Cfg.GetString("contentDir"), targetPath))
|
|
|
|
if err := helpers.SafeWriteToDisk(contentPath, bytes.NewReader(content), s.Fs.Source); err != nil {
|
|
return err
|
|
}
|
|
|
|
jww.FEEDBACK.Println(contentPath, "created")
|
|
|
|
editor := s.Cfg.GetString("newContentEditor")
|
|
if editor != "" {
|
|
jww.FEEDBACK.Printf("Editing %s with %q ...\n", targetPath, editor)
|
|
|
|
cmd := exec.Command(editor, contentPath)
|
|
cmd.Stdin = os.Stdin
|
|
cmd.Stdout = os.Stdout
|
|
cmd.Stderr = os.Stderr
|
|
|
|
return cmd.Run()
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// FindArchetype takes a given kind/archetype of content and returns an output
|
|
// path for that archetype. If no archetype is found, an empty string is
|
|
// returned.
|
|
func findArchetype(s *hugolib.Site, kind string) (outpath string) {
|
|
search := []string{s.PathSpec.AbsPathify(s.Cfg.GetString("archetypeDir"))}
|
|
|
|
if s.Cfg.GetString("theme") != "" {
|
|
themeDir := filepath.Join(s.PathSpec.AbsPathify(s.Cfg.GetString("themesDir")+"/"+s.Cfg.GetString("theme")), "/archetypes/")
|
|
if _, err := s.Fs.Source.Stat(themeDir); os.IsNotExist(err) {
|
|
jww.ERROR.Printf("Unable to find archetypes directory for theme %q at %q", s.Cfg.GetString("theme"), themeDir)
|
|
} else {
|
|
search = append(search, themeDir)
|
|
}
|
|
}
|
|
|
|
for _, x := range search {
|
|
// If the new content isn't in a subdirectory, kind == "".
|
|
// Therefore it should be excluded otherwise `is a directory`
|
|
// error will occur. github.com/gohugoio/hugo/issues/411
|
|
var pathsToCheck []string
|
|
|
|
if kind == "" {
|
|
pathsToCheck = []string{"default.md", "default"}
|
|
} else {
|
|
pathsToCheck = []string{kind + ".md", kind, "default.md", "default"}
|
|
}
|
|
for _, p := range pathsToCheck {
|
|
curpath := filepath.Join(x, p)
|
|
jww.DEBUG.Println("checking", curpath, "for archetypes")
|
|
if exists, _ := helpers.Exists(curpath, s.Fs.Source); exists {
|
|
jww.INFO.Println("curpath: " + curpath)
|
|
return curpath
|
|
}
|
|
}
|
|
}
|
|
|
|
return ""
|
|
}
|