fix(deps): update dependency @ghostery/adblocker-electron-preload to v2.13.4

package.json

@@ -71,7 +71,7 @@
     "@floating-ui/dom": "1.7.4",
     "@foobar404/wave": "2.0.5",
     "@ghostery/adblocker-electron": "2.13.4",
-    "@ghostery/adblocker-electron-preload": "2.11.6",
+    "@ghostery/adblocker-electron-preload": "2.13.4",
     "@hono/node-server": "1.19.9",
     "@hono/node-ws": "1.2.0",
     "@hono/swagger-ui": "0.5.3",

pnpm-lock.yaml

@@ -61,8 +61,8 @@ importers:
         specifier: 2.13.4
         version: 2.13.4(electron@38.7.2)
       '@ghostery/adblocker-electron-preload':
-        specifier: 2.11.6
-        version: 2.11.6(electron@38.7.2)
+        specifier: 2.13.4
+        version: 2.13.4(electron@38.7.2)
       '@hono/node-server':
         specifier: 1.19.9
         version: 1.19.9(hono@4.11.4)
@@ -780,11 +780,6 @@ packages:
   '@ghostery/adblocker-content@2.13.4':
     resolution: {integrity: sha512-VPa4dyHqTyMWxut/wCYYlHdVRsQ2ZXXezTv31WiRhUC86LFKz8rL/Jnj1baHXlRrO5Ndhpll1/e/J/Tzwu6mqg==}
 
-  '@ghostery/adblocker-electron-preload@2.11.6':
-    resolution: {integrity: sha512-WU6vbixwgBtoc6Sx2jn/X5pw9vj3IXoYPhuE/Rm+TrD2nO/ywAOiNV0XkQp3hIHxpJ4GXv/VDJM3Cy6cX41Nhg==}
-    peerDependencies:
-      electron: '>11'
-
   '@ghostery/adblocker-electron-preload@2.13.4':
     resolution: {integrity: sha512-8lKTV+wQkhQd68l8V81DWVHEX1PzhYhhSFlouy3AF3JfNL2DWJm+m6Com0wOxm6ft5xV4YrZpkcFs2RZkbxyaQ==}
     peerDependencies:
@@ -5149,11 +5144,6 @@ snapshots:
     dependencies:
       '@ghostery/adblocker-extended-selectors': 2.13.4
 
-  '@ghostery/adblocker-electron-preload@2.11.6(electron@38.7.2)':
-    dependencies:
-      '@ghostery/adblocker-content': 2.13.4
-      electron: 38.7.2
-
   '@ghostery/adblocker-electron-preload@2.13.4(electron@38.7.2)':
     dependencies:
       '@ghostery/adblocker-content': 2.13.4

src/i18n/resources/et.json

@@ -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",

src/i18n/resources/pl.json

@@ -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": {

src/plugins/synced-lyrics/parsers/lrc.test.ts

@@ -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: [],
-  });
-});

src/plugins/synced-lyrics/parsers/lrc.ts

@@ -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 timeInMs =
-          parseInt(minutes) * 60 * 1000 +
-          parseInt(seconds) * 1000 +
-          parseInt(milliseconds);
+      const { minutes, seconds, milliseconds, text } = lyric;
+      const timeInMs =
+        parseInt(minutes) * 60 * 1000 +
+        parseInt(seconds) * 1000 +
+        parseInt(milliseconds);
 
-        return { timeInMs, word };
-      });
+      const currentLine: LRCLine = {
+        time: `${minutes}:${seconds}:${milliseconds}`,
+        timeInMs,
+        text: text.trim(),
+        duration: Infinity,
+      };
 
-      if (words.length) {
-        text = words.map(({ word }) => word).join(' ');
+      if (previousLine) {
+        previousLine.duration = timeInMs - previousLine.timeInMs;
       }
 
-      for (const { time, timeInMs } of timestamps) {
-        lrc.lines.push({
-          time,
-          timeInMs,
-          text,
-          words,
-          duration: Infinity,
-        });
-      }
+      previousLine = currentLine;
+      lrc.lines.push(currentLine);
     }
 
-    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;
-      }
+    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: [],
       });
     }