all repos — website @ 99f8047ef20a64f948ac2b703c81eb49bed091c0

My website

re-organise everything

Alan Pearce
commit

99f8047ef20a64f948ac2b703c81eb49bed091c0

parent

4566db657dab6af43f8fce814cd0e42cbcc788bf

1 file changed, 17 insertions(+), 7 deletions(-)

changed files
M cmd/build/main.gocmd/build/main.go
@@ -6,6 +6,7 @@ "os"
"go.alanpearce.eu/website/internal/builder" "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/website/internal/storage/sqlite" "go.alanpearce.eu/x/log" "github.com/ardanlabs/conf/v3"
@@ -13,29 +14,38 @@ "gitlab.com/tozd/go/errors"
) func main() { - ioConfig := &builder.IOConfig{} - if help, err := conf.Parse("", ioConfig); err != nil { + builderOptions := &builder.Options{} + if help, err := conf.Parse("", builderOptions); err != nil { if errors.Is(err, conf.ErrHelpWanted) { fmt.Println(help) os.Exit(1) } panic("error parsing configuration: " + err.Error()) } - log := log.Configure(!ioConfig.Development) + log := log.Configure(!builderOptions.Development) log.Debug("starting build process") - if ioConfig.Source != "." { - err := os.Chdir(ioConfig.Source) + if builderOptions.Source != "." { + err := os.Chdir(builderOptions.Source) if err != nil { log.Panic("could not change to source directory") } } - cfg, err := config.GetConfig(ioConfig.Source, log) + cfg, err := config.GetConfig(builderOptions.Source, log) if err != nil { log.Error("could not read config", "error", err) } - _, err = builder.BuildSite(ioConfig, cfg, log) + db, err := sqlite.OpenDB(builderOptions.DBPath) + if err != nil { + log.Error("could not open database", "error", err) + + return + } + + builderOptions.DB = db + + _, err = builder.BuildSite(builderOptions, cfg, log) if err != nil { log.Error("could not build site", "error", err) os.Exit(1)