From 99f8047ef20a64f948ac2b703c81eb49bed091c0 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 30 Jan 2025 22:16:09 +0100
Subject: re-organise everything

---
 cmd/build/main.go | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'cmd/build')

diff --git a/cmd/build/main.go b/cmd/build/main.go
index 84de2dc..72c1470 100644
--- a/cmd/build/main.go
+++ b/cmd/build/main.go
@@ -6,6 +6,7 @@ import (
 
 	"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 @@ import (
 )
 
 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)
-- 
cgit 1.4.1