all repos — website @ 973fa31b6743a3ea84c86ab7671349cc70a69142

My website

enable filtered debug logging via DEBUG="component.*"

Alan Pearce
commit

973fa31b6743a3ea84c86ab7671349cc70a69142

parent

7b82d3ef3e93c0c8efe489d6b11b30f092667bf2

1 file changed, 9 insertions(+), 9 deletions(-)

changed files
M internal/builder/builder.gointernal/builder/builder.go
@@ -93,7 +93,7 @@ return filepath.Join(src, rel)
} } -func build(ioConfig *IOConfig, config *config.Config) (*Result, error) { +func build(ioConfig *IOConfig, config *config.Config, log *log.Logger) (*Result, error) { outDir := ioConfig.Destination joinSource := joinSourcePath(ioConfig.Source) log.Debug("output", "dir", outDir)
@@ -110,7 +110,11 @@ if err := mkdirp(outDir, "post"); err != nil {
return nil, errors.WithMessage(err, "could not create post output directory") } log.Debug("reading posts") - posts, tags, err := content.ReadPosts(joinSource("content"), "post", outDir) + posts, tags, err := content.ReadPosts(&content.Config{ + Root: joinSource("content"), + InputDir: "post", + OutputDir: outDir, + }, log.Named("content")) if err != nil { return nil, err }
@@ -254,13 +258,9 @@
return r, nil } -func BuildSite(ioConfig *IOConfig, cfg *config.Config) (*Result, error) { +func BuildSite(ioConfig *IOConfig, cfg *config.Config, log *log.Logger) (*Result, error) { if cfg == nil { - var err error - cfg, err = config.GetConfig(ioConfig.Source) - if err != nil { - return nil, errors.WithMessage(err, "could not get config") - } + return nil, errors.New("config is nil") } cfg.InjectLiveReload = ioConfig.Development compressFiles = !ioConfig.Development
@@ -268,5 +268,5 @@
templates.Setup() loadCSS(ioConfig.Source) - return build(ioConfig, cfg) + return build(ioConfig, cfg, log) }