Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2026-01-26 05:15:56 +00:00
Code Releases Activity

publish v12.2.0-alpha6

Browse Source
This commit is contained in:
Gerasimos (Makis) Maropoulos
2022-02-18 22:19:33 +02:00
parent 4899fe95f4
commit 41026c9209
21 changed files with 984 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
x/jsonx/time_notation.go
View File

@@ -20,7 +20,40 @@ func fmtDuration(d time.Duration) string {
h := d / time.Hour
d -= h * time.Hour
m := d / time.Minute
return fmt.Sprintf("%02d:%02d", h, m)
return fmt.Sprintf("%02d:%02d:00", h, m) // Manos doesn't care about the seconds.
}
// ParseTimeNotationDuration parses a string to a time notation duration (00:00:00) hours:minutes:seconds.
func ParseTimeNotationDuration(s string) (TimeNotationDuration, error) {
entries := strings.SplitN(s, ":", 3)
if len(entries) < 3 {
return TimeNotationDuration(0), fmt.Errorf("invalid duration format: expected hours:minutes:seconds (e.g. 01:05:00) but got: %s", s)
}
hours, err := strconv.Atoi(entries[0])
if err != nil {
return TimeNotationDuration(0), err
}
minutes, err := strconv.Atoi(entries[1])
if err != nil {
return TimeNotationDuration(0), err
}
// remove any .0000
secondsStr := strings.TrimSuffix(entries[2], ".000000")
seconds, err := strconv.Atoi(secondsStr)
if err != nil {
return TimeNotationDuration(0), err
}
format := fmt.Sprintf("%02dh%02dm%02ds", hours, minutes, seconds)
v, err := time.ParseDuration(format)
if err != nil {
return TimeNotationDuration(0), err
}
return TimeNotationDuration(v), nil
}
func (d TimeNotationDuration) MarshalJSON() ([]byte, error) {
@@ -44,26 +77,11 @@ func (d *TimeNotationDuration) UnmarshalJSON(b []byte) error {
*d = TimeNotationDuration(value)
return nil
case string:
entries := strings.SplitN(value, ":", 2)
if len(entries) < 2 {
return fmt.Errorf("invalid duration format: expected hours:minutes:seconds (e.g. 01:05) but got: %s", value)
}
hours, err := strconv.Atoi(entries[0])
dv, err := ParseTimeNotationDuration(value)
if err != nil {
return err
}
minutes, err := strconv.Atoi(entries[1])
if err != nil {
return err
}
format := fmt.Sprintf("%02dh%02dm", hours, minutes)
v, err := time.ParseDuration(format)
if err != nil {
return err
}
*d = TimeNotationDuration(v)
*d = dv
return nil
default:
return errors.New("invalid duration")
@@ -75,7 +93,7 @@ func (d TimeNotationDuration) ToDuration() time.Duration {
}
func (d TimeNotationDuration) Value() (driver.Value, error) {
return int64(d), nil
return d.ToDuration(), nil
}
// Set sets the value of duration in nanoseconds.