alikia2x/aquavox
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

handle alternative line ends

Browse Source 
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
This commit is contained in:
eternal-flame-AD 2024-07-27 16:53:05 -05:00
parent 3dd9829a43
commit 9e388b66ce
No known key found for this signature in database
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/lyrics/parser.ts
View File

@ -26,7 +26,7 @@ interface ParserScriptItem {
singer?: string; singer?: string;
} }
export interface ScriptItem extends ParserScriptItem{ export interface ScriptItem extends ParserScriptItem {
end: number; end: number;
chorus?: string; chorus?: string;
} }
@ -67,7 +67,7 @@ function convertTimeToMs({
mins, mins,
secs, secs,
decimals decimals
}: { }: {
mins?: number | string; mins?: number | string;
secs?: number | string; secs?: number | string;
decimals?: string; decimals?: string;
@ -247,7 +247,7 @@ export function parseLRC(
]); ]);
const lines = input const lines = input
.split('\n') .split(/\r\n|\r|\n/gu)
.filter((line) => line.trim().length > 0) .filter((line) => line.trim().length > 0)
.map((line) => tokenizer.parse(line)); .map((line) => tokenizer.parse(line));

9
src/test/lrcParser.test.ts
View File

@ -9,8 +9,14 @@ describe('LRC parser test', () => {
const test02Text = test02Buffer.toString('utf-8'); const test02Text = test02Buffer.toString('utf-8');
const test03Buffer = fs.readFileSync('./src/test/resources/test-03.lrc'); const test03Buffer = fs.readFileSync('./src/test/resources/test-03.lrc');
const test03Text = test03Buffer.toString('utf-8'); const test03Text = test03Buffer.toString('utf-8');
const lf_alternatives = ['\n', '\r\n', '\r'];
it('Parses test-01.lrc', () => { it('Parses test-01.lrc', () => {
const result = parseLRC(test01Text, { wordDiv: '', strict: true }); for (const lf of lf_alternatives) {
const text = test01Text.replaceAll('\n', lf);
const result = parseLRC(text, { wordDiv: '', strict: true });
expect(result.ar).toBe("洛天依"); expect(result.ar).toBe("洛天依");
expect(result.ti).toBe("中华少女·终"); expect(result.ti).toBe("中华少女·终");
@ -18,6 +24,7 @@ describe('LRC parser test', () => {
expect(result["tool"]).toBe("歌词滚动姬 https://lrc-maker.github.io"); expect(result["tool"]).toBe("歌词滚动姬 https://lrc-maker.github.io");
expect(result.scripts!![1].text).toBe("因果与恩怨牵杂等谁来诊断"); expect(result.scripts!![1].text).toBe("因果与恩怨牵杂等谁来诊断");
expect(result.scripts!![1].start).toBe(49000 + 588); expect(result.scripts!![1].start).toBe(49000 + 588);
}
}) })
it('Parses test-02.lrc', () => { it('Parses test-02.lrc', () => {
const result = parseLRC(test02Text, { wordDiv: ' ', strict: true }); const result = parseLRC(test02Text, { wordDiv: ' ', strict: true });