Time Parsing fix for #EXT-X-PROGRAM-DATE-TIME

reader.go

@@ -24,6 +24,12 @@ import (
 
 var reKeyValue = regexp.MustCompile(`([a-zA-Z_-]+)=("[^"]+"|[^",]+)`)
 
+// Allow globally apply and/or override Time Parser function.
+// Available variants:
+// 		* FullTimeParse - implements full featured ISO/IEC 8601:2004
+//		* StrictTimeParse - implements only RFC3339 Nanoseconds format
+var TimeParse func(value string) (time.Time, error) = FullTimeParse
+
 // Decode parses a master playlist passed from the buffer. If `strict`
 // parameter is true then it returns first syntax error.
 func (p *MasterPlaylist) Decode(data bytes.Buffer, strict bool) error {
@@ -501,9 +507,11 @@ func decodeLineOfMediaPlaylist(p *MediaPlaylist, wv *WV, state *decodingState, l
 	case !state.tagProgramDateTime && strings.HasPrefix(line, "#EXT-X-PROGRAM-DATE-TIME:"):
 		state.tagProgramDateTime = true
 		state.listType = MEDIA
-		if state.programDateTime, err = time.Parse(DATETIME, line[25:]); strict && err != nil {
+
+		if state.programDateTime, err = TimeParse(line[25:]); strict && err != nil {
 			return err
 		}
+
 	case !state.tagRange && strings.HasPrefix(line, "#EXT-X-BYTERANGE:"):
 		state.tagRange = true
 		state.listType = MEDIA
@@ -638,3 +646,27 @@ func decodeLineOfMediaPlaylist(p *MediaPlaylist, wv *WV, state *decodingState, l
 	}
 	return err
 }
+
+// Strict Time Wrapper implements RFC3339 with Nanoseconds accuracy
+func StrictTimeParse(value string) (time.Time, error) {
+	return time.Parse(DATETIME, value)
+}
+
+// Custom Time Parser implements ISO/IEC 8601:2004
+func FullTimeParse(value string) (time.Time, error) {
+	layouts := []string{
+		"2006-01-02T15:04:05.999999999Z0700",
+		"2006-01-02T15:04:05.999999999Z07:00",
+		"2006-01-02T15:04:05.999999999Z07",
+	}
+	var (
+		err error
+		t   time.Time
+	)
+	for _, layout := range layouts {
+		if t, err = time.Parse(layout, value); err == nil {
+			return t, nil
+		}
+	}
+	return t, err
+}

reader_test.go

@@ -296,6 +296,167 @@ func TestDecodeMediaPlaylistAutoDetectExtend(t *testing.T) {
 	}
 }
 
+// Tests for Time Parsing of EXT-X-PROGRAM-DATE-TIME
+// We testing ISO/IEC 8601:2004 where we can get time in UTC, UTC with Nanoseconds
+// timeZone in formats '±00:00', '±0000', '±00'
+// m3u8.FullTimeParse()
+func TestTimeLayoutsDecode(t *testing.T) {
+	time_in_utc := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05Z"
+	time_in_utc_nano := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05.123456789Z"
+	time_with_positive_zone_and_colon := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05+01:00"
+	time_with_positive_zone_no_colon := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05+0100"
+	time_with_positive_zone_2digits := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05+01"
+	time_with_negative_zone_and_colon := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05-01:00"
+	time_with_negative_zone_no_colon := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05-0100"
+	time_with_negative_zone_2digits := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05-01"
+
+	p, e := NewMediaPlaylist(1, 2)
+	if e != nil {
+		t.Fatalf("Create media playlist failed: %s", e)
+	}
+	state := new(decodingState)
+	wv := new(WV)
+
+	var err error
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_in_utc, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_in_utc, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_in_utc_nano, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_in_utc_nano, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_positive_zone_and_colon, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_with_positive_zone_and_colon, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_positive_zone_no_colon, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_with_positive_zone_no_colon, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_positive_zone_2digits, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_with_positive_zone_2digits, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_negative_zone_and_colon, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_with_negative_zone_and_colon, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_negative_zone_no_colon, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_with_negative_zone_no_colon, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_negative_zone_2digits, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_with_negative_zone_2digits, err)
+	}
+}
+
+// Tests for Time Parsing of EXT-X-PROGRAM-DATE-TIME
+// We testing Strict format of RFC3339 where we can get time in UTC, UTC with Nanoseconds
+// timeZone in formats '±00:00', '±0000', '±00'
+// m3u8.StrictTimeParse()
+func TestStrictTimeLayoutsDecode(t *testing.T) {
+
+	// Should Pass
+	time_in_utc := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05Z"
+	time_in_utc_nano := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05.123456789Z"
+	time_with_positive_zone_and_colon := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05+01:00"
+	time_with_negative_zone_and_colon := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05-01:00"
+
+	// Should Fail
+	time_with_positive_zone_no_colon := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05+0100"
+	time_with_positive_zone_2digits := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05+01"
+	time_with_negative_zone_no_colon := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05-0100"
+	time_with_negative_zone_2digits := "#EXT-X-PROGRAM-DATE-TIME:2006-01-02T15:04:05-01"
+
+	// Set TimeParse function to StrictTimeParse (RFC3339 Only)
+	TimeParse = StrictTimeParse
+
+	p, e := NewMediaPlaylist(1, 2)
+	if e != nil {
+		t.Fatalf("Create media playlist failed: %s", e)
+	}
+	state := new(decodingState)
+	wv := new(WV)
+
+	var err error
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_in_utc, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_in_utc, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_in_utc_nano, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_in_utc_nano, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_positive_zone_and_colon, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_with_positive_zone_and_colon, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_positive_zone_no_colon, true)
+	if err != nil {
+		t.Logf("Time Parser Error for %s: %s", time_with_positive_zone_no_colon, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_positive_zone_2digits, true)
+	if err != nil {
+		t.Logf("Time Parser Error for %s: %s", time_with_positive_zone_2digits, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_negative_zone_and_colon, true)
+	if err != nil {
+		t.Errorf("Time Parser Error for %s: %s", time_with_negative_zone_and_colon, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_negative_zone_no_colon, true)
+	if err != nil {
+		t.Logf("Time Parser Error for %s: %s", time_with_negative_zone_no_colon, err)
+	}
+
+	state = new(decodingState)
+	wv = new(WV)
+	err = decodeLineOfMediaPlaylist(p, wv, state, time_with_negative_zone_2digits, true)
+	if err != nil {
+		t.Logf("Time Parser Error for %s: %s", time_with_negative_zone_2digits, err)
+	}
+}
+
 /***************************
  *  Code parsing examples  *
  ***************************/

structure.go

@@ -31,8 +31,10 @@ const (
 		   o  The EXT-X-MEDIA tag.
 		   o  The AUDIO and VIDEO attributes of the EXT-X-STREAM-INF tag.
 	*/
-	minver   = uint8(3)
+	minver = uint8(3)
+
 	DATETIME = time.RFC3339Nano // Format for EXT-X-PROGRAM-DATE-TIME defined in section 3.4.5
+
 )
 
 type ListType uint