refactor: Improved the way sites are loaded.

This commit is contained in:
Spencer Brower
2026-07-12 22:34:52 -04:00
parent 4521960824
commit 9671a90726
9 changed files with 573 additions and 229 deletions
+104 -4
View File
@@ -1,13 +1,113 @@
package main
import "core:encoding/json"
import "core:flags"
import "core:fmt"
import "core:mem"
import "core:os"
import "core:strings"
Site :: struct {
base_url: string,
title: string,
socials: []Social_Icon,
arena: mem.Dynamic_Arena,
config_path: string `args:"name=config"`,
title: string,
description: string,
base_url: string `args:"name=base-url"`,
content_dir: string `args:"name=content"`,
output_dir: string `args:"name=output"`,
layouts_dir: string,
author: string,
social: []Social_Link,
drafts: bool `args:"name=drafts"`,
}
Social_Icon :: struct {
Social_Link :: struct {
name: string,
url: string,
}
init_site :: proc(site: ^Site, args: []string) {
_flags: Site
mem.dynamic_arena_init(&site.arena)
alloc := site_allocator(site)
flags.parse_or_exit(&_flags, args, .Odin, alloc)
path := _flags.config_path
if path == "" {
path = "./thor.json"
}
if load_site_config(site, path, alloc) {
site_merge(site, _flags)
} else {
_flags.arena = site.arena
site^ = _flags
}
// Determine config file's directory for relative defaults
config_dir := "./"
if idx := strings.last_index(path, "/"); idx >= 0 {
config_dir = path[:idx]
}
// Hardcoded defaults (lowest precedence)
if site.content_dir == "" {
site.content_dir = fmt.tprintf("%s/content", config_dir)
}
if site.output_dir == "" {
site.output_dir = fmt.tprintf("%s/public", config_dir)
}
if site.layouts_dir == "" {
site.layouts_dir = fmt.tprintf("%s/layouts", config_dir)
}
if site.base_url == "" {
site.base_url = "http://localhost:8080"
}
}
load_site_config :: proc(
config: ^Site,
path: string,
allocator := context.allocator,
) -> (
ok: bool,
) {
data, err := os.read_entire_file_from_path(path, allocator)
if err != nil {
return
}
unmarshal_err := json.unmarshal_string(string(data), config, allocator = allocator)
if unmarshal_err != nil {
fmt.eprintfln("thor: failed to parse %s: %v", path, unmarshal_err)
return
}
ok = true
return
}
site_merge :: proc(config: ^Site, flags: Site) {
if flags.base_url != "" {
config.base_url = flags.base_url
}
if flags.content_dir != "" {
config.content_dir = flags.content_dir
}
if flags.output_dir != "" {
config.output_dir = flags.output_dir
}
if flags.drafts {
config.drafts = true
}
config.config_path = flags.config_path
}
site_allocator :: proc(site: ^Site) -> mem.Allocator {
return mem.dynamic_arena_allocator(&site.arena)
}
destroy_site :: proc(site: ^Site) {
mem.dynamic_arena_destroy(&site.arena)
}