From 3250398b9651d1cd0e860b3911bfa16b4b7fcb6e Mon Sep 17 00:00:00 2001 From: chrisbell Date: Mon, 19 Jan 2026 20:50:02 -0600 Subject: [PATCH] Reorganize --- main.odin | 11 ++++++----- helper_procs.odin => szlib/helper_procs.odin | 2 +- sz_parser.odin => szlib/sz_parser.odin | 10 ++++------ tests.odin => szlib/tests.odin | 18 ++++++++---------- 4 files changed, 19 insertions(+), 22 deletions(-) rename helper_procs.odin => szlib/helper_procs.odin (98%) rename sz_parser.odin => szlib/sz_parser.odin (81%) rename tests.odin => szlib/tests.odin (65%) diff --git a/main.odin b/main.odin index c8e279f..ce29bdc 100644 --- a/main.odin +++ b/main.odin @@ -1,16 +1,17 @@ package main import "core:fmt" -import "core:os" + +import sz "szlib" + json_path :: "test_dataset.json" - main :: proc() { - test_dataset := create_test_dataset() - write_dataset_to_json(test_dataset, json_path) + test_dataset := sz.create_test_dataset() + sz.write_dataset_to_json(test_dataset, json_path) - parsed_dataset, ok := parse_json_to_dataset(json_path) + parsed_dataset, ok := sz.parse_json_to_dataset(json_path) if !ok { fmt.eprintfln("Failed to parse json tto dataset") return diff --git a/helper_procs.odin b/szlib/helper_procs.odin similarity index 98% rename from helper_procs.odin rename to szlib/helper_procs.odin index 4eeac32..88c9bff 100644 --- a/helper_procs.odin +++ b/szlib/helper_procs.odin @@ -1,4 +1,4 @@ -package main +package szlib import sp "core:path/slashpath" import "core:crypto" diff --git a/sz_parser.odin b/szlib/sz_parser.odin similarity index 81% rename from sz_parser.odin rename to szlib/sz_parser.odin index 1e6216d..1d3a53b 100644 --- a/sz_parser.odin +++ b/szlib/sz_parser.odin @@ -1,13 +1,11 @@ -package main - -import sz "szlib" +package szlib import "core:encoding/json" import "core:fmt" import "core:os" -write_dataset_to_json :: proc(dataset: sz.Dataset, json_path: string) -> (ok: bool) { +write_dataset_to_json :: proc(dataset: Dataset, json_path: string) -> (ok: bool) { json_data, err := json.marshal(dataset, {pretty = true, use_enum_names = true}) if err != nil { @@ -25,8 +23,8 @@ write_dataset_to_json :: proc(dataset: sz.Dataset, json_path: string) -> (ok: bo } -parse_json_to_dataset :: proc(json_path: string) -> (result: sz.Dataset, ok: bool) { - dataset: sz.Dataset +parse_json_to_dataset :: proc(json_path: string) -> (result: Dataset, ok: bool) { + dataset: Dataset data, data_ok := os.read_entire_file_from_filename(json_path) if !data_ok { diff --git a/tests.odin b/szlib/tests.odin similarity index 65% rename from tests.odin rename to szlib/tests.odin index 63115cf..fe9b69c 100644 --- a/tests.odin +++ b/szlib/tests.odin @@ -1,31 +1,29 @@ -package main +package szlib -import sz "szlib" +create_test_dataset :: proc() -> Dataset { -create_test_dataset :: proc() -> sz.Dataset { - - test_dataset: sz.Dataset = { + test_dataset: Dataset = { name = "Test Dataset", id = "test_dataset", uuid = create_uuid(), data_object_type = "items", - objects = make([dynamic]sz.SzDataObject) + objects = make([dynamic]SzDataObject) } - test_dataset_object: sz.SzDataObject = { + test_dataset_object: SzDataObject = { id = "test-item", name = "Test Item", - fields = make([dynamic]sz.SzField) + fields = make([dynamic]SzField) } - test_field: sz.SzField = { + test_field: SzField = { id = "cost", type = .NUMBER, is_list = false, value = "100" } - test_field2: sz.SzField = { + test_field2: SzField = { id = "some_string", type = .TEXT, is_list = false,