Moved html escaping to subtitles.go and updated tests

srt.go

@@ -202,10 +202,9 @@ func parseTextSrt(i string) (o Line) {
 				}
 
 				// Append item
-				s = unescapeWebVTT(s)
 				o.Items = append(o.Items, LineItem{
 					InlineStyle: sa,
-					Text:        s,
+					Text:        unescapeHTML(s),
 				})
 			}
 		}
@@ -306,7 +305,7 @@ func (li LineItem) srtBytes() (c []byte) {
 	if pos != 0 {
 		c = append(c, []byte(fmt.Sprintf(`{\an%d}`, pos))...)
 	}
-	c = append(c, []byte(escapeWebVTT(li.Text))...)
+	c = append(c, []byte(escapeHTML(li.Text))...)
 	if u {
 		c = append(c, []byte("</u>")...)
 	}

srt_test.go

@@ -127,24 +127,3 @@ func TestSRTStyled(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, string(c), w.String())
 }
-
-func TestSRTHTMLEntity(t *testing.T) {
-	s, err := astisub.OpenFile("./testdata/example-in-html-entity.srt")
-	assert.NoError(t, err)
-
-	//Write to srt
-	w := &bytes.Buffer{}
-	c, err := os.ReadFile("./testdata/example-in-html-entity.srt")
-	assert.NoError(t, err)
-	err = s.WriteToSRT(w)
-	assert.NoError(t, err)
-	assert.Equal(t, string(c), w.String())
-
-	//Write WebVTT
-	w = &bytes.Buffer{}
-	c, err = os.ReadFile("./testdata/example-out-html-entity.vtt")
-	assert.NoError(t, err)
-	err = s.WriteToWebVTT(w)
-	assert.NoError(t, err)
-	assert.Equal(t, string(c), w.String())
-}

subtitles.go

@@ -48,6 +48,12 @@ var (
 	ErrNoSubtitlesToWrite = errors.New("astisub: no subtitles to write")
 )
 
