Merge pull request #15 from cbsinteractive/duration_fix

Duration fix MT-2670

go.mod

@@ -1,3 +1,3 @@
 module github.com/zencoder/go-dash/v3
 
-go 1.16
+go 1.16

mpd/duration.go

@@ -51,32 +51,19 @@ func (d *Duration) String() string {
 		u = -u
 	}
 
-	if u < uint64(time.Second) {
+	if u <= uint64(time.Second) {
 		// Special case: if duration is smaller than a second,
 		// use smaller units, like 1.2ms
-		var prec int
-		w--
-		buf[w] = 'S'
-		w--
+		// time.Duration & zerocoder packages convert seconds to nano ('nS'), micro ('µS') or milliseconds ('mS') with corresponding designation
+		// Fix for "Duration must be in the format: P[nD][T[nH][nM][nS]]" error is to keep seconds.
 		if u == 0 {
 			return "PT0S"
+		} else {
+			du := float64(u) / float64(time.Second)
+			s := fmt.Sprintf("%2f", du)
+			sf := strings.TrimRight(s, "0")
+			return fmt.Sprintf("PT%sS", sf)
 		}
-		/*
-			switch {
-			case u < uint64(Millisecond):
-				// print microseconds
-				prec = 3
-				// U+00B5 'µ' micro sign == 0xC2 0xB5
-				w-- // Need room for two bytes.
-				copy(buf[w:], "µ")
-			default:
-				// print milliseconds
-				prec = 6
-				buf[w] = 'm'
-			}
-		*/
-		w, u = fmtFrac(buf[:w], u, prec)
-		w = fmtInt(buf[:w], u)
 	} else {
 		w--
 		buf[w] = 'S'

mpd/duration_test.go

@@ -10,9 +10,12 @@ import (
 
 func TestDuration(t *testing.T) {
 	in := map[string]string{
-		"0s":    "PT0S",
-		"6m16s": "PT6M16S",
-		"1.97s": "PT1.97S",
+		"0s":            "PT0S",
+		"6m16s":         "PT6M16S",
+		"1.97s":         "PT1.97S",
+		"0.0021s":       "PT0.0021S",
+		"0.0000021s":    "PT0.000002S",
+		"0.021s":        "PT0.021S",
 	}
 	for ins, ex := range in {
 		timeDur, err := time.ParseDuration(ins)