Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(web): 竖屏带按「合并分卷与版本」折叠分卷

longmeidao364405f0b0ff
diff --git a/frontend/src/react/catalog-grid/catalog-grid-page.tsx b/frontend/src/react/catalog-grid/catalog-grid-page.tsx
index 0b95c1a73..209b2d47a 100644
--- a/frontend/src/react/catalog-grid/catalog-grid-page.tsx
+++ b/frontend/src/react/catalog-grid/catalog-grid-page.tsx
@@ -18,7 +18,7 @@ import { LOAD_MORE_MARGIN, RetryNote, useSkeletonReveal } from '../components/gr
import { cardRatio, MediaCard, type MediaCardVariant } from '../components/media-card';
import { MIX_FLIP_FACES, MixCard } from '../components/mix-card';
import {
- SHORTS_BATCH, arrangeTiles, catalogParams, catalogQuery, entityQuery, latestCatalogPages, mixHasPicture,
+ SHORTS_BATCH, arrangeTiles, catalogParams, catalogQuery, collapseGroups, entityQuery, latestCatalogPages, mixHasPicture,
shortsBoundaries, shortsParams, splitSections, type GridPage, type ShortsCut, type Tile,
} from './catalog-grid';
import type { CatalogGridProps, MediaCardLayout, MediaCardHelpers, MediaItem, MediaPage } from './types';
@@ -149,7 +149,7 @@ function GridBody(props: CatalogGridProps) {
const card = (tile: Tile) => tile.kind === 'mix'
? <HomeMix key={`mix:${tile.seed.id}`} seed={tile.seed} layout={layout} helpers={helpers} actions={actions} />
: (
- <MediaCard key={tile.item.id} item={tile.item}
+ <MediaCard key={tile.item.id} item={tile.item} grouped={props.groupCollapse !== false}
variant={trash && tile.item.medium && tile.item.medium !== 'video' ? 'resource' : 'grid'} layout={layout}
selected={props.selected.has(tile.item.id)} selectMode={props.selectMode} seekSeconds={props.seekSeconds}
helpers={helpers} actions={actions} onOpen={trash ? openResource : open} />
@@ -264,7 +264,8 @@ export function LoadMore({ entity, load, enabled, children }: {
}
/** 竖屏带:每接一页请求一条,落点在这一页新增的那几行之间的行边界上随机取一个。
- * 请求跟着主列表的筛选与排序走;一条都没有、或这一页剪不出行边界,偏移量按遗留层归零或不动。 */
+ * 请求跟着主列表的筛选与排序走;一条都没有、或这一页剪不出行边界,偏移量按遗留层归零或不动。
+ * 分卷与版本按主网格同一个开关折叠(`collapseGroups`),一组跨几条带也只留第一次出现的那一张。 */
function useShortsStrips(
props: CatalogGridProps, data: InfiniteData<GridPage, number> | undefined,
tiles: readonly Tile[], pageStarts: readonly number[], body: RefObject<HTMLElement | null>,
@@ -273,6 +274,7 @@ function useShortsStrips(
const [arrived, setArrived] = useState<{ page: number; total: number; items: MediaItem[]; more: boolean } | null>(null);
const offset = useRef(0);
const handled = useRef(0);
+ const seen = useRef({ parts: new Set<string>(), editions: new Set<string>() });
const controllers = useRef<AbortController[]>([]);
useEffect(() => () => controllers.current.forEach((controller) => controller.abort()), []);
useEffect(() => {
@@ -301,9 +303,12 @@ function useShortsStrips(
const addedFrom = Math.max(0, (pageStarts[arrived.page] ?? 0) - start);
const boundaries = shortsBoundaries(tiles.length - start, addedFrom, columns);
if (!boundaries.length) return;
- const at = start + (boundaries[Math.floor(Math.random() * boundaries.length)] ?? 0);
+ /* 落点定了才折叠:剪不出落点的这一批下次照原偏移量重取,不能先记成已出现。 */
+ const items = collapseGroups(arrived.items, seen.current, props.groupCollapse !== false);
offset.current = arrived.more ? offset.current + SHORTS_BATCH : 0;
- setCuts((current) => [...current, { at, total: arrived.total, items: arrived.items }]);
+ if (!items.length) return;
+ const at = start + (boundaries[Math.floor(Math.random() * boundaries.length)] ?? 0);
+ setCuts((current) => [...current, { at, total: arrived.total, items }]);
}, [arrived]);
return cuts;
}
@@ -324,7 +329,7 @@ function ShortsStrip({ cut, props, onOpen }: {
</h2>
<div ref={row} data-shorts-row="">
{cut.items.map((item) => (
- <MediaCard key={item.id} item={item} variant="short" layout={props.layout}
+ <MediaCard key={item.id} item={item} variant="short" layout={props.layout} grouped={props.groupCollapse !== false}
selected={props.selected.has(item.id)} selectMode={props.selectMode} seekSeconds={props.seekSeconds}
helpers={props.helpers} actions={props.actions} onOpen={onOpen} />
))}
diff --git a/frontend/src/react/components/media-card.tsx b/frontend/src/react/components/media-card.tsx
index 1b39888e5..205e90c7f 100644
--- a/frontend/src/react/components/media-card.tsx
+++ b/frontend/src/react/components/media-card.tsx
@@ -98,6 +98,9 @@ export interface MediaCardProps {
actions: MediaCardActions;
/** 点这张卡打开什么。竖屏带点进沉浸模式,回收站里的资源按类型分流,其余打开详情。 */
onOpen(item: MediaItem, anchor: HTMLElement): void;
+ /** 这张卡代表整组分卷或版本(「合并分卷与版本」开着)。关着时一卷一张卡,卡面只写这一个文件的
+ * 名字、时长与大小,不标整组卷数;打开时照旧按条目上的分组进分卷或版本队列。默认开。 */
+ grouped?: boolean;
}
/** 署名:头像和名字落到同一个身份上(`cardIdentity`)。共演只写第一位再给总人数。 */
@@ -197,7 +200,7 @@ function seekPreview(card: HTMLElement | null, delta: number) {
video.currentTime = Math.max(0, Math.min(video.duration, video.currentTime + delta));
}
-function VideoCard({ item, variant, layout, selected, selectMode, seekSeconds, helpers, actions, onOpen }: MediaCardProps) {
+function VideoCard({ item, variant, layout, selected, selectMode, seekSeconds, helpers, actions, onOpen, grouped = true }: MediaCardProps) {
const card = useRef<HTMLElement | null>(null);
const [written, setWritten] = useState<{ id: number; on: boolean } | null>(null);
const later = written?.id === item.id ? written.on : !!item.watch_later;
@@ -215,8 +218,8 @@ function VideoCard({ item, variant, layout, selected, selectMode, seekSeconds, h
if (el && (!current.medium || current.medium === 'video')) wireHover(el, current);
}, []);
- const parts = item.part_group || null;
- const editions = item.edition_group || null;
+ const parts = grouped ? item.part_group || null : null;
+ const editions = grouped ? item.edition_group || null : null;
const stacked = !!(parts || editions);
const jav = layout.active && !!item.is_jav;
const size = jav ? layout.size : 'small';
diff --git a/frontend/test/react/catalog-grid.test.tsx b/frontend/test/react/catalog-grid.test.tsx
index 2c0b4890a..51a1e62bf 100644
--- a/frontend/test/react/catalog-grid.test.tsx
+++ b/frontend/test/react/catalog-grid.test.tsx
@@ -173,6 +173,37 @@ describe('续页', () => {
queryClient.removeQueries({ queryKey: ['catalog-grid'] });
});
+ it('竖屏带与主网格同一个「合并分卷与版本」:开着一组分卷只出一张整组卡,关着各卷各自成卡、不标卷数', async () => {
+ vi.stubGlobal('IntersectionObserver', FakeObserver);
+ const group = { key: 'FC2-PPV-3189161', seed_id: 41, count: 2, title: 'FC2-PPV-3189161', total_duration: 1200 };
+ const strip = [item(41, { part_group: group, duration: 600 }), item(43), item(42, { part_group: group, duration: 600 })];
+ vi.stubGlobal('fetch', vi.fn((input: string) => {
+ const url = new URL(String(input), 'http://peach.test');
+ const body = url.searchParams.get('orient') === '竖屏'
+ ? { items: strip, total: strip.length, has_more: false }
+ : { items: [1, 2, 3].map((n) => item(n)), total: 3, has_more: false };
+ return Promise.resolve(reply(body));
+ }));
+ const shorts = (host: ParentNode) => [...host.querySelectorAll<HTMLElement>('[data-shorts-row] [data-media-card]')];
+ for (const collapse of [true, false]) {
+ const host = await mount(<QueryClientProvider client={queryClient}>
+ <CatalogGridPage {...props({ sort: 'seed', q: `竖屏带折叠 ${collapse}` })} shorts groupCollapse={collapse} />
+ </QueryClientProvider>);
+ await until(() => shorts(host).length > 0, '竖屏带插进网格');
+ const cardsInStrip = shorts(host);
+ const badges = cardsInStrip.map((card) => card.querySelector('[data-media-group]')?.textContent || '');
+ if (collapse) {
+ expect(cardsInStrip.map((card) => card.dataset.id)).toEqual(['41', '43']);
+ expect(badges).toEqual(['2 卷', '']);
+ } else {
+ expect(cardsInStrip.map((card) => card.dataset.id)).toEqual(['41', '43', '42']);
+ expect(badges.every((text) => !text), '各卷各自成卡,卡上不标整组卷数').toBe(true);
+ expect(cardsInStrip[0]!.querySelector('[data-media-duration]')?.textContent, '时长是这一卷自己的').toBe('10:00');
+ }
+ }
+ queryClient.removeQueries({ queryKey: ['catalog-grid'] });
+ });
+
it('一趟续页没接上新页时,哨兵按它此刻的位置再判一遍,还在视口附近就接着取', async () => {
vi.stubGlobal('IntersectionObserver', FakeObserver);
const load = vi.fn(async () => {});
@@ -352,6 +383,21 @@ describe('作品卡', () => {
expect(versions.host.querySelector('[data-media-open]')?.getAttribute('aria-label')).toMatch(/版本$/);
});
+ it('不合并分卷时一卷一张卡:名字、时长写这一卷自己的,不叠纸边、不标卷数,打开时条目原样交出', async () => {
+ const actions = actionsFor();
+ const onOpen = vi.fn();
+ const part = item(18, { name: 'FC2-PPV-1 part2', duration: 600, part_group: { key: 'P', seed_id: 17, count: 3, title: 'FC2-PPV-1', total_duration: 1800 } });
+ const host = await mount(<MediaCard item={part} variant="grid" layout={SMALL} selected={false} selectMode={false}
+ seekSeconds={10} helpers={helpers} actions={actions} onOpen={onOpen} grouped={false} />);
+ const card = host.querySelector<HTMLElement>('[data-media-card]')!;
+ expect(host.querySelector('[data-media-group]')).toBeNull();
+ expect([card.hasAttribute('data-stacked'), card.dataset.partSeed]).toEqual([false, undefined]);
+ expect(host.querySelector('[data-media-title]')?.textContent).toBe('FC2-PPV-1 part2');
+ expect(host.querySelector('[data-media-duration]')?.textContent).toBe('10:00');
+ await click(host.querySelector('[data-media-title]'));
+ expect(onOpen).toHaveBeenCalledWith(expect.objectContaining({ id: 18, part_group: expect.objectContaining({ seed_id: 17 }) }), card);
+ });
+
it('待删的作品留在原位,标上回收站', async () => {
const { card, host } = await render(item(15, { disposal: 'trash' }));
expect(card.hasAttribute('data-pending-delete')).toBe(true);