refactor main to make it smaller

gen.odin

@@ -5,6 +5,15 @@ import "core:fmt"
 import "core:os"
 import "core:strings"
 
+/*
+	2026 Simon Kellet
+	Generates the blog index markdown file (blog/index.md) complete with all
+	current blogs/articles. This is then passed to the 'parse_file_md_to_html'
+	We do this to make updating the blog index much easier.
+
+	The final step is to write the blog in order.
+*/
+
 BLOG_START_MD := `
 (\
 \'\
@@ -24,13 +33,14 @@ BLOG_BACK_MD := `
 [<= Back](./..)
 `
 
-// Generates the blog index markdown file (blog/index.md) complete with all
-// current blogs/articles. This is then passed to the 'parse_file_md_to_html'
-// We do this to make updating the blog index much easier
-generate_blog_md_file :: proc(path: string, allocator := context.allocator) {
+generate_blog_index_md_file :: proc(path: string, allocator := context.allocator) {
 	blog_list := make([dynamic]string, allocator)
+	defer delete(blog_list)
+
 	sb := strings.builder_make(allocator)
 	blog_md_file := strings.builder_make(allocator)
+	defer strings.builder_destroy(&sb)
+	defer strings.builder_destroy(&blog_md_file)
 
 	strings.write_string(&sb, path)
 	strings.write_string(&sb, "blog/")
@@ -49,6 +59,7 @@ generate_blog_md_file :: proc(path: string, allocator := context.allocator) {
 		trim_b := strings.trim_right(b[1], ".md")
 
 		if trim_b == "index" {continue} 	//Ignore Index
+		if trim_b == ".DS_Store" {continue} 	//Ignore annoying MacOS files
 		if strings.starts_with(trim_b, "!") {continue} 	//Ignore WIP files!
 
 		// now add to blog list
@@ -69,7 +80,7 @@ generate_blog_md_file :: proc(path: string, allocator := context.allocator) {
 		free_all(context.temp_allocator)
 	}
 
-	// sck: Now we create the index.md file.
+	// sck: Now we create the /blog/index.md file.
 	os.change_directory(blog_dir)
 	index_file, err := os.create("index.md")
 	if err != nil {
@@ -85,7 +96,7 @@ generate_blog_md_file :: proc(path: string, allocator := context.allocator) {
 	os.write_string(index_file, "```\n")
 	os.write_string(index_file, BLOG_TITLE_MD)
 	os.write_string(index_file, "\n")
-	os.write_string(index_file, strings.to_string(blog_md_file))
+	os.write_string(index_file, strings.to_string(blog_md_file)) //CONTENT OF BLOG
 	os.write_string(index_file, "\n")
 	os.write_string(index_file, BLOG_BACK_MD)
 }

main.odin

@@ -15,6 +15,43 @@ import fleg "flag"
  * 4. (write fancy timings and footer for main page)
  */
 
