mirror of
https://github.com/th-ch/youtube-music.git
synced 2026-01-26 09:32:06 +00:00
Compare commits
1 Commits
lrc-parser
...
renovate/h
| Author | SHA1 | Date | |
|---|---|---|---|
| ef350c5601 |
@ -106,7 +106,7 @@
|
||||
"filenamify": "6.0.0",
|
||||
"hanja": "1.1.5",
|
||||
"happy-dom": "20.0.11",
|
||||
"hono": "4.11.4",
|
||||
"hono": "4.11.5",
|
||||
"howler": "2.2.4",
|
||||
"html-to-text": "9.0.5",
|
||||
"i18next": "25.5.2",
|
||||
|
||||
44
pnpm-lock.yaml
generated
44
pnpm-lock.yaml
generated
@ -65,19 +65,19 @@ importers:
|
||||
version: 2.11.6(electron@38.7.2)
|
||||
'@hono/node-server':
|
||||
specifier: 1.19.9
|
||||
version: 1.19.9(hono@4.11.4)
|
||||
version: 1.19.9(hono@4.11.5)
|
||||
'@hono/node-ws':
|
||||
specifier: 1.2.0
|
||||
version: 1.2.0(@hono/node-server@1.19.9(hono@4.11.4))(bufferutil@4.1.0)(hono@4.11.4)(utf-8-validate@6.0.6)
|
||||
version: 1.2.0(@hono/node-server@1.19.9(hono@4.11.5))(bufferutil@4.1.0)(hono@4.11.5)(utf-8-validate@6.0.6)
|
||||
'@hono/swagger-ui':
|
||||
specifier: 0.5.3
|
||||
version: 0.5.3(hono@4.11.4)
|
||||
version: 0.5.3(hono@4.11.5)
|
||||
'@hono/zod-openapi':
|
||||
specifier: 1.2.0
|
||||
version: 1.2.0(hono@4.11.4)(zod@4.2.1)
|
||||
version: 1.2.0(hono@4.11.5)(zod@4.2.1)
|
||||
'@hono/zod-validator':
|
||||
specifier: 0.7.6
|
||||
version: 0.7.6(hono@4.11.4)(zod@4.2.1)
|
||||
version: 0.7.6(hono@4.11.5)(zod@4.2.1)
|
||||
'@jellybrick/dbus-next':
|
||||
specifier: 0.10.3
|
||||
version: 0.10.3
|
||||
@ -166,8 +166,8 @@ importers:
|
||||
specifier: 20.0.11
|
||||
version: 20.0.11
|
||||
hono:
|
||||
specifier: 4.11.4
|
||||
version: 4.11.4
|
||||
specifier: 4.11.5
|
||||
version: 4.11.5
|
||||
howler:
|
||||
specifier: 2.2.4
|
||||
version: 2.2.4
|
||||
@ -2779,8 +2779,8 @@ packages:
|
||||
resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
|
||||
hasBin: true
|
||||
|
||||
hono@4.11.4:
|
||||
resolution: {integrity: sha512-U7tt8JsyrxSRKspfhtLET79pU8K+tInj5QZXs1jSugO1Vq5dFj3kmZsRldo29mTBfcjDRVRXrEZ6LS63Cog9ZA==}
|
||||
hono@4.11.5:
|
||||
resolution: {integrity: sha512-WemPi9/WfyMwZs+ZUXdiwcCh9Y+m7L+8vki9MzDw3jJ+W9Lc+12HGsd368Qc1vZi1xwW8BWMMsnK5efYKPdt4g==}
|
||||
engines: {node: '>=16.9.0'}
|
||||
|
||||
hosted-git-info@4.1.0:
|
||||
@ -5182,34 +5182,34 @@ snapshots:
|
||||
dependencies:
|
||||
tldts-experimental: 7.0.19
|
||||
|
||||
'@hono/node-server@1.19.9(hono@4.11.4)':
|
||||
'@hono/node-server@1.19.9(hono@4.11.5)':
|
||||
dependencies:
|
||||
hono: 4.11.4
|
||||
hono: 4.11.5
|
||||
|
||||
'@hono/node-ws@1.2.0(@hono/node-server@1.19.9(hono@4.11.4))(bufferutil@4.1.0)(hono@4.11.4)(utf-8-validate@6.0.6)':
|
||||
'@hono/node-ws@1.2.0(@hono/node-server@1.19.9(hono@4.11.5))(bufferutil@4.1.0)(hono@4.11.5)(utf-8-validate@6.0.6)':
|
||||
dependencies:
|
||||
'@hono/node-server': 1.19.9(hono@4.11.4)
|
||||
hono: 4.11.4
|
||||
'@hono/node-server': 1.19.9(hono@4.11.5)
|
||||
hono: 4.11.5
|
||||
ws: 8.19.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
|
||||
transitivePeerDependencies:
|
||||
- bufferutil
|
||||
- utf-8-validate
|
||||
|
||||
'@hono/swagger-ui@0.5.3(hono@4.11.4)':
|
||||
'@hono/swagger-ui@0.5.3(hono@4.11.5)':
|
||||
dependencies:
|
||||
hono: 4.11.4
|
||||
hono: 4.11.5
|
||||
|
||||
'@hono/zod-openapi@1.2.0(hono@4.11.4)(zod@4.2.1)':
|
||||
'@hono/zod-openapi@1.2.0(hono@4.11.5)(zod@4.2.1)':
|
||||
dependencies:
|
||||
'@asteasolutions/zod-to-openapi': 8.1.0(zod@4.2.1)
|
||||
'@hono/zod-validator': 0.7.6(hono@4.11.4)(zod@4.2.1)
|
||||
hono: 4.11.4
|
||||
'@hono/zod-validator': 0.7.6(hono@4.11.5)(zod@4.2.1)
|
||||
hono: 4.11.5
|
||||
openapi3-ts: 4.5.0
|
||||
zod: 4.2.1
|
||||
|
||||
'@hono/zod-validator@0.7.6(hono@4.11.4)(zod@4.2.1)':
|
||||
'@hono/zod-validator@0.7.6(hono@4.11.5)(zod@4.2.1)':
|
||||
dependencies:
|
||||
hono: 4.11.4
|
||||
hono: 4.11.5
|
||||
zod: 4.2.1
|
||||
|
||||
'@humanfs/core@0.19.1': {}
|
||||
@ -7552,7 +7552,7 @@ snapshots:
|
||||
|
||||
he@1.2.0: {}
|
||||
|
||||
hono@4.11.4: {}
|
||||
hono@4.11.5: {}
|
||||
|
||||
hosted-git-info@4.1.0:
|
||||
dependencies:
|
||||
|
||||
@ -227,7 +227,7 @@
|
||||
},
|
||||
"album-actions": {
|
||||
"description": "Lisab Undislike, Ebameeldiv, Meeldiv ja Unlike nupud selle rakendamiseks kõikidele loendisse või albumisse kuuluvatele lauludele.",
|
||||
"name": "Albumi toimingud"
|
||||
"name": "Albumi aktsioonid"
|
||||
},
|
||||
"album-color-theme": {
|
||||
"description": "Rakendab dünaamilist teemat ja visuaalseid efekte, mis põhinevad albumi värvipalettil",
|
||||
@ -237,8 +237,7 @@
|
||||
"submenu": {
|
||||
"percent": "{{suhe}}%"
|
||||
}
|
||||
},
|
||||
"enable-seekbar": "Luba kerimisriba kujundamine"
|
||||
}
|
||||
},
|
||||
"name": "Albumi värviteema"
|
||||
},
|
||||
@ -246,19 +245,9 @@
|
||||
"description": "Rakendab valgusefekti, projitseerides videost õrnad värvid ekraani taustale",
|
||||
"menu": {
|
||||
"blur-amount": {
|
||||
"label": "Hägusus",
|
||||
"submenu": {
|
||||
"pixels": "{{blurAmount}} pikslit"
|
||||
}
|
||||
},
|
||||
"buffer": {
|
||||
"label": "Puhver",
|
||||
"submenu": {
|
||||
"buffer": "{{buffer}}"
|
||||
}
|
||||
"label": "Hägusus"
|
||||
},
|
||||
"opacity": {
|
||||
"label": "Läbipaistmatus",
|
||||
"submenu": {
|
||||
"percent": "{{opacity}}%"
|
||||
}
|
||||
@ -274,15 +263,8 @@
|
||||
"submenu": {
|
||||
"percent": "{{size}}%"
|
||||
}
|
||||
},
|
||||
"smoothness-transition": {
|
||||
"label": "Sujuv üleminek"
|
||||
},
|
||||
"use-fullscreen": {
|
||||
"label": "Kasutamas täisekraani"
|
||||
}
|
||||
},
|
||||
"name": "Ümbritsev režiim"
|
||||
}
|
||||
},
|
||||
"blur-nav-bar": {
|
||||
"description": "Muudab navigatsiooniriba läbipaistavaks ja hägusaks",
|
||||
|
||||
@ -209,7 +209,7 @@
|
||||
"show": "Pokaż okno",
|
||||
"tooltip": {
|
||||
"default": "{{applicationName}}",
|
||||
"with-song-info": "{{title}} (autorstwa {{artist}}) - {{applicationName}}"
|
||||
"with-song-info": "{{artist}} - (autorstwa {{artist}}) - {{applicationName}}"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -295,7 +295,7 @@
|
||||
}
|
||||
},
|
||||
"api-server": {
|
||||
"description": "Steruj odtwarzaczem przez specjalny serwer API",
|
||||
"description": "Pozwala na kontrolowanie {{applicationName}} poprzez podłączenie specjalnego serwera API",
|
||||
"dialog": {
|
||||
"request": {
|
||||
"buttons": {
|
||||
|
||||
@ -1,144 +0,0 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
import { LRC } from './lrc';
|
||||
|
||||
test('empty string', () => {
|
||||
const lrc = LRC.parse('');
|
||||
expect(lrc).toStrictEqual({ lines: [], tags: [] });
|
||||
});
|
||||
|
||||
test('chorus', () => {
|
||||
const lrc = LRC.parse(`\
|
||||
[00:12.00]Line 1 lyrics
|
||||
[00:17.20]Line 2 lyrics
|
||||
[00:21.10][00:45.10]Repeating lyrics (e.g. chorus)
|
||||
[mm:ss.xx]Last lyrics line\
|
||||
`);
|
||||
|
||||
expect(lrc).toStrictEqual({
|
||||
lines: [
|
||||
{ duration: 12000, text: '', words: [], time: '00:00:00', timeInMs: 0 },
|
||||
{
|
||||
duration: 5020,
|
||||
text: 'Line 1 lyrics',
|
||||
words: [],
|
||||
time: '00:12:00',
|
||||
timeInMs: 12000,
|
||||
},
|
||||
{
|
||||
duration: 3990,
|
||||
text: 'Line 2 lyrics',
|
||||
words: [],
|
||||
time: '00:17:20',
|
||||
timeInMs: 17020,
|
||||
},
|
||||
{
|
||||
duration: 24000,
|
||||
text: 'Repeating lyrics (e.g. chorus)',
|
||||
words: [],
|
||||
time: '00:21:10',
|
||||
timeInMs: 21010,
|
||||
},
|
||||
{
|
||||
duration: Infinity,
|
||||
text: 'Repeating lyrics (e.g. chorus)',
|
||||
words: [],
|
||||
time: '00:45:10',
|
||||
timeInMs: 45010,
|
||||
},
|
||||
],
|
||||
tags: [],
|
||||
});
|
||||
});
|
||||
|
||||
test('attributes', () => {
|
||||
const lrc = LRC.parse(
|
||||
`[ar:Chubby Checker oppure Beatles, The]
|
||||
[al:Hits Of The 60's - Vol. 2 – Oldies]
|
||||
[ti:Let's Twist Again]
|
||||
[au:Written by Kal Mann / Dave Appell, 1961]
|
||||
[length: 2:23]
|
||||
|
||||
[00:12.00]Naku Penda Piya-Naku Taka Piya-Mpenziwe
|
||||
[00:15.30]Some more lyrics ...`,
|
||||
);
|
||||
|
||||
expect(lrc).toStrictEqual({
|
||||
lines: [
|
||||
{ duration: 12000, text: '', words: [], time: '00:00:00', timeInMs: 0 },
|
||||
{
|
||||
duration: 3030,
|
||||
text: 'Naku Penda Piya-Naku Taka Piya-Mpenziwe',
|
||||
words: [],
|
||||
time: '00:12:00',
|
||||
timeInMs: 12000,
|
||||
},
|
||||
{
|
||||
duration: Infinity,
|
||||
text: 'Some more lyrics ...',
|
||||
words: [],
|
||||
time: '00:15:30',
|
||||
timeInMs: 15030,
|
||||
},
|
||||
],
|
||||
tags: [
|
||||
{ tag: 'ar', value: 'Chubby Checker oppure Beatles, The' },
|
||||
{ tag: 'al', value: "Hits Of The 60's - Vol. 2 – Oldies" },
|
||||
{ tag: 'ti', value: "Let's Twist Again" },
|
||||
{ tag: 'au', value: 'Written by Kal Mann / Dave Appell, 1961' },
|
||||
{ tag: 'length', value: '2:23' },
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
test('karaoke', () => {
|
||||
const lrc = LRC.parse(
|
||||
'[00:00.00] <00:00.04> When <00:00.16> the <00:00.82> truth <00:01.29> is <00:01.63> found <00:03.09> to <00:03.37> be <00:05.92> lies',
|
||||
);
|
||||
|
||||
expect(lrc).toStrictEqual({
|
||||
lines: [
|
||||
{
|
||||
duration: Infinity,
|
||||
text: 'When the truth is found to be lies',
|
||||
time: '00:00:00',
|
||||
timeInMs: 0,
|
||||
words: [
|
||||
{
|
||||
timeInMs: 4,
|
||||
word: 'When',
|
||||
},
|
||||
{
|
||||
timeInMs: 16,
|
||||
word: 'the',
|
||||
},
|
||||
{
|
||||
timeInMs: 82,
|
||||
word: 'truth',
|
||||
},
|
||||
{
|
||||
timeInMs: 1029,
|
||||
word: 'is',
|
||||
},
|
||||
{
|
||||
timeInMs: 1063,
|
||||
word: 'found',
|
||||
},
|
||||
{
|
||||
timeInMs: 3009,
|
||||
word: 'to',
|
||||
},
|
||||
{
|
||||
timeInMs: 3037,
|
||||
word: 'be',
|
||||
},
|
||||
{
|
||||
timeInMs: 5092,
|
||||
word: 'lies',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
tags: [],
|
||||
});
|
||||
});
|
||||
@ -8,7 +8,6 @@ interface LRCLine {
|
||||
timeInMs: number;
|
||||
duration: number;
|
||||
text: string;
|
||||
words: { timeInMs: number; word: string }[];
|
||||
}
|
||||
|
||||
interface LRC {
|
||||
@ -18,10 +17,7 @@ interface LRC {
|
||||
|
||||
const tagRegex = /^\[(?<tag>\w+):\s*(?<value>.+?)\s*\]$/;
|
||||
// prettier-ignore
|
||||
const timestampRegex = /^\[(?<minutes>\d+):(?<seconds>\d+)\.(?<milliseconds>\d+)\]/m;
|
||||
|
||||
// prettier-ignore
|
||||
const wordRegex = /<(?<minutes>\d+):(?<seconds>\d+)\.(?<milliseconds>\d+)> *(?<word>\w+)/g;
|
||||
const lyricRegex = /^\[(?<minutes>\d+):(?<seconds>\d+)\.(?<milliseconds>\d+)\](?<text>.+)$/;
|
||||
|
||||
export const LRC = {
|
||||
parse: (text: string): LRC => {
|
||||
@ -31,29 +27,13 @@ export const LRC = {
|
||||
};
|
||||
|
||||
let offset = 0;
|
||||
let previousLine: LRCLine | null = null;
|
||||
|
||||
for (let line of text.split('\n')) {
|
||||
line = line.trim();
|
||||
if (!line.startsWith('[')) continue;
|
||||
for (const line of text.split('\n')) {
|
||||
if (!line.trim().startsWith('[')) continue;
|
||||
|
||||
const timestamps = [];
|
||||
let match: Record<string, string> | undefined;
|
||||
while ((match = line.match(timestampRegex)?.groups)) {
|
||||
const { minutes, seconds, milliseconds } = match;
|
||||
const timeInMs =
|
||||
parseInt(minutes) * 60 * 1000 +
|
||||
parseInt(seconds) * 1000 +
|
||||
parseInt(milliseconds);
|
||||
|
||||
timestamps.push({
|
||||
time: `${minutes}:${seconds}:${milliseconds}`,
|
||||
timeInMs,
|
||||
});
|
||||
|
||||
line = line.replace(timestampRegex, '');
|
||||
}
|
||||
|
||||
if (!timestamps.length) {
|
||||
const lyric = line.match(lyricRegex)?.groups;
|
||||
if (!lyric) {
|
||||
const tag = line.match(tagRegex)?.groups;
|
||||
if (tag) {
|
||||
if (tag.tag === 'offset') {
|
||||
@ -69,52 +49,38 @@ export const LRC = {
|
||||
continue;
|
||||
}
|
||||
|
||||
let text = line.trim();
|
||||
const words = Array.from(text.matchAll(wordRegex), ({ groups }) => {
|
||||
const { minutes, seconds, milliseconds, word } = groups!;
|
||||
const { minutes, seconds, milliseconds, text } = lyric;
|
||||
const timeInMs =
|
||||
parseInt(minutes) * 60 * 1000 +
|
||||
parseInt(seconds) * 1000 +
|
||||
parseInt(milliseconds);
|
||||
|
||||
return { timeInMs, word };
|
||||
});
|
||||
|
||||
if (words.length) {
|
||||
text = words.map(({ word }) => word).join(' ');
|
||||
}
|
||||
|
||||
for (const { time, timeInMs } of timestamps) {
|
||||
lrc.lines.push({
|
||||
time,
|
||||
const currentLine: LRCLine = {
|
||||
time: `${minutes}:${seconds}:${milliseconds}`,
|
||||
timeInMs,
|
||||
text,
|
||||
words,
|
||||
text: text.trim(),
|
||||
duration: Infinity,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
if (previousLine) {
|
||||
previousLine.duration = timeInMs - previousLine.timeInMs;
|
||||
}
|
||||
|
||||
lrc.lines.sort(({ timeInMs: timeA }, { timeInMs: timeB }) => timeA - timeB);
|
||||
for (let i = 0; i < lrc.lines.length; i++) {
|
||||
const current = lrc.lines[i];
|
||||
const next = lrc.lines[i + 1];
|
||||
|
||||
current.timeInMs += offset;
|
||||
|
||||
if (next) {
|
||||
current.duration = next.timeInMs - current.timeInMs;
|
||||
previousLine = currentLine;
|
||||
lrc.lines.push(currentLine);
|
||||
}
|
||||
|
||||
for (const line of lrc.lines) {
|
||||
line.timeInMs += offset;
|
||||
}
|
||||
|
||||
const first = lrc.lines.at(0);
|
||||
if (first && first.timeInMs > 300) {
|
||||
lrc.lines.unshift({
|
||||
time: '00:00:00',
|
||||
time: '0:0:0',
|
||||
timeInMs: 0,
|
||||
duration: first.timeInMs,
|
||||
text: '',
|
||||
words: [],
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user