Skip to content

Commit 77513ff

Browse files
martinlindhemartinlindhe
committed
export MakeTime
1 parent da526ac commit 77513ff

File tree

10 files changed

+74
-72
lines changed

10 files changed

+74
-72
lines changed

‎caps_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ func TestFilterCapitalization(t *testing.T) {
1010

1111
in := []Caption{{
1212
Seq: 1,
13-
Start: makeTime(0, 0, 4, 630),
14-
End: makeTime(0, 0, 6, 18),
13+
Start: MakeTime(0, 0, 4, 630),
14+
End: MakeTime(0, 0, 6, 18),
1515
Text: []string{"GO NINJA!", "NINJA GO!"},
1616
}}
1717

1818
expected := []Caption{{
1919
1,
20-
makeTime(0, 0, 4, 630),
21-
makeTime(0, 0, 6, 18),
20+
MakeTime(0, 0, 4, 630),
21+
MakeTime(0, 0, 6, 18),
2222
[]string{"Go ninja!", "Ninja go!"},
2323
}}
2424

‎caption_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ func TestRenderTime(t *testing.T) {
1010

1111
cap := Caption{
1212
1,
13-
makeTime(18, 40, 22, 110),
14-
makeTime(18, 41, 20, 123),
13+
MakeTime(18, 40, 22, 110),
14+
MakeTime(18, 41, 20, 123),
1515
[]string{"<i>Go ninja!</i>"},
1616
}
1717

‎cleaner_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@ func TestRemoveAds(t *testing.T) {
1010

1111
in := []Caption{{
1212
1,
13-
makeTime(0, 0, 4, 630),
14-
makeTime(0, 0, 6, 18),
13+
MakeTime(0, 0, 4, 630),
14+
MakeTime(0, 0, 6, 18),
1515
[]string{"Go ninja!"},
1616
}, {
1717
2,
18-
makeTime(0, 1, 9, 630),
19-
makeTime(0, 1, 11, 005),
18+
MakeTime(0, 1, 9, 630),
19+
MakeTime(0, 1, 11, 005),
2020
[]string{"Subtitles By MrCool"},
2121
}, {
2222
3,
23-
makeTime(0, 1, 9, 630),
24-
makeTime(0, 1, 11, 005),
23+
MakeTime(0, 1, 9, 630),
24+
MakeTime(0, 1, 11, 005),
2525
[]string{"No ninja!"},
2626
}}
2727

2828
expected := []Caption{{
2929
1,
30-
makeTime(0, 0, 4, 630),
31-
makeTime(0, 0, 6, 18),
30+
MakeTime(0, 0, 4, 630),
31+
MakeTime(0, 0, 6, 18),
3232
[]string{"Go ninja!"},
3333
}, {
3434
2,
35-
makeTime(0, 1, 9, 630),
36-
makeTime(0, 1, 11, 005),
35+
MakeTime(0, 1, 9, 630),
36+
MakeTime(0, 1, 11, 005),
3737
[]string{"No ninja!"},
3838
}}
3939

‎html_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ func TestFilterHTML(t *testing.T) {
1010

1111
in := []Caption{{
1212
1,
13-
makeTime(0, 0, 4, 630),
14-
makeTime(0, 0, 6, 18),
13+
MakeTime(0, 0, 4, 630),
14+
MakeTime(0, 0, 6, 18),
1515
[]string{"<b>GO NINJA!</b>", "NINJA&nbsp;GO!"},
1616
}}
1717

1818
expected := []Caption{{
1919
1,
20-
makeTime(0, 0, 4, 630),
21-
makeTime(0, 0, 6, 18),
20+
MakeTime(0, 0, 4, 630),
21+
MakeTime(0, 0, 6, 18),
2222
[]string{"GO NINJA!", "NINJA GO!"},
2323
}}
2424

‎srt.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func ParseTime(in string) (time.Time, error) {
126126
return time.Now(), err
127127
}
128128

129-
return makeTime(h, m, s, ms), nil
129+
return MakeTime(h, m, s, ms), nil
130130
}
131131

132132
// writeSrt prints a srt render to outFileName

‎srt_test.go

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ func TestParseTime(t *testing.T) {
1616
t6, _ := ParseTime("00:00:2,00")
1717
t7, _ := ParseTime("00:14:52.12")
1818

19-
assert.Equal(t, makeTime(18, 40, 22, 110), t1)
20-
assert.Equal(t, makeTime(18, 40, 22, 110), t2)
21-
assert.Equal(t, makeTime(18, 40, 22, 110), t3)
22-
assert.Equal(t, makeTime(18, 40, 22, 0), t4)
23-
assert.Equal(t, makeTime(0, 0, 0, 500), t5)
24-
assert.Equal(t, makeTime(0, 0, 2, 0), t6)
25-
assert.Equal(t, makeTime(0, 14, 52, 12), t7)
19+
assert.Equal(t, MakeTime(18, 40, 22, 110), t1)
20+
assert.Equal(t, MakeTime(18, 40, 22, 110), t2)
21+
assert.Equal(t, MakeTime(18, 40, 22, 110), t3)
22+
assert.Equal(t, MakeTime(18, 40, 22, 0), t4)
23+
assert.Equal(t, MakeTime(0, 0, 0, 500), t5)
24+
assert.Equal(t, MakeTime(0, 0, 2, 0), t6)
25+
assert.Equal(t, MakeTime(0, 14, 52, 12), t7)
2626
}
2727

2828
func TestParseSrt(t *testing.T) {
@@ -42,18 +42,18 @@ func TestParseSrt(t *testing.T) {
4242

4343
expected := []Caption{{
4444
1,
45-
makeTime(0, 0, 4, 630),
46-
makeTime(0, 0, 6, 18),
45+
MakeTime(0, 0, 4, 630),
46+
MakeTime(0, 0, 6, 18),
4747
[]string{"Go ninja!"},
4848
}, {
4949
2,
50-
makeTime(0, 0, 10, 0),
51-
makeTime(0, 0, 11, 0),
50+
MakeTime(0, 0, 10, 0),
51+
MakeTime(0, 0, 11, 0),
5252
[]string{"Subtitles By MrCool"},
5353
}, {
5454
3,
55-
makeTime(0, 1, 9, 630),
56-
makeTime(0, 1, 11, 005),
55+
MakeTime(0, 1, 9, 630),
56+
MakeTime(0, 1, 11, 005),
5757
[]string{"No ninja!"},
5858
}}
5959

@@ -72,13 +72,13 @@ func TestParseSrtWithMacLinebreaks(t *testing.T) {
7272

7373
expected := []Caption{{
7474
1,
75-
makeTime(0, 0, 4, 630),
76-
makeTime(0, 0, 6, 18),
75+
MakeTime(0, 0, 4, 630),
76+
MakeTime(0, 0, 6, 18),
7777
[]string{"Go ninja!"},
7878
}, {
7979
2,
80-
makeTime(0, 1, 9, 630),
81-
makeTime(0, 1, 11, 005),
80+
MakeTime(0, 1, 9, 630),
81+
MakeTime(0, 1, 11, 005),
8282
[]string{"No ninja!"},
8383
}}
8484

@@ -103,13 +103,13 @@ func TestParseSrtSkipEmpty(t *testing.T) {
103103

104104
expected := []Caption{{
105105
1,
106-
makeTime(0, 0, 4, 630),
107-
makeTime(0, 0, 6, 18),
106+
MakeTime(0, 0, 4, 630),
107+
MakeTime(0, 0, 6, 18),
108108
[]string{"Go ninja!"},
109109
}, {
110110
2,
111-
makeTime(0, 1, 9, 630),
112-
makeTime(0, 1, 11, 005),
111+
MakeTime(0, 1, 9, 630),
112+
MakeTime(0, 1, 11, 005),
113113
[]string{"No ninja!"},
114114
}}
115115

@@ -125,8 +125,8 @@ func TestParseSrtCrlf(t *testing.T) {
125125

126126
expected := []Caption{{
127127
1,
128-
makeTime(0, 0, 4, 630),
129-
makeTime(0, 0, 6, 18),
128+
MakeTime(0, 0, 4, 630),
129+
MakeTime(0, 0, 6, 18),
130130
[]string{"Go ninja!"},
131131
}}
132132

@@ -145,8 +145,8 @@ func TestParseExtraLineBreak(t *testing.T) {
145145

146146
expected := []Caption{{
147147
1,
148-
makeTime(0, 0, 4, 630),
149-
makeTime(0, 0, 6, 18),
148+
MakeTime(0, 0, 4, 630),
149+
MakeTime(0, 0, 6, 18),
150150
[]string{"Go ninja!"},
151151
}}
152152

@@ -161,8 +161,8 @@ func TestParseWierdTimestamp(t *testing.T) {
161161

162162
expected := []Caption{{
163163
1,
164-
makeTime(0, 14, 52, 0),
165-
makeTime(0, 14, 57, 500),
164+
MakeTime(0, 14, 52, 0),
165+
MakeTime(0, 14, 57, 500),
166166
[]string{"Go ninja!"},
167167
}}
168168

@@ -181,13 +181,13 @@ func TestRenderSrt(t *testing.T) {
181181

182182
in := []Caption{{
183183
1,
184-
makeTime(0, 0, 4, 630),
185-
makeTime(0, 0, 6, 18),
184+
MakeTime(0, 0, 4, 630),
185+
MakeTime(0, 0, 6, 18),
186186
[]string{"Go ninja!"},
187187
}, {
188188
2,
189-
makeTime(0, 1, 9, 630),
190-
makeTime(0, 1, 11, 005),
189+
MakeTime(0, 1, 9, 630),
190+
MakeTime(0, 1, 11, 005),
191191
[]string{"No ninja!"},
192192
}}
193193

@@ -201,8 +201,8 @@ func TestParseLatin1Srt(t *testing.T) {
201201

202202
expected := []Caption{{
203203
1,
204-
makeTime(0, 14, 52, 0),
205-
makeTime(0, 14, 57, 500),
204+
MakeTime(0, 14, 52, 0),
205+
MakeTime(0, 14, 57, 500),
206206
[]string{"Hallå ninja!"},
207207
}}
208208

@@ -230,8 +230,8 @@ func TestParseUTF16BESrt(t *testing.T) {
230230

231231
expected := []Caption{{
232232
1,
233-
makeTime(0, 0, 0, 0),
234-
makeTime(0, 0, 0, 1),
233+
MakeTime(0, 0, 0, 0),
234+
MakeTime(0, 0, 0, 1),
235235
[]string{"Test"},
236236
}}
237237

@@ -259,8 +259,8 @@ func TestParseUTF16LESrt(t *testing.T) {
259259

260260
expected := []Caption{{
261261
1,
262-
makeTime(0, 0, 0, 0),
263-
makeTime(0, 0, 0, 1),
262+
MakeTime(0, 0, 0, 0),
263+
MakeTime(0, 0, 0, 1),
264264
[]string{"Test"},
265265
}}
266266

@@ -288,8 +288,8 @@ func TestParseUTF8BomSrt(t *testing.T) {
288288

289289
expected := []Caption{{
290290
1,
291-
makeTime(0, 0, 0, 0),
292-
makeTime(0, 0, 0, 1),
291+
MakeTime(0, 0, 0, 0),
292+
MakeTime(0, 0, 0, 1),
293293
[]string{"Test"},
294294
}}
295295

‎ssa.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,5 @@ func parseSsaTime(in string) (time.Time, error) {
152152
return time.Now(), err
153153
}
154154

155-
return makeTime(h, m, s, cs*10), nil
155+
return MakeTime(h, m, s, cs*10), nil
156156
}

‎ssa_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ func TestParseSsa(t *testing.T) {
1515

1616
expected := []Caption{{
1717
1,
18-
makeTime(0, 1, 6, 370),
19-
makeTime(0, 1, 8, 40),
18+
MakeTime(0, 1, 6, 370),
19+
MakeTime(0, 1, 8, 40),
2020
[]string{"Honey, I'm home!"},
2121
}, {
2222
2,
23-
makeTime(0, 1, 9, 50),
24-
makeTime(0, 1, 10, 690),
23+
MakeTime(0, 1, 9, 50),
24+
MakeTime(0, 1, 10, 690),
2525
[]string{"Hi.", "- Hi, love."},
2626
}}
2727

@@ -38,7 +38,7 @@ func TestParseSsaFormat(t *testing.T) {
3838
func TestParseSsaTime(t *testing.T) {
3939

4040
t1, _ := parseSsaTime("0:01:06.37")
41-
assert.Equal(t, makeTime(0, 1, 6, 370), t1)
41+
assert.Equal(t, MakeTime(0, 1, 6, 370), t1)
4242
}
4343

4444
func TestColumnCountFromSsaFormat(t *testing.T) {

‎testextras.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package subtitles
33
import (
44
"fmt"
55
"io/ioutil"
6-
"time"
76
)
87

98
const tempFilePrefix = "moviehash-temp"
@@ -16,11 +15,6 @@ func check(e error) {
1615
}
1716
}
1817

19-
func makeTime(h int, m int, s int, ms int) time.Time {
20-
21-
return time.Date(0, 1, 1, h, m, s, ms*1000*1000, time.UTC)
22-
}
23-
2418
func createTempFile(byteSize int) string {
2519

2620
data := make([]byte, byteSize)

‎time.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package subtitles
2+
3+
import "time"
4+
5+
// MakeTime is a helper to create a subtitle duration
6+
func MakeTime(h int, m int, s int, ms int) time.Time {
7+
return time.Date(0, 1, 1, h, m, s, ms*1000*1000, time.UTC)
8+
}

0 commit comments

Comments
 (0)