From 3cb145cf101afcb01927a87d4865927fe892ad95 Mon Sep 17 00:00:00 2001 From: tramhao Date: Wed, 3 Mar 2021 01:56:04 +0800 Subject: [PATCH] lyric-test works with lrc file --- lyric/lyric.go | 1 + lyric/lyric_test.go | 7 +- lyric/sample-clean.lrc | 94 +++++++++++++++++++++++ lyric/sample-clean.srt | 158 --------------------------------------- lyric/sample-unclean.lrc | 3 + lyric/sample-unclean.srt | 3 - 6 files changed, 101 insertions(+), 165 deletions(-) create mode 100644 lyric/sample-clean.lrc delete mode 100644 lyric/sample-clean.srt create mode 100644 lyric/sample-unclean.lrc delete mode 100644 lyric/sample-unclean.srt diff --git a/lyric/lyric.go b/lyric/lyric.go index 24569ad..946cbc5 100644 --- a/lyric/lyric.go +++ b/lyric/lyric.go @@ -68,6 +68,7 @@ func cleanHTML(input string) string { // delete heading tag re := regexp.MustCompile(`^

.*`) content = re.ReplaceAllString(content, "") + content = strings.ReplaceAll(content, "\r\n", "") content = strings.ReplaceAll(content, "\n", "") content = strings.ReplaceAll(content, "
", "\n") // remove non-utf8 character diff --git a/lyric/lyric_test.go b/lyric/lyric_test.go index 332165d..9f9cfb7 100644 --- a/lyric/lyric_test.go +++ b/lyric/lyric_test.go @@ -4,18 +4,17 @@ import ( "io/ioutil" "testing" - "github.com/martinlindhe/subtitles" "github.com/stretchr/testify/assert" ) func TestCleanHTML(t *testing.T) { - clean, err := ioutil.ReadFile("./sample-clean.srt") + clean, err := ioutil.ReadFile("./sample-clean.lrc") if err != nil { t.Error(err) } - unclean, err := ioutil.ReadFile("./sample-unclean.srt") + unclean, err := ioutil.ReadFile("./sample-unclean.lrc") if err != nil { t.Error(err) } @@ -24,7 +23,7 @@ func TestCleanHTML(t *testing.T) { assert.Equal(t, string(clean), got) - _, err = subtitles.NewFromSRT(got) + _, err = NewFromLRC(got) if err != nil { t.Error(err) } diff --git a/lyric/sample-clean.lrc b/lyric/sample-clean.lrc new file mode 100644 index 0000000..cd351c1 --- /dev/null +++ b/lyric/sample-clean.lrc @@ -0,0 +1,94 @@ +[00:00.00]by RentAnAdviser.com +[00:00.00] +[00:15.91]We were both young when I first saw you +[00:19.81] +[00:19.91]I close my eyes and the flashback starts +[00:23.41] +[00:23.52]I am standing there +[00:25.72] +[00:26.70]On a balcony in summer air +[00:30.20] +[00:32.11]See the lights see the party the ball gowns +[00:36.11] +[00:36.20]See you make your way through the crowd +[00:39.70] +[00:39.82]And say Hello +[00:41.41] +[00:43.22]le did I know +[00:46.32] +[00:47.92]That you were Romeo you were throwing pebbles +[00:51.92] +[00:52.01]And my daddy said Stay away from Juliet +[00:55.61] +[00:55.71]And I was crying on the staircase +[00:58.40] +[00:58.50]Begging you Please don′t go and I said +[01:04.60] +[01:04.72]Romeo take me somewhere we can be alone +[01:08.72] +[01:08.80]I will be waiting all there′s left to do is run +[01:12.50] +[01:12.62]You′ll be the prince and I will be the princess +[01:16.62] +[01:16.71]It is a love story baby just say Yes +[01:21.91] +[01:24.02]So I sneak out to the garden to see you +[01:28.41] +[01:28.51]We keep quiet ′cause We are dead if they knew +[01:32.01] +[01:32.11]So close your eyes +[01:34.70] +[01:34.91]Escape this town for a le while oh oh +[01:40.11] +[01:40.22]′Cause you were Romeo I was a scarlet letter +[01:44.31] +[01:44.42]And my daddy said Stay away from Juliet +[01:47.92] +[01:48.02]But you were everything to me +[01:50.62] +[01:50.71]I was begging you Please don′t go and I said +[01:57.11] +[01:57.22]Romeo take me somewhere we can be alone +[02:01.12] +[02:01.22]I will be waiting all there′s left to do is run +[02:05.02] +[02:05.12]You′ll be the prince and I will be the princess +[02:09.02] +[02:09.12]It is a love story baby just say Yes +[02:13.02] +[02:13.11]Romeo save me They are trying to tell me how to feel +[02:17.01] +[02:17.12]This love is difficult but It is real +[02:21.02] +[02:21.11]Don′t be afraid we′ll make it out of this mess +[02:25.11] +[02:25.22]It is a love story baby just say Yes +[02:30.12] +[02:44.21]And I got tired of waiting +[02:48.11] +[02:48.42]Wondering if you were ever coming around +[02:52.02] +[02:52.11]My faith in you was fading +[02:56.81] +[02:56.92]When I met you on the outskirts of town +[03:00.12] +[03:00.21]And I said Romeo save me I have been feeling so alone +[03:05.50] +[03:05.61]I keep waiting for you but you never come +[03:09.41] +[03:09.51]Is this in my head I don′t know what to think +[03:12.91] +[03:13.01]He knelt to the ground and pulled out a ring and said +[03:17.51] +[03:17.61]Marry me Juliet you′ll never have to be alone +[03:21.51] +[03:21.61]I love you and that′s all I really know +[03:25.61] +[03:25.71]I talked to your dad go pick out a white dress +[03:29.60] +[03:29.71]It is a love story baby just say ′Yes′ +[03:36.41] +[03:45.61]′Cause we were both young when I first saw you +[03:51.81] +[03:52.81]by RentAnAdviser.com +[04:01.81] diff --git a/lyric/sample-clean.srt b/lyric/sample-clean.srt deleted file mode 100644 index fc9f320..0000000 --- a/lyric/sample-clean.srt +++ /dev/null @@ -1,158 +0,0 @@ - -0 -00:00:00,000 --> 00:00:00,000 -by RentAnAdviser.com - -1 -00:00:10,005 --> 00:00:12,604 -Take take it easy word to 94 - -2 -00:00:12,716 --> 00:00:16,215 -I got twenty four hours, -twenty four hours - -3 -00:00:16,303 --> 00:00:19,402 -Twenty four ***s in the hotel tower - -4 -00:00:19,514 --> 00:00:22,613 -Twenty four ******* on -the guest list yeah - -5 -00:00:22,717 --> 00:00:26,116 -Twenty four carats on -my necklace yeah - -6 -00:00:26,202 --> 00:00:29,101 -Twenty four hours twenty four hours - -7 -00:00:29,203 --> 00:00:32,402 -Twenty four ***s in the hotel tower - -8 -00:00:32,516 --> 00:00:35,515 -Twenty four ******* on -the guest list yeah - -9 -00:00:35,615 --> 00:00:38,914 -Twenty four carats on -my necklace yeah - -10 -00:00:39,000 --> 00:00:42,199 -Ballin like I am Kobe Swish, -2 4 on my jersey - -11 -00:00:42,313 --> 00:00:45,312 -I stay with the homies they -pop out if you hurt me - -12 -00:00:45,404 --> 00:00:48,603 -I might cop a Rollie for all -the ***s who curved me - -13 -00:00:48,709 --> 00:00:51,908 -When I pull up swervin′ that′s -that Lamborghini Mercy - -14 -00:00:52,018 --> 00:00:55,117 -I might do the dash goin fast -in the coupe In the coupe - -15 -00:00:55,211 --> 00:00:58,310 -I have been gettin cash all my racks -lookin blue Lookin blue - -16 -00:00:58,402 --> 00:01:01,401 -Chains gon splash when -I smash in the pool - -17 -00:01:01,517 --> 00:01:04,716 -Yeah I don′t take no nap, -I be stackin two to two - -18 -00:01:04,804 --> 00:01:08,003 -I am mixin with the cup she just -put somethin in my water - -19 -00:01:08,107 --> 00:01:11,206 -Three shots ain′t enough my -shorty pour me up stronger - -20 -00:01:11,318 --> 00:01:14,517 -We just got the addy -and she on one too - -21 -00:01:14,617 --> 00:01:17,816 -We pull up with baddies -to the hotel room - -22 -00:01:17,904 --> 00:01:21,003 -I got twenty four hours, -twenty four hours - -23 -00:01:21,109 --> 00:01:24,208 -Twenty four ***s in the hotel tower - -24 -00:01:24,304 --> 00:01:27,603 -Twenty four ******* on the guest -list yeah Guest list yeah - -25 -00:01:27,705 --> 00:01:30,804 -Twenty four carats on my necklace, -yeah Necklace yeah - -26 -00:01:30,902 --> 00:01:33,901 -Twenty four hours twenty four hours - -27 -00:01:34,009 --> 00:01:37,208 -Twenty four ***s in the hotel tower - -28 -00:01:37,314 --> 00:01:40,413 -Twenty four ******* on the guest -list yeah Guest list yeah - -29 -00:01:40,515 --> 00:01:44,614 -Twenty four carats on my necklace, -yeah Necklace yeah - -30 -00:01:47,002 --> 00:01:50,901 -Twenty four hours twenty four hours - -31 -00:01:53,715 --> 00:01:58,814 -Twenty four hours twenty -four hours yeah - -32 -00:01:59,814 --> 00:02:08,813 -by RentAnAdviser.com - - - diff --git a/lyric/sample-unclean.lrc b/lyric/sample-unclean.lrc new file mode 100644 index 0000000..c916bae --- /dev/null +++ b/lyric/sample-unclean.lrc @@ -0,0 +1,3 @@ +

Taylor Swift - Love Story (Taylor's Version) (Official Lyric Video) Lyrics (.LRC) Advanced

+[00:00.00]by RentAnAdviser.com
[00:00.00]
[00:15.91]We were both young when I first saw you
[00:19.81]
[00:19.91]I close my eyes and the flashback starts
[00:23.41]
[00:23.52]I am standing there
[00:25.72]
[00:26.70]On a balcony in summer air
[00:30.20]
[00:32.11]See the lights see the party the ball gowns
[00:36.11]
[00:36.20]See you make your way through the crowd
[00:39.70]
[00:39.82]And say Hello
[00:41.41]
[00:43.22]le did I know
[00:46.32]
[00:47.92]That you were Romeo you were throwing pebbles
[00:51.92]
[00:52.01]And my daddy said Stay away from Juliet
[00:55.61]
[00:55.71]And I was crying on the staircase
[00:58.40]
[00:58.50]Begging you Please don′t go and I said
[01:04.60]
[01:04.72]Romeo take me somewhere we can be alone
[01:08.72]
[01:08.80]I will be waiting all there′s left to do is run
[01:12.50]
[01:12.62]You′ll be the prince and I will be the princess
[01:16.62]
[01:16.71]It is a love story baby just say Yes
[01:21.91]
[01:24.02]So I sneak out to the garden to see you
[01:28.41]
[01:28.51]We keep quiet ′cause We are dead if they knew
[01:32.01]
[01:32.11]So close your eyes
[01:34.70]
[01:34.91]Escape this town for a le while oh oh
[01:40.11]
[01:40.22]′Cause you were Romeo I was a scarlet letter
[01:44.31]
[01:44.42]And my daddy said Stay away from Juliet
[01:47.92]
[01:48.02]But you were everything to me
[01:50.62]
[01:50.71]I was begging you Please don′t go and I said
[01:57.11]
[01:57.22]Romeo take me somewhere we can be alone
[02:01.12]
[02:01.22]I will be waiting all there′s left to do is run
[02:05.02]
[02:05.12]You′ll be the prince and I will be the princess
[02:09.02]
[02:09.12]It is a love story baby just say Yes
[02:13.02]
[02:13.11]Romeo save me They are trying to tell me how to feel
[02:17.01]
[02:17.12]This love is difficult but It is real
[02:21.02]
[02:21.11]Don′t be afraid we′ll make it out of this mess
[02:25.11]
[02:25.22]It is a love story baby just say Yes
[02:30.12]
[02:44.21]And I got tired of waiting
[02:48.11]
[02:48.42]Wondering if you were ever coming around
[02:52.02]
[02:52.11]My faith in you was fading
[02:56.81]
[02:56.92]When I met you on the outskirts of town
[03:00.12]
[03:00.21]And I said Romeo save me I have been feeling so alone
[03:05.50]
[03:05.61]I keep waiting for you but you never come
[03:09.41]
[03:09.51]Is this in my head I don′t know what to think
[03:12.91]
[03:13.01]He knelt to the ground and pulled out a ring and said
[03:17.51]
[03:17.61]Marry me Juliet you′ll never have to be alone
[03:21.51]
[03:21.61]I love you and that′s all I really know
[03:25.61]
[03:25.71]I talked to your dad go pick out a white dress
[03:29.60]
[03:29.71]It is a love story baby just say ′Yes′
[03:36.41]
[03:45.61]′Cause we were both young when I first saw you
[03:51.81]
[03:52.81]by RentAnAdviser.com
[04:01.81]
+ diff --git a/lyric/sample-unclean.srt b/lyric/sample-unclean.srt deleted file mode 100644 index 989dcf7..0000000 --- a/lyric/sample-unclean.srt +++ /dev/null @@ -1,3 +0,0 @@ -

Arizona Zervas - 24 (Official Lyric Video) Subtitle (.SRT)

-0
00:00:00‚000 --> 00:00:00‚000
by RentAnAdviser.com

1
00:00:10‚005 --> 00:00:12‚604
Take take it easy word to 94

2
00:00:12‚716 --> 00:00:16‚215
I got twenty four hours‚
twenty four hours

3
00:00:16‚303 --> 00:00:19‚402
Twenty four ***s in the hotel tower

4
00:00:19‚514 --> 00:00:22‚613
Twenty four ******* on
the guest list yeah

5
00:00:22‚717 --> 00:00:26‚116
Twenty four carats on
my necklace yeah

6
00:00:26‚202 --> 00:00:29‚101
Twenty four hours twenty four hours

7
00:00:29‚203 --> 00:00:32‚402
Twenty four ***s in the hotel tower

8
00:00:32‚516 --> 00:00:35‚515
Twenty four ******* on
the guest list yeah

9
00:00:35‚615 --> 00:00:38‚914
Twenty four carats on
my necklace yeah

10
00:00:39‚000 --> 00:00:42‚199
Ballin like I am Kobe Swish‚
2 4 on my jersey

11
00:00:42‚313 --> 00:00:45‚312
I stay with the homies they
pop out if you hurt me

12
00:00:45‚404 --> 00:00:48‚603
I might cop a Rollie for all
the ***s who curved me

13
00:00:48‚709 --> 00:00:51‚908
When I pull up swervin′ that′s
that Lamborghini Mercy

14
00:00:52‚018 --> 00:00:55‚117
I might do the dash goin fast
in the coupe In the coupe

15
00:00:55‚211 --> 00:00:58‚310
I have been gettin cash all my racks
lookin blue Lookin blue

16
00:00:58‚402 --> 00:01:01‚401
Chains gon splash when
I smash in the pool

17
00:01:01‚517 --> 00:01:04‚716
Yeah I don′t take no nap‚
I be stackin two to two

18
00:01:04‚804 --> 00:01:08‚003
I am mixin with the cup she just
put somethin in my water

19
00:01:08‚107 --> 00:01:11‚206
Three shots ain′t enough my
shorty pour me up stronger

20
00:01:11‚318 --> 00:01:14‚517
We just got the addy
and she on one too

21
00:01:14‚617 --> 00:01:17‚816
We pull up with baddies
to the hotel room

22
00:01:17‚904 --> 00:01:21‚003
I got twenty four hours‚
twenty four hours

23
00:01:21‚109 --> 00:01:24‚208
Twenty four ***s in the hotel tower

24
00:01:24‚304 --> 00:01:27‚603
Twenty four ******* on the guest
list yeah Guest list yeah

25
00:01:27‚705 --> 00:01:30‚804
Twenty four carats on my necklace‚
yeah Necklace yeah

26
00:01:30‚902 --> 00:01:33‚901
Twenty four hours twenty four hours

27
00:01:34‚009 --> 00:01:37‚208
Twenty four ***s in the hotel tower

28
00:01:37‚314 --> 00:01:40‚413
Twenty four ******* on the guest
list yeah Guest list yeah

29
00:01:40‚515 --> 00:01:44‚614
Twenty four carats on my necklace‚
yeah Necklace yeah

30
00:01:47‚002 --> 00:01:50‚901
Twenty four hours twenty four hours

31
00:01:53‚715 --> 00:01:58‚814
Twenty four hours twenty
four hours yeah

32
00:01:59‚814 --> 00:02:08‚813
by RentAnAdviser.com

-