Merge branch 'development_kristof10' into development

# Conflicts:
#	lib/data/encoderhero/encoder.v
This commit is contained in:
2025-02-27 06:39:17 -07:00
4 changed files with 67 additions and 5 deletions

View File

@@ -192,7 +192,7 @@ fn (p Params) export_helper(args_ ExportArgs) ![]ParamExportItem {
}
fn val_is_empty(val string) bool {
return val == '' || val == '[]'
return val == '' || val == '[]' || val == '0000-00-00 00:00:00'
}
@[params]

View File

@@ -290,4 +290,4 @@ fn test_export_text() {
}
paramsout := params.export()
assert paramsout.trim_space() == "text:'This content contains the character \\' in it'"
}
}

View File

@@ -1,6 +1,7 @@
module paramsparser
import time
import freeflowuniverse.herolib.data.ourtime
import v.reflection
// import freeflowuniverse.herolib.data.encoderhero
// TODO: support more field types
@@ -66,6 +67,13 @@ pub fn (params Params) decode_value[T](_ T, key string) !T {
return time.Time{}
}
return time.parse(time_str)!
} $else $if T is ourtime.OurTime {
time_str := params.get(key)!
// todo: 'handle other null times'
if time_str == '0000-00-00 00:00:00' {
return ourtime.new('0000-00-00 00:00:00')!
}
return ourtime.new(time_str)!
} $else $if T is $struct {
child_params := params.get_params(key)!
child := child_params.decode_struct(T{})!
@@ -100,7 +108,7 @@ pub fn encode[T](t T, args EncodeArgs) !Params {
key = field_attrs['alias']
}
$if val is string || val is int || val is bool || val is i64 || val is u32
|| val is time.Time {
|| val is time.Time || val is ourtime.OurTime {
params.set(key, '${val}')
} $else $if field.is_enum {
params.set(key, '${int(val)}')