Ignore duration with Years and Months

Author: miyukki

mpd/duration.go

@@ -156,9 +156,6 @@ func parseDuration(str string) (time.Duration, error) {
 	}
 	offset++
 
-	base := time.Unix(0, 0)
-	t := base
-
 	var dateStr, timeStr string
 	if i := strings.IndexByte(str[offset:], 'T'); i != -1 {
 		dateStr = str[offset : offset+i]
@@ -167,38 +164,27 @@ func parseDuration(str string) (time.Duration, error) {
 		dateStr = str[offset:]
 	}
 
+	var sum float64
 	if len(dateStr) > 0 {
-		var pos int
-		var err error
-		var years, months, days int
-		if i := strings.IndexByte(dateStr[pos:], 'Y'); i != -1 {
-			years, err = strconv.Atoi(dateStr[pos : pos+i])
-			if err != nil {
-				return 0, err
-			}
-			pos += i + 1
+		if i := strings.IndexByte(dateStr, 'Y'); i != -1 {
+			return 0, errors.New("input duration contains Years notation")
 		}
 
-		if i := strings.IndexByte(dateStr[pos:], 'M'); i != -1 {
-			months, err = strconv.Atoi(dateStr[pos : pos+i])
-			if err != nil {
-				return 0, err
-			}
-			pos += i + 1
+		if i := strings.IndexByte(dateStr, 'M'); i != -1 {
+			return 0, errors.New("input duration contains Months notation")
 		}
 
-		if i := strings.IndexByte(dateStr[pos:], 'D'); i != -1 {
-			days, err = strconv.Atoi(dateStr[pos : pos+i])
+		if i := strings.IndexByte(dateStr, 'D'); i != -1 {
+			days, err := strconv.Atoi(dateStr[0:i])
 			if err != nil {
 				return 0, err
 			}
+			sum += float64(days) * 86400
 		}
-		t = t.AddDate(years, months, days)
 	}
 
 	if len(timeStr) > 0 {
 		var pos int
-		var sum float64
 		if i := strings.IndexByte(timeStr[pos:], 'H'); i != -1 {
 			hours, err := strconv.ParseInt(timeStr[pos:pos+i], 10, 64)
 			if err != nil {
@@ -222,11 +208,10 @@ func parseDuration(str string) (time.Duration, error) {
 			}
 			sum += seconds
 		}
-		t = t.Add(time.Duration(sum * float64(time.Second)))
 	}
 
 	if minus {
-		return -t.Sub(base), nil
+		sum = -sum
 	}
-	return t.Sub(base), nil
+	return time.Duration(sum * float64(time.Second)), nil
 }

mpd/duration_test.go

@@ -23,21 +23,16 @@ func TestDuration(t *testing.T) {
 
 func TestParseDuration(t *testing.T) {
 	in := map[string]float64{
-		"PT0S":                 0,
-		"PT1M":                 60,
-		"PT2H":                 7200,
-		"PT6M16S":              376,
-		"PT1.97S":              1.97,
-		"PT1H2M3.456S":         3723.456,
-		"P1YT2M3S":             (365*24*time.Hour + 2*time.Minute + 3*time.Second).Seconds(),
-		"P1Y2M3DT12H34M56.78S": (365*24*time.Hour + 59*24*time.Hour + 3*24*time.Hour + 12*time.Hour + 34*time.Minute + 56*time.Second + 780*time.Millisecond).Seconds(),
-		"P1DT2H":               (26 * time.Hour).Seconds(),
-		"P20M":                 (608 * 24 * time.Hour).Seconds(),
-		"PT20M":                (20 * time.Minute).Seconds(),
-		"P0Y20M0D":             (608 * 24 * time.Hour).Seconds(),
-		"P0Y":                  0,
-		"-P60D":                -(60 * 24 * time.Hour).Seconds(),
-		"PT1M30.5S":            (time.Minute + 30*time.Second + 500*time.Millisecond).Seconds(),
+		"PT0S":         0,
+		"PT1M":         60,
+		"PT2H":         7200,
+		"PT6M16S":      376,
+		"PT1.97S":      1.97,
+		"PT1H2M3.456S": 3723.456,
+		"P1DT2H":       (26 * time.Hour).Seconds(),
+		"PT20M":        (20 * time.Minute).Seconds(),
+		"-P60D":        -(60 * 24 * time.Hour).Seconds(),
+		"PT1M30.5S":    (time.Minute + 30*time.Second + 500*time.Millisecond).Seconds(),
 	}
 	for ins, ex := range in {
 		act, err := parseDuration(ins)