+// HTML Escape
+var (
+	htmlEscaper   = strings.NewReplacer("astisub.amp", "&")
+	htmlUnescaper = strings.NewReplacer("&", "astisub.amp")
+)
+
 // Now allows testing functions using it
 var Now = func() time.Time {
 	return time.Now()
@@ -913,3 +919,11 @@ func htmlTokenAttribute(t *html.Token, key string) *string {
 
 	return nil
 }
+
+func escapeHTML(i string) string {
+	return htmlEscaper.Replace(i)
+}
+
+func unescapeHTML(i string) string {
+	return htmlUnescaper.Replace(i)
+}

subtitles_test.go

@@ -1,6 +1,8 @@
 package astisub_test
 
 import (
+	"bytes"
+	"os"
 	"testing"
 	"time"
 
@@ -301,3 +303,43 @@ func TestSubtitles_ApplyLinearCorrection(t *testing.T) {
 	require.Equal(t, 11*time.Second, s.Items[2].StartAt)
 	require.Equal(t, 15500*time.Millisecond, s.Items[2].EndAt)
 }
+
+func TestHTMLEntity(t *testing.T) {
+	testHTMLEntity(t, "srt")
+	testHTMLEntity(t, "vtt")
+}
+
+func testHTMLEntity(t *testing.T, extension string) {
+	// Read input with entities
+	s, err := astisub.OpenFile("./testdata/example-in-html-entities." + extension)
+	assert.NoError(t, err)
+
+	assert.Len(t, s.Items, 3)
+	assert.Equal(t, 331*time.Millisecond, s.Items[0].StartAt)
+	assert.Equal(t, 3*time.Second+750*time.Millisecond, s.Items[0].EndAt)
+	assert.Equal(t, "The man in black fled across the desert, astisub.ampnbsp;", s.Items[0].Lines[0].String())
+	assert.Equal(t, "astisub.ampamp; the gunslinger followed.", s.Items[0].Lines[1].String())
+	assert.Equal(t, 4*time.Second+101*time.Millisecond, s.Items[1].StartAt)
+	assert.Equal(t, 5*time.Second+430*time.Millisecond, s.Items[1].EndAt)
+	assert.Equal(t, "Go,astisub.ampnbsp;then,", s.Items[1].Lines[0].String())
+	assert.Equal(t, 6*time.Second+331*time.Millisecond, s.Items[2].StartAt)
+	assert.Equal(t, 9*time.Second+675*time.Millisecond, s.Items[2].EndAt)
+	assert.Equal(t, "there are other astisub.amplt; worlds than these.", s.Items[2].Lines[0].String())
+
+	//Write to srt
+	w := &bytes.Buffer{}
+	c, err := os.ReadFile("./testdata/example-out-html-entities.srt")
+	assert.NoError(t, err)
+	err = s.WriteToSRT(w)
+	assert.NoError(t, err)
+	assert.Equal(t, string(c), w.String())
+
+	//Write WebVTT
+	w = &bytes.Buffer{}
+	c, err = os.ReadFile("./testdata/example-out-html-entities.vtt")
+	assert.NoError(t, err)
+	err = s.WriteToWebVTT(w)
+	assert.NoError(t, err)
+	assert.Equal(t, string(c), w.String())
+
+}

testdata/example-in-html-entity.srt → testdata/example-in-html-entities.srt

@@ -5,8 +5,8 @@ The man in black fled across the desert,  
 
 2
 00:00:04,101 --> 00:00:05,430
-Go, then,  
+Go, then,
 
 3
 00:00:06,331 --> 00:00:09,675
-there are other worlds than these.  
+there are other < worlds than these.

testdata/example-out-html-entity.vtt → testdata/example-in-html-entities.vtt

@@ -7,8 +7,8 @@ The man in black fled across the desert,  
 
 2
 00:00:04.101 --> 00:00:05.430
-Go, then,  
+Go, then,
 
 3
 00:00:06.331 --> 00:00:09.675
-there are other worlds than these.  
+there are other < worlds than these.

testdata/example-out-html-entities.srt

@@ -0,0 +1,12 @@
+1
+00:00:00,331 --> 00:00:03,750
+The man in black fled across the desert,  
+& the gunslinger followed.
+
+2
+00:00:04,101 --> 00:00:05,430
+Go, then,
+
+3
+00:00:06,331 --> 00:00:09,675
+there are other < worlds than these.

testdata/example-out-html-entities.vtt

@@ -0,0 +1,14 @@
+WEBVTT
+
+1
+00:00:00.331 --> 00:00:03.750
+The man in black fled across the desert,  
+& the gunslinger followed.
+
+2
+00:00:04.101 --> 00:00:05.430
+Go, then,
+
+3
+00:00:06.331 --> 00:00:09.675
+there are other < worlds than these.

webvtt.go

@@ -36,8 +36,6 @@ var (
 	bytesWebVTTTimeBoundariesSeparator = []byte(webvttTimeBoundariesSeparator)
 	webVTTRegexpInlineTimestamp        = regexp.MustCompile(`<((?:\d{2,}:)?\d{2}:\d{2}\.\d{3})>`)
 	webVTTRegexpTag                    = regexp.MustCompile(`(</*\s*([^\.\s]+)(\.[^\s/]*)*\s*([^/]*)\s*/*>)`)
-	webVTTEscaper                      = strings.NewReplacer("astisub.amp", "&")
-	webVTTUnescaper                    = strings.NewReplacer("&", "astisub.amp")
 )
 
 // parseDurationWebVTT parses a .vtt duration
@@ -331,14 +329,6 @@ func ReadFromWebVTT(i io.Reader) (o *Subtitles, err error) {
 	return
 }
 
-func escapeWebVTT(i string) string {
-	return webVTTEscaper.Replace(i)
-}
-
-func unescapeWebVTT(i string) string {
-	return webVTTUnescaper.Replace(i)
-}
-
 // parseTextWebVTT parses the input line to fill the Line
 func parseTextWebVTT(i string) (o Line) {
 	// Create tokenizer
@@ -421,7 +411,7 @@ func parseTextWebVTTTextToken(sa *StyleAttributes, line string) (ret []LineItem)
 		if s := strings.TrimSpace(line); s != "" {
 			return []LineItem{{
 				InlineStyle: sa,
-				Text:        unescapeWebVTT(s),
+				Text:        unescapeHTML(s),
 			}}
 		}
 		return
@@ -431,7 +421,7 @@ func parseTextWebVTTTextToken(sa *StyleAttributes, line string) (ret []LineItem)
 	if s := strings.TrimSpace(line[:indexes[0][0]]); s != "" {
 		ret = append(ret, LineItem{
 			InlineStyle: sa,
-			Text:        unescapeWebVTT(s),
+			Text:        unescapeHTML(s),
 		})
 	}
 
@@ -455,7 +445,7 @@ func parseTextWebVTTTextToken(sa *StyleAttributes, line string) (ret []LineItem)
 		ret = append(ret, LineItem{
 			InlineStyle: sa,
 			StartAt:     t,
-			Text:        unescapeWebVTT(s),
+			Text:        unescapeHTML(s),
 		})
 	}
 
@@ -671,7 +661,7 @@ func (li LineItem) webVTTBytes() (c []byte) {
 			c = append(c, []byte(tag.startTag())...)
 		}
 	}
-	c = append(c, []byte(escapeWebVTT(li.Text))...)
+	c = append(c, []byte(escapeHTML(li.Text))...)
 	if li.InlineStyle != nil {
 		noTags := len(li.InlineStyle.WebVTTTags)
 		for i := noTags - 1; i >= 0; i-- {

webvtt_test.go

@@ -145,37 +145,6 @@ Evening.
 `, b.String())
 }
 
-func TestWebVTTEscape(t *testing.T) {
-	testData := `WEBVTT
-
-	00:01:00.000 --> 00:02:00.000
-	Sentence with an & in the middle
-
-	00:02:00.000 --> 00:03:00.000
-	Sentence with an < in the middle`
-
-	s, err := astisub.ReadFromWebVTT(strings.NewReader(testData))
-	require.NoError(t, err)
-
-	require.Len(t, s.Items, 2)
-	require.Equal(t, "Sentence with an astisub.ampamp; in the middle", s.Items[0].String())
-	require.Equal(t, "Sentence with an astisub.amplt; in the middle", s.Items[1].String())
-
-	b := &bytes.Buffer{}
-	err = s.WriteToWebVTT(b)
-	require.NoError(t, err)
-	require.Equal(t, `WEBVTT
-
-1
-00:01:00.000 --> 00:02:00.000
-Sentence with an & in the middle
-
-2
-00:02:00.000 --> 00:03:00.000
-Sentence with an < in the middle
-`, b.String())
-}
-
 func TestWebVTTTags(t *testing.T) {
 	testData := `WEBVTT