Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(player): 在当前字幕面板显示搜索加载与空结果反馈

longmeidaod481e8a349f8
diff --git a/frontend/e2e/player-subtitles.test.ts b/frontend/e2e/player-subtitles.test.ts
index f7e2524bf..0c87f0a69 100644
--- a/frontend/e2e/player-subtitles.test.ts
+++ b/frontend/e2e/player-subtitles.test.ts
@@ -26,6 +26,47 @@ describe('播放器字幕', () => {
before(async () => { browser = await launch() });
after(async () => { await browser?.close() });
for (const viewport of VIEWPORTS) {
+ it(`${viewport.name}:面板切换中显示搜索动画,空结果提示保持可见`, { timeout: 60_000 }, async () => {
+ let release!: () => void;
+ const response = new Promise<void>(resolve => { release = resolve });
+ let searches = 0;
+ const opened = await visit(browser, `/assets/${requiredEnv('PEACH_E2E_ITEM')}`, viewport, async page => {
+ await page.emulateMedia({ reducedMotion: 'no-preference' });
+ await page.route('**/api/subtitles/search?**', async route => {
+ searches++;
+ await response;
+ await route.fulfill({ json: { results: [], more: false } });
+ });
+ });
+ const { page, problems } = opened;
+ try {
+ await page.locator('#stage .vjs-peach-bezel').waitFor({ state: 'attached' });
+ await menu(page);
+ await page.locator('[data-subtitle-search]').click();
+ const panel = page.locator('.vjs-peach-panel:not(.vjs-peach-panel-leaving)');
+ const status = panel.locator('[data-subtitle-status]');
+ await status.waitFor({ state: 'visible', timeout: 5_000 });
+ assert.match(await status.textContent() || '', /正在搜索字幕/);
+ assert.equal(await panel.getAttribute('aria-busy'), 'true');
+ const spinner = status.locator('.ui-geist-spinner');
+ assert.equal(await spinner.count(), 1);
+ assert.equal(await spinner.locator('i').first().evaluate(node =>
+ node.getAnimations().some(animation => animation.playState === 'running')), true);
+ await page.waitForFunction(() => !document.querySelector('.vjs-peach-popup-animating'));
+ await page.screenshot({ path: join(process.cwd(), `../build/subtitles-search-loading-${viewport.name}.png`) });
+ release();
+ await status.filter({ hasText: '没有找到当前作品的中文字幕' }).waitFor();
+ assert.equal(await spinner.count(), 0);
+ assert.equal(await panel.getAttribute('aria-busy'), null);
+ await page.screenshot({ path: join(process.cwd(), `../build/subtitles-search-empty-${viewport.name}.png`) });
+ await page.locator('[data-subtitle-back]').click();
+ await page.locator('[data-subtitle-search]').click();
+ await status.filter({ hasText: '没有找到当前作品的中文字幕' }).waitFor();
+ assert.equal(searches, 1);
+ assert.deepEqual(problems, []);
+ } finally { release(); await opened.close() }
+ });
+
it(`${viewport.name}:本地字幕、选项持久化、关闭和重新开启`, { timeout: 60_000 }, async () => {
const opened = await visit(browser, `/assets/${requiredEnv('PEACH_E2E_ITEM')}`, viewport);
const { page, problems } = opened;
diff --git a/frontend/src/player/subtitles.ts b/frontend/src/player/subtitles.ts
index 5720e8b8a..6282319ae 100644
--- a/frontend/src/player/subtitles.ts
+++ b/frontend/src/player/subtitles.ts
@@ -124,7 +124,7 @@ export class SubtitleControls {
}
private status(message: string, error = false, busy = false) {
- const target = this.player.el().querySelector<HTMLElement>('[data-subtitle-status]');
+ const target = this.player.el().querySelector<HTMLElement>('.vjs-peach-panel:not(.vjs-peach-panel-leaving) [data-subtitle-status]');
if (target) { target.hidden = false; target.innerHTML = `${busy ? spinnerHtml('') : ''}<span>${esc(message)}</span>`; target.toggleAttribute('data-error', error) }
}
private busy() { this.request?.abort(); this.request = new AbortController(); return this.request.signal }
diff --git a/web/dist/peach-app.js b/web/dist/peach-app.js
index ed22f5a78..c1d501796 100644
--- a/web/dist/peach-app.js
+++ b/web/dist/peach-app.js
@@ -31086,7 +31086,7 @@ var dde = () => "<svg viewBox=\"0 0 36 36\" aria-hidden=\"true\"><path d=\"M11,1
});
}
status(e, t = !1, n = !1) {
- let r = this.player.el().querySelector("[data-subtitle-status]");
+ let r = this.player.el().querySelector(".vjs-peach-panel:not(.vjs-peach-panel-leaving) [data-subtitle-status]");
r && (r.hidden = !1, r.innerHTML = `${n ? ko("") : ""}<span>${B(e)}</span>`, r.toggleAttribute("data-error", t));
}
busy() {