adapt main and print processor
This commit is contained in:
parent
f42c4cb9c3
commit
5e4ab1ccd5
1 changed files with 8 additions and 6 deletions
14
main.go
14
main.go
|
@ -13,7 +13,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gohugoio/hugo/config"
|
"github.com/gohugoio/hugo/config"
|
||||||
"github.com/n0x1m/hugoext/hugov0492"
|
"github.com/n0x1m/hugoext/hugo"
|
||||||
"github.com/spf13/afero"
|
"github.com/spf13/afero"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -42,6 +42,8 @@ func main() {
|
||||||
flag.BoolVar(&withDrafts, "enable-withDrafts", false, "include withDrafts in processing and output")
|
flag.BoolVar(&withDrafts, "enable-withDrafts", false, "include withDrafts in processing and output")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
|
fmt.Printf("converting markdown to %v with %v\n", ext, processor)
|
||||||
|
|
||||||
osfs := afero.NewOsFs()
|
osfs := afero.NewOsFs()
|
||||||
cfg, err := config.FromFile(osfs, "config.toml")
|
cfg, err := config.FromFile(osfs, "config.toml")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -172,14 +174,14 @@ type File struct {
|
||||||
NewBody []byte
|
NewBody []byte
|
||||||
}
|
}
|
||||||
|
|
||||||
func parse(fullpath string) ([]byte, *hugov0492.Content, error) {
|
func parse(fullpath string) ([]byte, *hugo.Content, error) {
|
||||||
file, err := os.Open(fullpath)
|
file, err := os.Open(fullpath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
defer file.Close()
|
defer file.Close()
|
||||||
|
|
||||||
page, err := hugov0492.ReadFrom(file)
|
page, err := hugo.ReadFrom(file)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
@ -205,7 +207,7 @@ func destinationPath(file *File, pattern string) error {
|
||||||
file.Draft = c.Draft
|
file.Draft = c.Draft
|
||||||
|
|
||||||
if file.Parent != "." {
|
if file.Parent != "." {
|
||||||
link, err := hugov0492.PathPattern(pattern).Expand(c)
|
link, err := hugo.PathPattern(pattern).Expand(c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -250,8 +252,8 @@ func collectFiles(fullpath string, filechan chan File) error {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewContentFromMeta(meta map[string]interface{}) *hugov0492.Content {
|
func NewContentFromMeta(meta map[string]interface{}) *hugo.Content {
|
||||||
return &hugov0492.Content{
|
return &hugo.Content{
|
||||||
Title: stringFromInterface(meta["title"]),
|
Title: stringFromInterface(meta["title"]),
|
||||||
Slug: stringFromInterface(meta["slug"]),
|
Slug: stringFromInterface(meta["slug"]),
|
||||||
Summary: stringFromInterface(meta["summary"]),
|
Summary: stringFromInterface(meta["summary"]),
|
||||||
|
|
Loading…
Reference in a new issue