+create_html_file :: proc(md_f: string, dir: string, output_dir: string, allocater := context.allocator) -> (file: ^os.File, err: os.Error){
+	sb := strings.builder_make(allocater) //sb for writing to files
+	defer strings.builder_destroy(&sb)
+
+	md_filename := strings.split(md_f, dir, allocater)
+	trimmed_filename := strings.trim_right(md_filename[1], ".md")
+
+	// sck: Change to output directory. Not sure if this also is needed
+	//But messing around with it means I create a lot of
+	//files to clean up. Works for now!
+	os.change_directory(output_dir)
+
+	strings.write_string(&sb, fmt.aprintf("%v", trimmed_filename, allocator = allocater))
+	strings.write_string(&sb, ".html")
+
+	//get "full" name for creation + writing to html file
+	full_filename := strings.to_string(sb)
+	file = os.create(full_filename) or_return
+
+	return file, nil
+}
+
+write_footer_and_timings :: proc(trimmed_filename: string, file: ^os.File, start: time.Tick, allocator := context.allocator){
+	switch trimmed_filename {
+	case "index":
+		buf: [1024]u8
+		date := time.now()
+		end := time.tick_since(start)
+
+		os.write_string(file, "<br><footer><hr />This site was generated με αγάπη on ")
+		os.write_string(file, fmt.aprintf("%s ", time.to_string_dd_mm_yy(date, buf[:]), allocator = allocator))
+		os.write_string(file, fmt.aprintf("in %v ", time.duration_round(end, time.Nanosecond), allocator = allocator))
+		os.write_string(file, "<font color=#ea76cb><3</font> </footer><br>")
+	}
+}
+
+
 main :: proc() {
 	// Arena used for ALL allocations, easier to drop everything at end of execution.
 	arena: vmem.Arena
@@ -23,7 +60,7 @@ main :: proc() {
 	arena_alloc := vmem.arena_allocator(&arena)
 	defer vmem.arena_destroy(&arena) //clean up everything!
 
-	fleg.init_custom_allocator(arena_alloc) //use arena for flags, why not I made the library!
+	fleg.init_custom_allocator(arena_alloc)
 	defer fleg.destroy()
 
 	directory: string
@@ -34,63 +71,31 @@ main :: proc() {
 
 	start := time.tick_now() //start timer for footer
 
-	// First generate the blog index file
-	generate_blog_md_file(directory, arena_alloc)
+	// First generate the blog index MARKDOWN file
+	generate_blog_index_md_file(directory, arena_alloc)
 
 	// Walk directory and collect .md files
 	md_files := walk_tree_and_get_md_names(directory, arena_alloc)
 
 	// ************* MAIN LOOP ************
 	for file, _ in md_files {
+		if file == ".DS_Store" { continue } //Ignore annoying MacOS (TODO: clean up proc?)
+		md_filename := strings.split(file, directory, arena_alloc)
+		trimmed_filename := strings.trim_right(md_filename[1], ".md")
 		// sck: I am not sure if changing dir's is needed but I am now relying on it lol
 		os.change_directory(directory)
 
 		// turn all .md files into parsed .html files!
-		html, parse_err := parse_file_md_to_html(file, arena_alloc)
+		html_content, parse_err := parse_file_md_to_html(file, arena_alloc)
 		if parse_err != nil {
 			fmt.eprintfln("ERROR: Could not parse file %s: %s", file, os.error_string(parse_err))
 		}
+		final_html_file, html_file_err := create_html_file(file, directory, output_dir, arena_alloc)
 
-		filename := strings.split(file, directory, arena_alloc)
-		trimmed_filename := strings.trim_right(filename[1], ".md")
+		write_prefixs_to_html_file(final_html_file)
+		os.write_string(final_html_file, html_content) //WRITE PAGE
 
-		// sck: Change to output directory. Not sure if this also is needed
-		//But messing around with it means I create a lot of
-		//files to clean up. Works for now!
-		os.change_directory(output_dir)
-
-		sb := strings.builder_make(arena_alloc) //sb for writing to files
-		defer strings.builder_destroy(&sb)
-
-		strings.write_string(&sb, fmt.aprintf("%v", trimmed_filename, allocator = arena_alloc))
-		strings.write_string(&sb, ".html")
-
-		//get "full" name for creation + writing to html file
-		full_filename := strings.to_string(sb)
-		file, file_err := os.create(full_filename)
-		if file_err != nil {
-			fmt.eprintfln("ERROR: Could not open file %s: %s", file, os.error_string(file_err))
+		defer write_footer_and_timings(trimmed_filename, final_html_file, start, arena_alloc)
 	}
-
-		write_prefixs_to_html_file(file)
-		os.write_string(file, html) //WRITE PAGE
-
-		//Defer this as we want the last page written to have
-		//accurate timings
-		defer {
-			switch trimmed_filename {
-			case "index":
-				buf: [1024]u8
-				date := time.now()
-				end := time.tick_since(start)
-
-				os.write_string(file, "<br><footer><hr />This site was generated με αγάπη on ")
-				os.write_string(file, fmt.aprintf("%s ", time.to_string_dd_mm_yy(date, buf[:]), allocator = arena_alloc))
-				os.write_string(file, fmt.aprintf("in %v ", time.duration_round(end, time.Nanosecond), allocator = arena_alloc))
-				os.write_string(file, "<font color=#ea76cb><3</font> </footer><br>")
-			}
-		}
-	}
-	//TODO: Do timings now?
 	free_all(arena_alloc)
 }

parse.odin

@@ -14,6 +14,7 @@ FAVICON_PREFIX :: "<link rel=\"icon\" type=\"image\\x-icon\" href=\"/imgs/favico
 MASTODON_PREFIX :: "<a rel=me href=https://linuxrocks.online/@simonkellet></a>\n"
 HIGHLIGHT_JS_PREFIX :: "<script type=\"text/javascript\" src=\"https://unpkg.com/@highlightjs/cdn-assets@11.11.1/highlight.min.js\"></script>\n<script type=\"text/javascript\" src=\"https://unpkg.com/highlightjs-odinlang@1.4.0/dist/odin.min.js\"></script>\n\n<script type=\"text/javascript\">\n  hljs.highlightAll();\n</script>"
 
+CMARK_OPTIONS :: cm.Options{.Unsafe, .Smart}
 
 // Write important HTML prefixes to files. This includes:
 //	- css, utf8, favicon, mastadon and, conditionally, hljs
@@ -98,11 +99,11 @@ walk_tree :: proc(path: string) -> []u8 {
 // according to mem's tracking allocator...
 parse_file_md_to_html :: proc(filename: string, allocator := context.allocator, ) -> (parsed: string, err: os.Error) {
 	str := os.read_entire_file_from_path(filename, allocator) or_return
-	root := cm.parse_document_from_string(string(str), cm.DEFAULT_OPTIONS)
+	root := cm.parse_document_from_string(string(str), CMARK_OPTIONS)
 	//root := cm.parse_document(raw_data(str), len(str), cm.DEFAULT_OPTIONS)
 	defer cm.node_free(root)
 
-	html := cm.render_html(root, cm.DEFAULT_OPTIONS)
+	html := cm.render_html(root, CMARK_OPTIONS)
 	defer cm.free(html)
 
 	parsed = strings.clone_from_cstring(html, allocator)