implement live-reloading dev server Squashed commit of the following: commit 02f077432202af4d633eb2cad81dfdaa6921317f Author: Alan Pearce <alan@alanpearce.eu> Date: Sat Apr 27 21:09:14 2024 +0200 builder: only remove output directory if set and in dev mode commit 47001e01c55fa6e74aafeda04ebc3e4e7c47eba0 Author: Alan Pearce <alan@alanpearce.eu> Date: Sat Apr 27 21:03:37 2024 +0200 implement live reload on dev server commit 411ec969f61e4b73439f1c54ea29f75135ecc618 Author: Alan Pearce <alan@alanpearce.eu> Date: Sat Apr 27 20:59:26 2024 +0200 server: implement graceful shutdown commit 5400132eb6eb1b638e0b3fd4265f51611c92d473 Author: Alan Pearce <alan@alanpearce.eu> Date: Sat Apr 27 20:41:07 2024 +0200 add some debug logs commit 3c9b678197c044603950232d222f501ef74d7873 Author: Alan Pearce <alan@alanpearce.eu> Date: Sat Apr 27 20:39:09 2024 +0200 prefix log output with executable name commit 300e24c179e390e9d3f5aeab4471c97f17f1fa64 Author: Alan Pearce <alan@alanpearce.eu> Date: Sat Apr 27 20:29:42 2024 +0200 don't panic inside internal packages, return error instead commit fe2715d330402ad67fe866471bed89c7238ad2ec Author: Alan Pearce <alan@alanpearce.eu> Date: Fri Apr 26 01:18:29 2024 +0200 config: use a table to configure CSP headers commit d012553aaf78a436fa8871830b5d720a9e292d4b Author: Alan Pearce <alan@alanpearce.eu> Date: Thu Apr 25 17:13:39 2024 +0200 dev: create basic dev server to build and serve from a temporary directory commit a1d11d3e69650d9b43ca1b1d7b7ccc05a808d5c1 Author: Alan Pearce <alan@alanpearce.eu> Date: Thu Apr 25 13:02:22 2024 +0200 remove unused redirect_other_hostnames config option commit fd67b19b5c7f76f0c3579e8a05ef20a618e90be7 Author: Alan Pearce <alan@alanpearce.eu> Date: Thu Apr 25 12:58:53 2024 +0200 server: make port a string, which is what go uses commit c798e8e736c0649008cade337158399470a9099b Author: Alan Pearce <alan@alanpearce.eu> Date: Thu Apr 25 12:58:33 2024 +0200 config: remove unused port variable commit f94882b9001f3b0855e26b26b4a84b96e3deb22b Author: Alan Pearce <alan@alanpearce.eu> Date: Thu Apr 25 12:49:10 2024 +0200 re-organise module layout
1 file changed, 19 insertions(+), 18 deletions(-)
changed files
M cmd/build/build.go → internal/builder/builder.go
@@ -1,4 +1,4 @@ -package main +package builder import ( "fmt"@@ -16,11 +16,19 @@ cp "github.com/otiai10/copy" "github.com/pkg/errors" ) +type IOConfig struct { + Source string `conf:"default:.,short:s,flag:src"` + Destination string `conf:"default:website,short:d,flag:dest"` + BaseURL config.URL + Development bool `conf:"default:false,flag:dev"` +} + func mkdirp(dirs ...string) error { return os.MkdirAll(path.Join(dirs...), 0755) } func outputToFile(output io.Reader, filename ...string) error { + slog.Debug(fmt.Sprintf("outputting file %s", path.Join(filename...))) file, err := os.OpenFile(path.Join(filename...), os.O_WRONLY|os.O_CREATE, 0644) if err != nil { return errors.WithMessage(err, "could not open output file")@@ -34,6 +42,7 @@ return nil } func build(outDir string, config config.Config) error { + slog.Debug(fmt.Sprintf("output directory %s", outDir)) privateDir := path.Join(outDir, "private") if err := mkdirp(privateDir); err != nil { return errors.WithMessage(err, "could not create private directory")@@ -48,7 +57,7 @@ PreserveTimes: true, PermissionControl: cp.AddPermission(0755), }) if err != nil { - log.Panic(errors.Errorf("could not copy static files: %v", err)) + return errors.WithMessage(err, "could not copy static files") } if err := mkdirp(publicDir, "post"); err != nil {@@ -163,17 +172,12 @@ return nil } -type IOConfig struct { - Source string `conf:"default:.,short:s"` - Destination string `conf:"default:website,short:d"` - BaseURL config.URL -} - -func buildSite(ioConfig IOConfig) error { +func BuildSite(ioConfig IOConfig) error { config, err := config.GetConfig() if err != nil { log.Panic(errors.Errorf("could not get config: %v", err)) } + config.InjectLiveReload = ioConfig.Development if ioConfig.BaseURL.URL != nil { config.BaseURL.URL, err = url.Parse(ioConfig.BaseURL.String())@@ -182,15 +186,12 @@ log.Panic(errors.Errorf("highly unlikely: %v", err)) } } - err = os.RemoveAll(ioConfig.Destination) - if err != nil { - log.Panic(errors.Errorf("could not remove public directory: %v", err)) - } - - if err := build(ioConfig.Destination, *config); err != nil { - return err + if ioConfig.Development && ioConfig.Destination != "website" { + err = os.RemoveAll(ioConfig.Destination) + if err != nil { + log.Panic(errors.Errorf("could not remove destination directory: %v", err)) + } } - slog.Debug("done") - return nil + return build(ioConfig.Destination, *config) }