diff --git a/main.odin b/main.odin
index 5788289..aa65bd9 100644
--- a/main.odin
+++ b/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, "
")
+ }
+}
+
+
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))
- }
-
- 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, "