vtt: fix parsing of short times, fixes #4

Author: martinlindhe

ccdb.go

@@ -59,5 +59,5 @@ func NewFromCCDBCapture(s string) (res Subtitle, err error) {
 }
 
 func parseCCDBTime(s string) (time.Time, error) {
-	return parseTime(s)
+	return parseSrtTime(s)
 }

dcsub.go

@@ -54,10 +54,10 @@ func (parser *dcsubParser) traverse(n *parser.Node) (Subtitle, bool) {
 			parser.cap.Seq, _ = strconv.Atoi(p)
 		}
 		if p, ok := getAttribute(n, "timein"); ok {
-			parser.cap.Start, _ = parseTime(p)
+			parser.cap.Start, _ = parseSrtTime(p)
 		}
 		if p, ok := getAttribute(n, "timeout"); ok {
-			parser.cap.End, _ = parseTime(p)
+			parser.cap.End, _ = parseSrtTime(p)
 		}
 	}
 

srt.go

@@ -54,13 +54,13 @@ func NewFromSRT(s string) (res Subtitle, err error) {
 			break
 		}
 
-		o.Start, err = parseTime(matches[1])
+		o.Start, err = parseSrtTime(matches[1])
 		if err != nil {
 			err = fmt.Errorf("srt: start error at line %d: %v", i, err)
 			break
 		}
 
-		o.End, err = parseTime(matches[2])
+		o.End, err = parseSrtTime(matches[2])
 		if err != nil {
 			err = fmt.Errorf("srt: end error at line %d: %v", i, err)
 			break

srt_test.go

@@ -6,24 +6,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestParseTime(t *testing.T) {
-	t1, _ := parseTime("18:40:22.110")
-	t2, _ := parseTime("18:40:22,110")
-	t3, _ := parseTime("18:40:22:110")
-	t4, _ := parseTime("18:40:22")
-	t5, _ := parseTime("00:00:0,500")
-	t6, _ := parseTime("00:00:2,00")
-	t7, _ := parseTime("00:14:52.12")
-
-	assert.Equal(t, makeTime(18, 40, 22, 110), t1)
-	assert.Equal(t, makeTime(18, 40, 22, 110), t2)
-	assert.Equal(t, makeTime(18, 40, 22, 110), t3)
-	assert.Equal(t, makeTime(18, 40, 22, 0), t4)
-	assert.Equal(t, makeTime(0, 0, 0, 500), t5)
-	assert.Equal(t, makeTime(0, 0, 2, 0), t6)
-	assert.Equal(t, makeTime(0, 14, 52, 12), t7)
-}
-
 func TestNewFromSRT(t *testing.T) {
 	in := "1\n" +
 		"00:00:04,630 --> 00:00:06,018\n" +

time.go

@@ -13,8 +13,8 @@ func makeTime(h int, m int, s int, ms int) time.Time {
 	return time.Date(0, 1, 1, h, m, s, ms*1000*1000, time.UTC)
 }
 
-// parseTime parses a subtitle time (duration since start of film)
-func parseTime(in string) (time.Time, error) {
+// parseSrtTime parses a srt subtitle time (duration since start of film)
+func parseSrtTime(in string) (time.Time, error) {
 	// . and , to :
 	in = strings.Replace(in, ",", ":", -1)
 	in = strings.Replace(in, ".", ":", -1)
@@ -47,3 +47,39 @@ func parseTime(in string) (time.Time, error) {
 
 	return makeTime(h, m, s, ms), nil
 }
+
+// parseVttTime parses a VTT time (duration since start of film)
+// specification at https://www.w3.org/TR/webvtt1/#cue-timings-and-settings-parsing
+func parseVttTime(in string) (time.Time, error) {
+	// . and , to :
+	in = strings.Replace(in, ",", ":", -1)
+	in = strings.Replace(in, ".", ":", -1)
+
+	if strings.Count(in, ":") == 2 {
+		in = "00:" + in
+	}
+
+	r1 := regexp.MustCompile("([0-9]+):([0-9]+):([0-9]+):([0-9]+)")
+	matches := r1.FindStringSubmatch(in)
+	if len(matches) < 5 {
+		return time.Now(), fmt.Errorf("[vtt] Regexp didnt match: %s", in)
+	}
+	h, err := strconv.Atoi(matches[1])
+	if err != nil {
+		return time.Now(), err
+	}
+	m, err := strconv.Atoi(matches[2])
+	if err != nil {
+		return time.Now(), err
+	}
+	s, err := strconv.Atoi(matches[3])
+	if err != nil {
+		return time.Now(), err
+	}
+	ms, err := strconv.Atoi(matches[4])
+	if err != nil {
+		return time.Now(), err
+	}
+
+	return makeTime(h, m, s, ms), nil
+}

vtt.go

@@ -67,13 +67,13 @@ func NewFromVTT(s string) (res Subtitle, err error) {
 			break
 		}
 
-		o.Start, err = parseTime(matches[1])
+		o.Start, err = parseVttTime(matches[1])
 		if err != nil {
 			err = fmt.Errorf("vtt: start error at line %d: %v", i, err)
 			break
 		}
 
-		o.End, err = parseTime(matches[2])
+		o.End, err = parseVttTime(matches[2])
 		if err != nil {
 			err = fmt.Errorf("vtt: end error at line %d: %v", i, err)
 			break