Merge pull request #9 from Code-Hex/fix/parse

fixed iso8601 time handling
Code-Hex · Sep 11, 2023 · 92235ef · 92235ef
2 parents fd9f867 + 136f21b
commit 92235ef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/iso8601/time.go b/iso8601/time.go
@@ -267,11 +267,13 @@ func parseFraction(b []byte) (int, int) {
 }
 
 func hmsfTime(h, m, s, f int) (Time, error) {
+	s += int(math.Trunc(float64(f)/1e9)) % 60
+	m += int(math.Trunc(float64(f) / 60e9))
 	t := Time{
 		Hour:       h,
 		Minute:     m,
 		Second:     s,
-		Nanosecond: f,
+		Nanosecond: f % int(1e9),
 	}
 	if err := t.Validate(); err != nil {
 		return Time{}, err

diff --git a/iso8601/time_test.go b/iso8601/time_test.go
@@ -169,35 +169,35 @@ func TestParseTime(t *testing.T) {
 			want: Time{
 				Hour:       14,
 				Minute:     30,
-				Second:     00,
-				Nanosecond: int(time.Minute) / 2,
+				Second:     30,
+				Nanosecond: 0,
 			},
 		},
 		{
 			name: "1430,5",
 			want: Time{
 				Hour:       14,
 				Minute:     30,
-				Second:     00,
-				Nanosecond: int(time.Minute) / 2,
+				Second:     30,
+				Nanosecond: 0,
 			},
 		},
 		{
 			name: "14.5",
 			want: Time{
 				Hour:       14,
-				Minute:     00,
+				Minute:     30,
 				Second:     00,
-				Nanosecond: int(time.Hour) / 2,
+				Nanosecond: 0,
 			},
 		},
 		{
 			name: "14,5",
 			want: Time{
 				Hour:       14,
-				Minute:     00,
+				Minute:     30,
 				Second:     00,
-				Nanosecond: int(time.Hour) / 2,
+				Nanosecond: 0,
 			},
 		},
 		{
@@ -337,17 +337,17 @@ func TestParseTime(t *testing.T) {
 			want: Time{
 				Hour:       14,
 				Minute:     30,
-				Second:     00,
-				Nanosecond: int(time.Minute) / 2,
+				Second:     30,
+				Nanosecond: 0,
 			},
 		},
 		{
 			name: "14:30,5",
 			want: Time{
 				Hour:       14,
 				Minute:     30,
-				Second:     00,
-				Nanosecond: int(time.Minute) / 2,
+				Second:     30,
+				Nanosecond: 0,
 			},
 		},
 		{