phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-05 08:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken convert

Browse source 
The front matter convert-feature didn't work. It placed converted content in the wrong directory.

This commit fixes this by doing the smallest and safest change possible; the path logic here should maybe
be revisited and generalized.

Fixes #643
This commit is contained in:
bep 2014-11-17 23:18:40 +01:00 committed by spf13
parent bcaf33418f
commit cb3576b6de
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
commands/convert.go
View file

@ -15,14 +15,15 @@ package commands
import ( import (
"fmt" "fmt"
"path/filepath"
"time"
"github.com/spf13/cast" "github.com/spf13/cast"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/hugo/helpers"
"github.com/spf13/hugo/hugolib" "github.com/spf13/hugo/hugolib"
"github.com/spf13/hugo/parser" "github.com/spf13/hugo/parser"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"github.com/spf13/viper"
"path/filepath"
"time"
) )
var OutputDir string var OutputDir string
@ -128,7 +129,7 @@ func convertContents(mark rune) (err error) {
metadata = newmetadata metadata = newmetadata
} }
//page.Dir = file.Dir page.SetDir(filepath.Join(helpers.AbsPathify(viper.GetString("ContentDir")), file.Dir()))
page.SetSourceContent(psr.Content()) page.SetSourceContent(psr.Content())
page.SetSourceMetaData(metadata, mark) page.SetSourceMetaData(metadata, mark)

6
source/file.go
View file

@ -70,9 +70,9 @@ func (f *File) LogicalName() string {
} }
} }
//func (f *File) SetDir(dir string) { func (f *File) SetDir(dir string) {
//f.dir = dir f.dir = dir
//} }
func (f *File) Dir() string { func (f *File) Dir() string {
if f.dir != "" { if f.dir != "" {