From: bep <bjorn.erik.pedersen@gmail.com>
Date: Mon, 17 Nov 2014 22:18:40 +0000 (+0100)
Subject: Fix broken convert
X-Git-Tag: v0.13~294
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cb3576b6;p=brevno-suite%2Fhugo

Fix broken convert

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
---

diff --git a/commands/convert.go b/commands/convert.go
index 2aa6da9d..01feecb2 100644
--- a/commands/convert.go
+++ b/commands/convert.go
@@ -15,14 +15,15 @@ package commands
 
 import (
 	"fmt"
-	"path/filepath"
-	"time"
-
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
+	"github.com/spf13/hugo/helpers"
 	"github.com/spf13/hugo/hugolib"
 	"github.com/spf13/hugo/parser"
 	jww "github.com/spf13/jwalterweatherman"
+	"github.com/spf13/viper"
+	"path/filepath"
+	"time"
 )
 
 var OutputDir string
@@ -128,7 +129,7 @@ func convertContents(mark rune) (err error) {
 			metadata = newmetadata
 		}
 
-		//page.Dir = file.Dir
+		page.SetDir(filepath.Join(helpers.AbsPathify(viper.GetString("ContentDir")), file.Dir()))
 		page.SetSourceContent(psr.Content())
 		page.SetSourceMetaData(metadata, mark)
 
diff --git a/source/file.go b/source/file.go
index 909d457d..4c6196a9 100644
--- a/source/file.go
+++ b/source/file.go
@@ -70,9 +70,9 @@ func (f *File) LogicalName() string {
 	}
 }
 
-//func (f *File) SetDir(dir string) {
-//f.dir = dir
-//}
+func (f *File) SetDir(dir string) {
+	f.dir = dir
+}
 
 func (f *File) Dir() string {
 	if f.dir != "" {