Compare commits
8 commits
v0.1.0-bet
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| b42f77a3aa | |||
| 1f9474c2fd | |||
| 0d423eb708 | |||
| 624f01f745 | |||
| 6775d29249 | |||
| 940fe0a6b6 | |||
| bc3358cb07 | |||
| 5719432fe8 |
21 changed files with 482 additions and 354 deletions
23
CHANGELOG.md
23
CHANGELOG.md
|
|
@ -1,5 +1,28 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 1.0.1
|
||||||
|
|
||||||
|
A quicker start, a Stop button, and recovery when the server drops out mid-video.
|
||||||
|
|
||||||
|
- Kaleido starts faster: the opening animation is shorter, so you reach your library in about a second.
|
||||||
|
- The player has a Stop button, next to the forward controls, which closes the player completely instead of moving it to the miniplayer.
|
||||||
|
- If your Plex server goes down while you're watching, the player waits for it once the buffered video runs out, then carries on from the same spot when the server is back. Before, it treated the video as finished and Play started it again from the beginning. Pressing Play while it waits tries to reconnect straight away.
|
||||||
|
|
||||||
|
## 1.0.0
|
||||||
|
|
||||||
|
Kaleido is out of beta. This release reworks the show and season pages and smooths out watching a series.
|
||||||
|
|
||||||
|
- Season pages show their episodes as a grid of cards, each with its still, description and watched state, in place of the long episode list.
|
||||||
|
- Click the season's name under the show's logo to switch to another season.
|
||||||
|
- Show pages list seasons once, as a row of posters. A show with only one season shows its episodes directly.
|
||||||
|
- Episodes you've watched stay marked as watched when you rewatch them and stop partway through. The leftover position only shows on the episode you're up to.
|
||||||
|
- When the next episode plays, whether automatically or with Next, it starts from the beginning instead of near the end of an earlier viewing.
|
||||||
|
- Click a show's name under a Continue Watching card to go to the show.
|
||||||
|
- Continue Watching starts at the first title when something new is added, instead of scrolling it off the left edge.
|
||||||
|
- Season posters outside their show's page, such as New Seasons, are labelled with the show's name.
|
||||||
|
- Season pages show the year the season aired, and their Play button agrees with the show page about which episode is next.
|
||||||
|
- Movie and episode pages show the runtime in their details, with the time left on the Resume button.
|
||||||
|
|
||||||
## 0.1.0-beta.19
|
## 0.1.0-beta.19
|
||||||
|
|
||||||
Up Next fixes.
|
Up Next fixes.
|
||||||
|
|
|
||||||
4
package-lock.json
generated
4
package-lock.json
generated
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "kaleido-desktop",
|
"name": "kaleido-desktop",
|
||||||
"version": "0.1.0-beta.19",
|
"version": "1.0.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "kaleido-desktop",
|
"name": "kaleido-desktop",
|
||||||
"version": "0.1.0-beta.19",
|
"version": "1.0.1",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fontsource-variable/inter": "^5.3.0",
|
"@fontsource-variable/inter": "^5.3.0",
|
||||||
"@tanstack/react-query": "^5.105.0",
|
"@tanstack/react-query": "^5.105.0",
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "kaleido-desktop",
|
"name": "kaleido-desktop",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.1.0-beta.19",
|
"version": "1.0.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|
|
||||||
2
src-tauri/Cargo.lock
generated
2
src-tauri/Cargo.lock
generated
|
|
@ -2173,7 +2173,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "kaleido"
|
name = "kaleido"
|
||||||
version = "0.1.0-beta.19"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fs2",
|
"fs2",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "kaleido"
|
name = "kaleido"
|
||||||
version = "0.1.0-beta.19"
|
version = "1.0.1"
|
||||||
description = "Kaleido — a Plex client for Windows"
|
description = "Kaleido — a Plex client for Windows"
|
||||||
authors = ["Elijah"]
|
authors = ["Elijah"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "Kaleido",
|
"productName": "Kaleido",
|
||||||
"version": "0.1.0-beta.19",
|
"version": "1.0.1",
|
||||||
"identifier": "tv.kaleido.desktop",
|
"identifier": "tv.kaleido.desktop",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|
|
||||||
|
|
@ -36,10 +36,19 @@ export function progress(item: Item): number {
|
||||||
return Math.min(1, Math.max(0, item.viewOffset / item.duration));
|
return Math.min(1, Math.max(0, item.viewOffset / item.duration));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Watched once Plex has counted a full play. A rewatch left partway through keeps the
|
||||||
|
* title watched; its position only matters for resuming (`resumable`).
|
||||||
|
*/
|
||||||
export function isWatched(item: Item, percent = 90): boolean {
|
export function isWatched(item: Item, percent = 90): boolean {
|
||||||
if (item.type === 'show' || item.type === 'season') return item.leafCount > 0 && item.viewedLeafCount >= item.leafCount;
|
if (item.type === 'show' || item.type === 'season') return item.leafCount > 0 && item.viewedLeafCount >= item.leafCount;
|
||||||
if (item.viewOffset > 0 && item.duration > 0) return item.viewCount > 0 && item.viewOffset / item.duration >= percent / 100;
|
if (item.viewCount > 0) return true;
|
||||||
return item.viewCount > 0;
|
return item.viewOffset > 0 && item.duration > 0 && item.viewOffset / item.duration >= percent / 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Has a saved position worth resuming from (not one at the very end). */
|
||||||
|
export function resumable(item: Item): boolean {
|
||||||
|
return item.viewOffset > 0 && item.duration > 0 && item.viewOffset < item.duration * 0.97;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function remainingEpisodes(item: Item): number {
|
export function remainingEpisodes(item: Item): number {
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
/**
|
/**
|
||||||
* Arrow-key movement between titles, for keyboard users. Focus moves to the
|
* Arrow-key movement between titles, for keyboard users. Focus moves to the
|
||||||
* nearest card in the pressed direction (by on-screen geometry), so it works
|
* nearest card in the pressed direction (by on-screen geometry), so it works
|
||||||
* the same across shelves, grids, episode lists and people rows.
|
* the same across shelves, grids and people rows.
|
||||||
*/
|
*/
|
||||||
const TARGETS = '.card, .person-card:not(:disabled), .episode-row, .shelf-title-link';
|
const TARGETS = '.card, .person-card:not(:disabled), .shelf-title-link';
|
||||||
|
|
||||||
function center(r: DOMRect) {
|
function center(r: DOMRect) {
|
||||||
return { x: r.left + r.width / 2, y: r.top + r.height / 2 };
|
return { x: r.left + r.width / 2, y: r.top + r.height / 2 };
|
||||||
|
|
|
||||||
|
|
@ -758,7 +758,7 @@ function MiniPlayer() {
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div className="mini-center">
|
<div className="mini-center">
|
||||||
{(loading || st.buffering) && !st.error ? (
|
{(loading || st.buffering || st.reconnecting) && !st.error ? (
|
||||||
<Spinner size={30} />
|
<Spinner size={30} />
|
||||||
) : st.error ? (
|
) : st.error ? (
|
||||||
<span className="mini-error">Playback stopped</span>
|
<span className="mini-error">Playback stopped</span>
|
||||||
|
|
@ -965,10 +965,12 @@ export function PlayerOverlay() {
|
||||||
{!st.fullscreen && <WindowControls />}
|
{!st.fullscreen && <WindowControls />}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{(loading || st.buffering || st.seeking || preparing) && !st.error && (
|
{(loading || st.buffering || st.seeking || preparing || st.reconnecting) && !st.error && (
|
||||||
<div className="player-center">
|
<div className="player-center">
|
||||||
<Spinner size={44} />
|
<Spinner size={44} />
|
||||||
{preparing && (
|
{st.reconnecting ? (
|
||||||
|
<p className="player-preparing">Lost connection to {server?.name ?? 'the server'}</p>
|
||||||
|
) : preparing && (
|
||||||
<p className="player-preparing">
|
<p className="player-preparing">
|
||||||
Preparing {UPSCALING[st.enhance.active].label} upscaling
|
Preparing {UPSCALING[st.enhance.active].label} upscaling
|
||||||
<small>First time on this computer only</small>
|
<small>First time on this computer only</small>
|
||||||
|
|
@ -1023,6 +1025,8 @@ export function PlayerOverlay() {
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="player-controls-center">
|
<div className="player-controls-center">
|
||||||
|
{/* Balances Stop on the other side, so play/pause stays centred. */}
|
||||||
|
<span className="player-icon-spacer" aria-hidden="true" />
|
||||||
{/* Both episode buttons stay for episodes (dimmed at either end) so play/pause holds its place. */}
|
{/* Both episode buttons stay for episodes (dimmed at either end) so play/pause holds its place. */}
|
||||||
{item.type === 'episode' && (
|
{item.type === 'episode' && (
|
||||||
<button
|
<button
|
||||||
|
|
@ -1055,6 +1059,9 @@ export function PlayerOverlay() {
|
||||||
<Icon name="skipNext" size={22} />
|
<Icon name="skipNext" size={22} />
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
<button className="player-icon" aria-label="Stop playback" title="Stop" onClick={() => st.close()}>
|
||||||
|
<Icon name="stop" size={19} />
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div className="player-controls-right">
|
<div className="player-controls-right">
|
||||||
<button className={`player-icon${panel === 'tracks' ? ' on' : ''}${st.subKey ? ' lit' : ''}`} aria-label="Audio and subtitles" onClick={() => setPanel(panel === 'tracks' ? '' : 'tracks')}>
|
<button className={`player-icon${panel === 'tracks' ? ' on' : ''}${st.subKey ? ' lit' : ''}`} aria-label="Audio and subtitles" onClick={() => setPanel(panel === 'tracks' ? '' : 'tracks')}>
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@ interface PlayerView {
|
||||||
duration: number;
|
duration: number;
|
||||||
firstFrame: boolean;
|
firstFrame: boolean;
|
||||||
buffering: boolean;
|
buffering: boolean;
|
||||||
|
reconnecting: boolean;
|
||||||
error: string;
|
error: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -50,7 +51,8 @@ function view(st: PlayerView): MiniState {
|
||||||
position: st.position,
|
position: st.position,
|
||||||
duration: st.duration,
|
duration: st.duration,
|
||||||
loading: !st.firstFrame && !st.error,
|
loading: !st.firstFrame && !st.error,
|
||||||
buffering: st.buffering,
|
// Waiting for the server to come back shows as buffering.
|
||||||
|
buffering: st.buffering || st.reconnecting,
|
||||||
error: !!st.error,
|
error: !!st.error,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ const harness = vi.hoisted(() => {
|
||||||
const memory = new Map<string, string>();
|
const memory = new Map<string, string>();
|
||||||
vi.stubGlobal('localStorage', { getItem: (k: string) => memory.get(k) ?? null, setItem: (k: string, v: string) => memory.set(k, v), removeItem: (k: string) => memory.delete(k) });
|
vi.stubGlobal('localStorage', { getItem: (k: string) => memory.get(k) ?? null, setItem: (k: string, v: string) => memory.set(k, v), removeItem: (k: string) => memory.delete(k) });
|
||||||
vi.stubGlobal('document', Object.assign(new EventTarget(), { hidden: false, hasFocus: () => true, documentElement: { classList: { toggle: vi.fn() } } }));
|
vi.stubGlobal('document', Object.assign(new EventTarget(), { hidden: false, hasFocus: () => true, documentElement: { classList: { toggle: vi.fn() } } }));
|
||||||
return { event: (_e: MpvEvent) => {}, next: [] as unknown[], focused: true };
|
return { event: (_e: MpvEvent) => {}, next: [] as unknown[], focused: true, identity: vi.fn() };
|
||||||
});
|
});
|
||||||
|
|
||||||
vi.mock('../platform/native', () => ({
|
vi.mock('../platform/native', () => ({
|
||||||
|
|
@ -20,7 +20,7 @@ vi.mock('./engine', () => ({ mpv: {
|
||||||
} }));
|
} }));
|
||||||
vi.mock('../app/session', async () => {
|
vi.mock('../app/session', async () => {
|
||||||
const { create } = await import('zustand');
|
const { create } = await import('zustand');
|
||||||
return { useSession: create(() => ({ server: { machineId: 'test', token: 'test-only' }, connection: { local: true } })) };
|
return { useSession: create(() => ({ server: { machineId: 'test', token: 'test-only', name: 'Test', get: harness.identity }, connection: { local: true } })) };
|
||||||
});
|
});
|
||||||
vi.mock('../downloads/store', () => ({ useDownloads: { getState: () => ({ items: [] }) } }));
|
vi.mock('../downloads/store', () => ({ useDownloads: { getState: () => ({ items: [] }) } }));
|
||||||
vi.mock('../app/queries', () => ({ invalidateLibrary: vi.fn() }));
|
vi.mock('../app/queries', () => ({ invalidateLibrary: vi.fn() }));
|
||||||
|
|
@ -42,7 +42,11 @@ const episode = (id = '1') => parseItem({ ratingKey: id, type: 'episode', title:
|
||||||
Media: [{ Part: [{ key: '/video', Stream: [{ id: 'audio', streamType: 2 }] }] }],
|
Media: [{ Part: [{ key: '/video', Stream: [{ id: 'audio', streamType: 2 }] }] }],
|
||||||
});
|
});
|
||||||
const time = (position: number) => harness.event({ type: 'property', name: 'time-pos', value: position });
|
const time = (position: number) => harness.event({ type: 'property', name: 'time-pos', value: position });
|
||||||
const eof = () => harness.event({ type: 'end-file', reason: 'eof' });
|
/** The stream ending at `position` (by default the real end of the 100 s episode). */
|
||||||
|
const eof = (position = 99.6) => {
|
||||||
|
usePlayer.setState({ position });
|
||||||
|
harness.event({ type: 'end-file', reason: 'eof' });
|
||||||
|
};
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
vi.useFakeTimers();
|
vi.useFakeTimers();
|
||||||
|
|
@ -102,6 +106,14 @@ describe('Up Next playback lifecycle', () => {
|
||||||
expect(next).toHaveBeenCalledOnce();
|
expect(next).toHaveBeenCalledOnce();
|
||||||
usePlayer.setState({ playNext: original });
|
usePlayer.setState({ playNext: original });
|
||||||
});
|
});
|
||||||
|
it('starts the next episode from the beginning, ignoring an earlier partial viewing', async () => {
|
||||||
|
const original = usePlayer.getState().play;
|
||||||
|
const spy = vi.fn().mockResolvedValue(undefined);
|
||||||
|
usePlayer.setState({ play: spy, nextUp: { ...episode('2'), viewOffset: 88000 } });
|
||||||
|
await usePlayer.getState().playNext();
|
||||||
|
expect(spy).toHaveBeenCalledWith(expect.objectContaining({ id: '2' }), expect.objectContaining({ resume: false }));
|
||||||
|
usePlayer.setState({ play: original });
|
||||||
|
});
|
||||||
it('cancels autoplay while keeping the screen open, including across EOF', () => {
|
it('cancels autoplay while keeping the screen open, including across EOF', () => {
|
||||||
time(81);
|
time(81);
|
||||||
usePlayer.getState().cancelCountdown();
|
usePlayer.getState().cancelCountdown();
|
||||||
|
|
@ -218,3 +230,51 @@ describe('Up Next playback lifecycle', () => {
|
||||||
expect(usePlayer.getState()).toMatchObject({ open: false, postPlay: false, countdown: null });
|
expect(usePlayer.getState()).toMatchObject({ open: false, postPlay: false, countdown: null });
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('Losing the server mid-stream', () => {
|
||||||
|
it('waits for the server instead of ending when the stream is cut off early', () => {
|
||||||
|
eof(42);
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ reconnecting: true, ended: false, postPlay: false });
|
||||||
|
});
|
||||||
|
it('resumes from where it stopped once the server answers again', async () => {
|
||||||
|
const original = usePlayer.getState().play;
|
||||||
|
const play = vi.fn().mockResolvedValue(undefined);
|
||||||
|
usePlayer.setState({ play });
|
||||||
|
harness.identity.mockRejectedValueOnce(new Error('unreachable'));
|
||||||
|
eof(42);
|
||||||
|
await vi.advanceTimersByTimeAsync(2000);
|
||||||
|
expect(play).not.toHaveBeenCalled();
|
||||||
|
expect(usePlayer.getState().reconnecting).toBe(true);
|
||||||
|
harness.identity.mockResolvedValueOnce({});
|
||||||
|
await vi.advanceTimersByTimeAsync(3000);
|
||||||
|
expect(play).toHaveBeenCalledWith(expect.objectContaining({ id: '1' }), expect.objectContaining({ offsetMs: 42000, keepMini: true }));
|
||||||
|
expect(usePlayer.getState().reconnecting).toBe(false);
|
||||||
|
usePlayer.setState({ play: original });
|
||||||
|
});
|
||||||
|
it('tries straight away on Play instead of starting over', async () => {
|
||||||
|
const original = usePlayer.getState().play;
|
||||||
|
const play = vi.fn().mockResolvedValue(undefined);
|
||||||
|
usePlayer.setState({ play });
|
||||||
|
harness.identity.mockResolvedValueOnce({});
|
||||||
|
eof(42);
|
||||||
|
usePlayer.getState().togglePause();
|
||||||
|
await vi.waitFor(() => expect(play).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ offsetMs: 42000 })));
|
||||||
|
expect(mpv.command).not.toHaveBeenCalledWith('seek', '0.000', 'absolute+exact');
|
||||||
|
usePlayer.setState({ play: original });
|
||||||
|
});
|
||||||
|
it('treats a second cut-off at the same place as the real end of the file', async () => {
|
||||||
|
harness.identity.mockResolvedValueOnce({});
|
||||||
|
eof(42);
|
||||||
|
await vi.advanceTimersByTimeAsync(2000);
|
||||||
|
usePlayer.setState({ firstFrame: true });
|
||||||
|
eof(42.5);
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ reconnecting: false, ended: true });
|
||||||
|
});
|
||||||
|
it('stops waiting when the player is closed', async () => {
|
||||||
|
eof(42);
|
||||||
|
await usePlayer.getState().close();
|
||||||
|
harness.identity.mockClear();
|
||||||
|
await vi.advanceTimersByTimeAsync(10000);
|
||||||
|
expect(harness.identity).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,8 @@ export interface PlayOptions {
|
||||||
quality?: Quality;
|
quality?: Quality;
|
||||||
/** Keep these track choices (UI keys) instead of applying the preferences again. */
|
/** Keep these track choices (UI keys) instead of applying the preferences again. */
|
||||||
tracks?: { audioKey: string; subKey: string };
|
tracks?: { audioKey: string; subKey: string };
|
||||||
|
/** Reloading the same title in place (after an outage): stay in the miniplayer if it's there. */
|
||||||
|
keepMini?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface PlayerState {
|
interface PlayerState {
|
||||||
|
|
@ -48,6 +50,8 @@ interface PlayerState {
|
||||||
error: string;
|
error: string;
|
||||||
/** The server owner stopped this stream (error holds their message). */
|
/** The server owner stopped this stream (error holds their message). */
|
||||||
terminated: boolean;
|
terminated: boolean;
|
||||||
|
/** The stream was cut off before the end (the server went away); waiting for it to come back. */
|
||||||
|
reconnecting: boolean;
|
||||||
position: number;
|
position: number;
|
||||||
duration: number;
|
duration: number;
|
||||||
cacheTime: number;
|
cacheTime: number;
|
||||||
|
|
@ -597,7 +601,7 @@ function onEvent(e: MpvEvent) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'eof-reached':
|
case 'eof-reached':
|
||||||
if (v === true) onEnded();
|
if (v === true) onStreamEnd();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -618,11 +622,14 @@ function onEvent(e: MpvEvent) {
|
||||||
// (Briefly: an unreachable server shouldn't hold up the error.)
|
// (Briefly: an unreachable server shouldn't hold up the error.)
|
||||||
const failed = session;
|
const failed = session;
|
||||||
Promise.race([report('buffering'), new Promise<boolean>((r) => setTimeout(() => r(false), 3000))]).then((terminated) => {
|
Promise.race([report('buffering'), new Promise<boolean>((r) => setTimeout(() => r(false), 3000))]).then((terminated) => {
|
||||||
if (terminated || !usePlayer.getState().open || session !== failed) return;
|
const now = usePlayer.getState();
|
||||||
|
if (terminated || !now.open || session !== failed) return;
|
||||||
|
// Partway through a stream that was playing, it's the connection that failed.
|
||||||
|
if (cutShort(now)) return onStreamEnd();
|
||||||
usePlayer.setState({ error: e.error ? `Playback failed: ${e.error}` : 'This video could not be played.' });
|
usePlayer.setState({ error: e.error ? `Playback failed: ${e.error}` : 'This video could not be played.' });
|
||||||
fallbackAfterError();
|
fallbackAfterError();
|
||||||
});
|
});
|
||||||
} else if (e.reason === 'eof') onEnded();
|
} else if (e.reason === 'eof') onStreamEnd();
|
||||||
break;
|
break;
|
||||||
case 'log':
|
case 'log':
|
||||||
noteMpvLog(e.level, e.prefix, e.text);
|
noteMpvLog(e.level, e.prefix, e.text);
|
||||||
|
|
@ -655,6 +662,63 @@ function maybeCredits(pos: number) {
|
||||||
} else if (!st.postPlayDismissed) openPostPlay();
|
} else if (!st.postPlayDismissed) openPostPlay();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A streamed title stopping well short of its end means the connection went
|
||||||
|
* (mpv plays out its buffer, then sees the cut-off stream as the end of the file).
|
||||||
|
*/
|
||||||
|
const CUT_SHORT_MARGIN = 15;
|
||||||
|
let reconnectTimer: ReturnType<typeof setTimeout> | null = null;
|
||||||
|
/** Where the last cut-off happened, so a file that really does end early isn't retried forever. */
|
||||||
|
let lastCutAt: number | null = null;
|
||||||
|
|
||||||
|
function cutShort(st: PlayerState) {
|
||||||
|
return st.delivery?.mode !== 'local' && st.firstFrame && st.duration > 0 && st.position < st.duration - CUT_SHORT_MARGIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The stream ran out: a real ending, or a lost connection to wait out. */
|
||||||
|
function onStreamEnd() {
|
||||||
|
const st = usePlayer.getState();
|
||||||
|
if (!cutShort(st)) return onEnded();
|
||||||
|
if (st.reconnecting || st.ended) return;
|
||||||
|
// Cut off at the same place again once the server answered: the file itself ends there.
|
||||||
|
if (lastCutAt !== null && Math.abs(st.position - lastCutAt) < 5) return onEnded();
|
||||||
|
lastCutAt = st.position;
|
||||||
|
usePlayer.setState({ reconnecting: true, buffering: false });
|
||||||
|
keepAwake(false);
|
||||||
|
scheduleReconnect(2000);
|
||||||
|
}
|
||||||
|
|
||||||
|
function stopReconnecting() {
|
||||||
|
if (reconnectTimer) clearTimeout(reconnectTimer);
|
||||||
|
reconnectTimer = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function scheduleReconnect(delay: number) {
|
||||||
|
stopReconnecting();
|
||||||
|
reconnectTimer = setTimeout(() => void tryReconnect(), delay);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Resumes where the stream was cut off if the server answers; otherwise checks again shortly. */
|
||||||
|
async function tryReconnect(): Promise<boolean> {
|
||||||
|
stopReconnecting();
|
||||||
|
const st = usePlayer.getState();
|
||||||
|
const s = server();
|
||||||
|
if (!st.open || !st.reconnecting || !st.item || !s) return false;
|
||||||
|
const reachable = await s.get('/identity', undefined, { timeout: 4000 }).then(
|
||||||
|
() => true,
|
||||||
|
() => false,
|
||||||
|
);
|
||||||
|
const now = usePlayer.getState();
|
||||||
|
if (!now.open || !now.reconnecting || now.item?.id !== st.item.id) return false;
|
||||||
|
if (!reachable) {
|
||||||
|
scheduleReconnect(3000);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
usePlayer.setState({ reconnecting: false });
|
||||||
|
await now.play(now.item, { offsetMs: now.position * 1000, mediaIndex: now.mediaIndex, quality: now.quality, tracks: currentTracks(now), keepMini: true });
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
function onEnded() {
|
function onEnded() {
|
||||||
const st = usePlayer.getState();
|
const st = usePlayer.getState();
|
||||||
if (st.ended) return;
|
if (st.ended) return;
|
||||||
|
|
@ -677,6 +741,7 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
firstFrame: false,
|
firstFrame: false,
|
||||||
error: '',
|
error: '',
|
||||||
terminated: false,
|
terminated: false,
|
||||||
|
reconnecting: false,
|
||||||
position: 0,
|
position: 0,
|
||||||
duration: 0,
|
duration: 0,
|
||||||
cacheTime: 0,
|
cacheTime: 0,
|
||||||
|
|
@ -720,6 +785,8 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const previous = get();
|
const previous = get();
|
||||||
|
stopReconnecting();
|
||||||
|
if (previous.item?.id !== input.id) lastCutAt = null;
|
||||||
// The previous title's reporting ends here, against its own server.
|
// The previous title's reporting ends here, against its own server.
|
||||||
if (reportTimer) clearInterval(reportTimer);
|
if (reportTimer) clearInterval(reportTimer);
|
||||||
reportTimer = null;
|
reportTimer = null;
|
||||||
|
|
@ -748,6 +815,7 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
firstFrame: false,
|
firstFrame: false,
|
||||||
error: '',
|
error: '',
|
||||||
terminated: false,
|
terminated: false,
|
||||||
|
reconnecting: false,
|
||||||
position: (opts.offsetMs ?? 0) / 1000,
|
position: (opts.offsetMs ?? 0) / 1000,
|
||||||
lastSeek: 0,
|
lastSeek: 0,
|
||||||
duration: input.duration / 1000,
|
duration: input.duration / 1000,
|
||||||
|
|
@ -769,7 +837,7 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
subKey: opts.tracks?.subKey ?? '__init',
|
subKey: opts.tracks?.subKey ?? '__init',
|
||||||
video: null,
|
video: null,
|
||||||
fullscreen: fullscreenNow,
|
fullscreen: fullscreenNow,
|
||||||
mini: false,
|
mini: opts.keepMini ? previous.open && previous.mini : false,
|
||||||
videoGamma: '',
|
videoGamma: '',
|
||||||
enhance: { ...previous.enhance, bypass: false, preparing: false },
|
enhance: { ...previous.enhance, bypass: false, preparing: false },
|
||||||
});
|
});
|
||||||
|
|
@ -866,6 +934,9 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
offsetMs > 0 && delivery.mode !== 'transcode' ? `start=${(offsetMs / 1000).toFixed(2)}` : 'start=none',
|
offsetMs > 0 && delivery.mode !== 'transcode' ? `start=${(offsetMs / 1000).toFixed(2)}` : 'start=none',
|
||||||
].join(',');
|
].join(',');
|
||||||
await mpv.command('loadfile', delivery.url, 'replace', -1, fileOpts);
|
await mpv.command('loadfile', delivery.url, 'replace', -1, fileOpts);
|
||||||
|
// A file left paused at its end (keep-open) re-pauses as soon as it's unpaused
|
||||||
|
// above, so a reload in place (after an outage) would open paused: unpause again.
|
||||||
|
await mpv.set('pause', false);
|
||||||
if (stale()) return;
|
if (stale()) return;
|
||||||
keepAwake(true);
|
keepAwake(true);
|
||||||
report('buffering');
|
report('buffering');
|
||||||
|
|
@ -884,6 +955,8 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
loadToken++;
|
loadToken++;
|
||||||
const st = get();
|
const st = get();
|
||||||
stopCountdown();
|
stopCountdown();
|
||||||
|
stopReconnecting();
|
||||||
|
lastCutAt = null;
|
||||||
if (reportTimer) clearInterval(reportTimer);
|
if (reportTimer) clearInterval(reportTimer);
|
||||||
reportTimer = null;
|
reportTimer = null;
|
||||||
if (st.item && !st.error) report('stopped');
|
if (st.item && !st.error) report('stopped');
|
||||||
|
|
@ -901,7 +974,7 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
await mpv.command('stop').catch(() => {});
|
await mpv.command('stop').catch(() => {});
|
||||||
await mpv.show(false).catch(() => {});
|
await mpv.show(false).catch(() => {});
|
||||||
}
|
}
|
||||||
set({ open: false, mini: false, postPlay: false, item: null, delivery: null, error: '', terminated: false, countdown: null, nextUp: null, prevUp: null, firstFrame: false });
|
set({ open: false, mini: false, postPlay: false, item: null, delivery: null, error: '', terminated: false, reconnecting: false, countdown: null, nextUp: null, prevUp: null, firstFrame: false });
|
||||||
// Closing the full player hands back the window it found; closing the
|
// Closing the full player hands back the window it found; closing the
|
||||||
// miniplayer leaves browsing as it is, full screen or not.
|
// miniplayer leaves browsing as it is, full screen or not.
|
||||||
if (!st.mini) {
|
if (!st.mini) {
|
||||||
|
|
@ -913,6 +986,13 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
|
|
||||||
togglePause() {
|
togglePause() {
|
||||||
const st = get();
|
const st = get();
|
||||||
|
// Play while the server is away: try it now rather than at the next check.
|
||||||
|
if (st.reconnecting) {
|
||||||
|
tryReconnect().then((resumed) => {
|
||||||
|
if (!resumed && get().reconnecting) toast(`Still can’t reach ${server()?.name ?? 'the server'}.`);
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (st.ended) {
|
if (st.ended) {
|
||||||
st.seek(0);
|
st.seek(0);
|
||||||
set({ ended: false });
|
set({ ended: false });
|
||||||
|
|
@ -1019,13 +1099,15 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
const st = get();
|
const st = get();
|
||||||
stopCountdown();
|
stopCountdown();
|
||||||
if (!st.nextUp) return;
|
if (!st.nextUp) return;
|
||||||
await st.play(st.nextUp, { resume: true, quality: st.quality });
|
// Watching on through a season starts each episode from the top, never at a
|
||||||
|
// stale position left by an earlier, unfinished viewing.
|
||||||
|
await st.play(st.nextUp, { resume: false, quality: st.quality });
|
||||||
},
|
},
|
||||||
|
|
||||||
async playPrevious() {
|
async playPrevious() {
|
||||||
const st = get();
|
const st = get();
|
||||||
if (!st.prevUp) return;
|
if (!st.prevUp) return;
|
||||||
await st.play(st.prevUp, { resume: true, quality: st.quality });
|
await st.play(st.prevUp, { resume: false, quality: st.quality });
|
||||||
},
|
},
|
||||||
|
|
||||||
cancelCountdown() {
|
cancelCountdown() {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ import { parseItem, parseScores } from './parse';
|
||||||
import { isLocalAddress } from './account';
|
import { isLocalAddress } from './account';
|
||||||
import { partAt } from './playback';
|
import { partAt } from './playback';
|
||||||
import { headerSafe } from './client';
|
import { headerSafe } from './client';
|
||||||
import { duration, formatBadges, isWatched, remaining, washGradient } from '../app/format';
|
import { duration, formatBadges, isWatched, remaining, resumable, washGradient } from '../app/format';
|
||||||
import { buildFeatures } from '../screens/discover';
|
import { buildFeatures } from '../screens/discover';
|
||||||
import type { Hub } from './types';
|
import type { Hub } from './types';
|
||||||
|
|
||||||
|
|
@ -65,10 +65,16 @@ describe('parsing', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('watched rules', () => {
|
describe('watched rules', () => {
|
||||||
it('treats a resumed title as watched only past the threshold', () => {
|
it('keeps a title watched while it is being rewatched', () => {
|
||||||
expect(isWatched(movie({ viewCount: 1, viewOffset: 3000000 }), 90)).toBe(false);
|
expect(isWatched(movie({ viewCount: 1, viewOffset: 3000000 }), 90)).toBe(true);
|
||||||
expect(isWatched(movie({ viewCount: 1, viewOffset: 5700000 }), 90)).toBe(true);
|
|
||||||
expect(isWatched(movie({ viewCount: 1 }), 90)).toBe(true);
|
expect(isWatched(movie({ viewCount: 1 }), 90)).toBe(true);
|
||||||
|
expect(resumable(movie({ viewCount: 1, viewOffset: 3000000 }))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('counts an unplayed title as watched only past the threshold', () => {
|
||||||
|
expect(isWatched(movie({ viewOffset: 3000000 }), 90)).toBe(false);
|
||||||
|
expect(isWatched(movie({ viewOffset: 5700000 }), 90)).toBe(true);
|
||||||
|
expect(isWatched(movie({}), 90)).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('uses episode counts for shows', () => {
|
it('uses episode counts for shows', () => {
|
||||||
|
|
|
||||||
|
|
@ -4,12 +4,12 @@ import type { Item } from '../plex/types';
|
||||||
import { PROGRESS, useChildren, useItem, useRelated, useServerQuery } from '../app/queries';
|
import { PROGRESS, useChildren, useItem, useRelated, useServerQuery } from '../app/queries';
|
||||||
import { useServer } from '../app/session';
|
import { useServer } from '../app/session';
|
||||||
import { useSettings } from '../app/settings';
|
import { useSettings } from '../app/settings';
|
||||||
import { goBack, navigate, useRouter } from '../app/router';
|
import { goBack, navigate } from '../app/router';
|
||||||
import { canManage, itemMenu, openDialog, openItem, playItem, playWithVersion, setWatched, shuffleItem } from '../app/actions';
|
import { canManage, itemMenu, openDialog, playItem, playWithVersion, setWatched, shuffleItem } from '../app/actions';
|
||||||
import { bitrate, channelLabel, date, duration, episodeLabel, extraLabel, fileSize, isWatched, remaining, resolutionLabel, technicalLine } from '../app/format';
|
import { bitrate, channelLabel, date, duration, episodeLabel, extraLabel, fileSize, isWatched, remaining, remainingEpisodes, resolutionLabel, resumable, technicalLine } from '../app/format';
|
||||||
import { Backdrop } from '../ui/Backdrop';
|
import { Backdrop } from '../ui/Backdrop';
|
||||||
import { Facts, HubShelf, LandscapeCard, PersonCard, PosterCard, Shelf, TitleArt } from '../ui/media';
|
import { EpisodeCard, Facts, HubShelf, LandscapeCard, PersonCard, PosterCard, Shelf, TitleArt } from '../ui/media';
|
||||||
import { Artwork, Button, EmptyState, ErrorState, IconButton, PageLoader, Select } from '../ui/primitives';
|
import { Artwork, Button, EmptyState, ErrorState, IconButton, PageLoader } from '../ui/primitives';
|
||||||
import { Icon } from '../ui/Icon';
|
import { Icon } from '../ui/Icon';
|
||||||
import { openMenu } from '../ui/overlays';
|
import { openMenu } from '../ui/overlays';
|
||||||
import { useDownloads } from '../downloads/store';
|
import { useDownloads } from '../downloads/store';
|
||||||
|
|
@ -255,11 +255,12 @@ function AboutPanel({ item }: { item: Item }) {
|
||||||
// —— Movie ——————————————————————————————————————————————————————————
|
// —— Movie ——————————————————————————————————————————————————————————
|
||||||
|
|
||||||
function MovieDetail({ item }: { item: Item }) {
|
function MovieDetail({ item }: { item: Item }) {
|
||||||
const resume = item.viewOffset > 0 && !isWatched(item);
|
const resume = resumable(item);
|
||||||
return (
|
return (
|
||||||
<div className="detail movie">
|
<div className="detail movie">
|
||||||
<DetailHero item={item}>
|
<DetailHero item={item}>
|
||||||
<Facts item={item} />
|
{/* The Resume button carries the time left; the facts give the runtime. */}
|
||||||
|
<Facts item={{ ...item, viewOffset: 0 }} />
|
||||||
<Synopsis item={item} text={item.summary} />
|
<Synopsis item={item} text={item.summary} />
|
||||||
<div className="actions detail-actions">
|
<div className="actions detail-actions">
|
||||||
<Button variant="primary" icon="play" onClick={() => playWithVersion(item)}>
|
<Button variant="primary" icon="play" onClick={() => playWithVersion(item)}>
|
||||||
|
|
@ -298,115 +299,75 @@ function MovieDetail({ item }: { item: Item }) {
|
||||||
|
|
||||||
// —— Shows and seasons ————————————————————————————————————————————
|
// —— Shows and seasons ————————————————————————————————————————————
|
||||||
|
|
||||||
function EpisodeRow({ ep }: { ep: Item }) {
|
function EpisodeGrid({ episodes, upNextId }: { episodes: Item[] | undefined; upNextId?: string }) {
|
||||||
const server = useServer();
|
if (!episodes) return <PageLoader />;
|
||||||
const percent = useSettings((s) => s.watchedPercent);
|
if (!episodes.length) return <EmptyState icon="tv" title="No episodes" />;
|
||||||
const watched = isWatched(ep, percent);
|
|
||||||
const p = ep.viewOffset && ep.duration ? ep.viewOffset / ep.duration : 0;
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div className="episode-grid">
|
||||||
className="episode-row"
|
{episodes.map((ep) => (
|
||||||
role="button"
|
<EpisodeCard key={ep.id} item={ep} upNext={ep.id === upNextId} />
|
||||||
tabIndex={0}
|
))}
|
||||||
onClick={() => openItem(ep)}
|
|
||||||
onKeyDown={(e) => e.key === 'Enter' && openItem(ep)}
|
|
||||||
onContextMenu={(e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
openMenu(itemMenu(ep), { x: e.clientX, y: e.clientY });
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<div className="episode-index">{ep.index || '–'}</div>
|
|
||||||
<div className="episode-pic">
|
|
||||||
<Artwork src={server.image(ep.thumb, 320, 180)} />
|
|
||||||
<button
|
|
||||||
className="episode-play"
|
|
||||||
aria-label={`Play ${ep.title}`}
|
|
||||||
onClick={(e) => {
|
|
||||||
e.stopPropagation();
|
|
||||||
playWithVersion(ep);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Icon name="play" size={18} />
|
|
||||||
</button>
|
|
||||||
{p > 0 && !watched && (
|
|
||||||
<span className="progress-line">
|
|
||||||
<i style={{ width: `${p * 100}%` }} />
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="episode-text">
|
|
||||||
<h3>
|
|
||||||
{ep.title}
|
|
||||||
{watched && <Icon name="check" size={15} className="episode-watched" />}
|
|
||||||
</h3>
|
|
||||||
<div className="episode-meta">
|
|
||||||
{[duration(ep.duration), ep.originallyAvailableAt ? date(ep.originallyAvailableAt) : '', ep.viewOffset && !watched ? remaining(ep) : ''].filter(Boolean).join(' · ')}
|
|
||||||
</div>
|
|
||||||
{ep.summary && <p>{ep.summary}</p>}
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
className="icon-btn episode-more"
|
|
||||||
aria-label="More"
|
|
||||||
onClick={(e) => {
|
|
||||||
e.stopPropagation();
|
|
||||||
openMenu(itemMenu(ep), e.currentTarget);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Icon name="dots" size={18} />
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function Episodes({ seasons, initialSeason, showPicker = true }: { seasons: Item[]; initialSeason?: string; showPicker?: boolean }) {
|
function EpisodesSection({ episodes, subtitle, upNextId }: { episodes: Item[] | undefined; subtitle?: string; upNextId?: string }) {
|
||||||
const saved = useRouter((s) => s.current.state.season as string | undefined);
|
|
||||||
const [seasonId, setSeasonId] = useState(saved ?? initialSeason ?? seasons[0]?.id);
|
|
||||||
useEffect(() => {
|
|
||||||
if (!seasonId && seasons[0]) setSeasonId(initialSeason ?? seasons[0].id);
|
|
||||||
}, [seasons, initialSeason]);
|
|
||||||
const episodes = useChildren(seasonId);
|
|
||||||
const season = seasons.find((s) => s.id === seasonId);
|
|
||||||
if (!seasons.length) return null;
|
|
||||||
return (
|
return (
|
||||||
<section className="episodes">
|
<section className="episodes">
|
||||||
<div className="episodes-head">
|
<div className="shelf-head">
|
||||||
<h2>Episodes</h2>
|
<h2>
|
||||||
{showPicker && seasons.length > 1 && (
|
Episodes
|
||||||
<Select
|
{subtitle && <small>{subtitle}</small>}
|
||||||
value={seasonId!}
|
</h2>
|
||||||
label="Season"
|
|
||||||
options={seasons.map((s) => ({ value: s.id, label: s.title, hint: s.leafCount ? `${s.leafCount} ep` : undefined }))}
|
|
||||||
onChange={(v) => {
|
|
||||||
setSeasonId(v);
|
|
||||||
useRouter.getState().setState({ season: v });
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{season && (
|
|
||||||
<span className="episodes-sub">
|
|
||||||
{season.leafCount} episodes{season.year ? ` · ${season.year}` : ''}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
{season?.summary && <p className="season-summary">{season.summary}</p>}
|
|
||||||
<div className="episode-list">
|
|
||||||
{episodes.isLoading && <PageLoader />}
|
|
||||||
{episodes.data?.map((ep) => <EpisodeRow key={ep.id} ep={ep} />)}
|
|
||||||
{episodes.data && !episodes.data.length && <EmptyState icon="tv" title="No episodes" />}
|
|
||||||
</div>
|
</div>
|
||||||
|
<EpisodeGrid episodes={episodes} upNextId={upNextId} />
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The season's name, which opens a menu of the show's other seasons. */
|
||||||
|
function SeasonSwitcher({ season, seasons }: { season: Item; seasons: Item[] }) {
|
||||||
|
if (seasons.length < 2) return <h1 className="detail-subtitle">{season.title}</h1>;
|
||||||
|
const choose = (e: React.MouseEvent<HTMLButtonElement>) =>
|
||||||
|
openMenu(
|
||||||
|
seasons.map((s) => ({
|
||||||
|
label: s.title,
|
||||||
|
hint: s.leafCount ? `${s.leafCount} episodes` : undefined,
|
||||||
|
checked: s.id === season.id,
|
||||||
|
// Replace, so Back still returns to the show rather than through each season.
|
||||||
|
onSelect: () => s.id !== season.id && navigate({ name: 'item', id: s.id, title: s.title }, { replace: true }),
|
||||||
|
})),
|
||||||
|
e.currentTarget,
|
||||||
|
{ minWidth: 240 },
|
||||||
|
);
|
||||||
|
return (
|
||||||
|
<h1 className="detail-subtitle">
|
||||||
|
<button className="season-switch" aria-haspopup="menu" title="Choose a season" onClick={choose}>
|
||||||
|
{season.title}
|
||||||
|
<Icon name="chevronDown" size={20} strokeWidth={2.4} />
|
||||||
|
</button>
|
||||||
|
</h1>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** "24 episodes · 8 unwatched", by Plex's own counts so it agrees with the Watched button. */
|
||||||
|
function seasonSubtitle(season: Item) {
|
||||||
|
const count = season.leafCount;
|
||||||
|
if (!count) return '';
|
||||||
|
const left = remainingEpisodes(season);
|
||||||
|
return [`${count} episode${count === 1 ? '' : 's'}`, left > 0 && left < count ? `${left} unwatched` : ''].filter(Boolean).join(' · ');
|
||||||
|
}
|
||||||
|
|
||||||
function ShowDetail({ item }: { item: Item }) {
|
function ShowDetail({ item }: { item: Item }) {
|
||||||
const seasons = useChildren(item.id);
|
const seasons = useChildren(item.id);
|
||||||
const server = useServer();
|
|
||||||
const next = useServerQuery(['onDeck', item.id], (s) => api.onDeckFor(s, item), PROGRESS);
|
const next = useServerQuery(['onDeck', item.id], (s) => api.onDeckFor(s, item), PROGRESS);
|
||||||
const nextEp = next.data;
|
const nextEp = next.data;
|
||||||
const seasonList = (seasons.data ?? []).filter((s) => s.type === 'season');
|
const seasonList = (seasons.data ?? []).filter((s) => s.type === 'season');
|
||||||
|
// A single-season show lists its episodes here instead of one lonely poster.
|
||||||
|
const only = seasonList.length === 1 ? seasonList[0] : undefined;
|
||||||
|
const onlyEpisodes = useChildren(only?.id);
|
||||||
const percent = useSettings((s) => s.watchedPercent);
|
const percent = useSettings((s) => s.watchedPercent);
|
||||||
const playLabel = nextEp ? (nextEp.viewOffset ? `Resume ${episodeLabel(nextEp)}` : isWatched(item, percent) ? 'Play' : item.viewedLeafCount ? `Watch ${episodeLabel(nextEp)}` : 'Play') : 'Play';
|
const playLabel = nextEp ? (resumable(nextEp) ? `Resume ${episodeLabel(nextEp)}` : isWatched(item, percent) ? 'Play' : item.viewedLeafCount ? `Watch ${episodeLabel(nextEp)}` : 'Play') : 'Play';
|
||||||
void server;
|
|
||||||
return (
|
return (
|
||||||
<div className="detail show">
|
<div className="detail show">
|
||||||
<DetailHero item={item}>
|
<DetailHero item={item}>
|
||||||
|
|
@ -424,14 +385,16 @@ function ShowDetail({ item }: { item: Item }) {
|
||||||
<DownloadButton item={item} />
|
<DownloadButton item={item} />
|
||||||
<MoreButton item={item} onDeleted={goBack} />
|
<MoreButton item={item} onDeleted={goBack} />
|
||||||
</div>
|
</div>
|
||||||
|
{/* The button names the episode number; this adds its title, and the time left when resuming. */}
|
||||||
{nextEp && (
|
{nextEp && (
|
||||||
<div className="detail-tech">
|
<div className="detail-tech">
|
||||||
Up next: {episodeLabel(nextEp)} · {nextEp.title}
|
Up next: {[nextEp.title, resumable(nextEp) ? remaining(nextEp) : ''].filter(Boolean).join(' · ')}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</DetailHero>
|
</DetailHero>
|
||||||
<div className="detail-body">
|
<div className="detail-body">
|
||||||
<div className="detail-main">
|
<div className="detail-main">
|
||||||
|
{seasons.isLoading && <PageLoader />}
|
||||||
{seasonList.length > 1 && (
|
{seasonList.length > 1 && (
|
||||||
<Shelf title="Seasons">
|
<Shelf title="Seasons">
|
||||||
{seasonList.map((s) => (
|
{seasonList.map((s) => (
|
||||||
|
|
@ -439,7 +402,7 @@ function ShowDetail({ item }: { item: Item }) {
|
||||||
))}
|
))}
|
||||||
</Shelf>
|
</Shelf>
|
||||||
)}
|
)}
|
||||||
{seasons.isLoading ? <PageLoader /> : <Episodes seasons={seasonList} initialSeason={nextEp?.parentId} />}
|
{only && <EpisodesSection episodes={onlyEpisodes.data} subtitle={seasonSubtitle(only)} upNextId={nextEp?.id} />}
|
||||||
<CastRow item={item} />
|
<CastRow item={item} />
|
||||||
<ExtrasRow item={item} />
|
<ExtrasRow item={item} />
|
||||||
<RelatedRows item={item} />
|
<RelatedRows item={item} />
|
||||||
|
|
@ -452,12 +415,21 @@ function ShowDetail({ item }: { item: Item }) {
|
||||||
|
|
||||||
function SeasonDetail({ item }: { item: Item }) {
|
function SeasonDetail({ item }: { item: Item }) {
|
||||||
const show = useItem(item.parentId);
|
const show = useItem(item.parentId);
|
||||||
|
const showItem = show.data;
|
||||||
|
const episodes = useChildren(item.id);
|
||||||
const siblings = useChildren(item.parentId);
|
const siblings = useChildren(item.parentId);
|
||||||
const seasonList = (siblings.data ?? []).filter((s) => s.type === 'season');
|
const seasonList = (siblings.data ?? []).filter((s) => s.type === 'season');
|
||||||
const episodes = useChildren(item.id);
|
const deck = useServerQuery(['onDeck', item.parentId], (s) => (showItem ? api.onDeckFor(s, showItem) : Promise.resolve(null)), { ...PROGRESS, enabled: !!showItem });
|
||||||
const percent = useSettings((s) => s.watchedPercent);
|
const percent = useSettings((s) => s.watchedPercent);
|
||||||
const next = (episodes.data ?? []).find((e) => !isWatched(e, percent)) ?? episodes.data?.[0];
|
const list = episodes.data ?? [];
|
||||||
const showItem = show.data;
|
// The show's up-next episode when it is in this season (so the season page and the
|
||||||
|
// show page agree), else the first one started but never finished, else the first
|
||||||
|
// unwatched, else the start of the season. Positions left by rewatches don't count.
|
||||||
|
const deckHere = deck.data?.parentId === item.id ? list.find((e) => e.id === deck.data!.id) : undefined;
|
||||||
|
const next = deckHere ?? list.find((e) => resumable(e) && !isWatched(e, percent)) ?? list.find((e) => !isWatched(e, percent)) ?? list[0];
|
||||||
|
const resumeNext = !!next && resumable(next) && (next === deckHere || !isWatched(next, percent));
|
||||||
|
const aired = list.find((e) => e.originallyAvailableAt)?.originallyAvailableAt;
|
||||||
|
const year = aired ? new Date(aired).getFullYear() : item.year;
|
||||||
return (
|
return (
|
||||||
<div className="detail season">
|
<div className="detail season">
|
||||||
<DetailHero
|
<DetailHero
|
||||||
|
|
@ -472,15 +444,15 @@ function SeasonDetail({ item }: { item: Item }) {
|
||||||
) : (
|
) : (
|
||||||
<h2 className="title-text small">{item.parentTitle}</h2>
|
<h2 className="title-text small">{item.parentTitle}</h2>
|
||||||
)}
|
)}
|
||||||
<h1 className="detail-subtitle">{item.title}</h1>
|
<SeasonSwitcher season={item} seasons={seasonList} />
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Facts item={{ ...item, contentRating: showItem?.contentRating ?? item.contentRating, genres: [] }} />
|
<Facts item={{ ...item, year, contentRating: showItem?.contentRating ?? item.contentRating, genres: [] }} />
|
||||||
<Synopsis item={item} text={item.summary || showItem?.summary || ''} />
|
<Synopsis item={item} text={item.summary || showItem?.summary || ''} />
|
||||||
<div className="actions detail-actions">
|
<div className="actions detail-actions">
|
||||||
<Button variant="primary" icon="play" disabled={!next} onClick={() => next && playWithVersion(next)}>
|
<Button variant="primary" icon="play" disabled={!next} onClick={() => next && playWithVersion(next, resumeNext ? {} : { offsetMs: 0, resume: false })}>
|
||||||
{next ? (next.viewOffset ? `Resume ${episodeLabel(next)}` : `Play ${episodeLabel(next)}`) : 'Play'}
|
{next ? `${resumeNext ? 'Resume' : 'Play'} ${episodeLabel(next)}` : 'Play'}
|
||||||
</Button>
|
</Button>
|
||||||
<WatchedButton item={item} />
|
<WatchedButton item={item} />
|
||||||
<DownloadButton item={item} />
|
<DownloadButton item={item} />
|
||||||
|
|
@ -489,7 +461,7 @@ function SeasonDetail({ item }: { item: Item }) {
|
||||||
</DetailHero>
|
</DetailHero>
|
||||||
<div className="detail-body single">
|
<div className="detail-body single">
|
||||||
<div className="detail-main">
|
<div className="detail-main">
|
||||||
<Episodes seasons={seasonList.length ? seasonList : [item]} initialSeason={item.id} />
|
<EpisodesSection episodes={episodes.data} subtitle={seasonSubtitle(item)} upNextId={resumeNext ? next?.id : undefined} />
|
||||||
{showItem && <CastRow item={showItem} />}
|
{showItem && <CastRow item={showItem} />}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -500,7 +472,7 @@ function SeasonDetail({ item }: { item: Item }) {
|
||||||
function EpisodeDetail({ item }: { item: Item }) {
|
function EpisodeDetail({ item }: { item: Item }) {
|
||||||
const show = useItem(item.grandparentId);
|
const show = useItem(item.grandparentId);
|
||||||
const siblings = useChildren(item.parentId);
|
const siblings = useChildren(item.parentId);
|
||||||
const resume = item.viewOffset > 0 && !isWatched(item);
|
const resume = resumable(item);
|
||||||
const showItem = show.data;
|
const showItem = show.data;
|
||||||
const others = (siblings.data ?? []).filter((e) => e.id !== item.id);
|
const others = (siblings.data ?? []).filter((e) => e.id !== item.id);
|
||||||
const startIndex = Math.max(0, (siblings.data ?? []).findIndex((e) => e.id === item.id));
|
const startIndex = Math.max(0, (siblings.data ?? []).findIndex((e) => e.id === item.id));
|
||||||
|
|
@ -523,7 +495,7 @@ function EpisodeDetail({ item }: { item: Item }) {
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Facts item={{ ...item, contentRating: item.contentRating || showItem?.contentRating || '' }} />
|
<Facts item={{ ...item, viewOffset: 0, contentRating: item.contentRating || showItem?.contentRating || '' }} />
|
||||||
<Synopsis item={item} text={item.summary} />
|
<Synopsis item={item} text={item.summary} />
|
||||||
<div className="actions detail-actions">
|
<div className="actions detail-actions">
|
||||||
<Button variant="primary" icon="play" onClick={() => playWithVersion(item)}>
|
<Button variant="primary" icon="play" onClick={() => playWithVersion(item)}>
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@ import { useEffect, useRef } from 'react';
|
||||||
import { useSettings } from '../app/settings';
|
import { useSettings } from '../app/settings';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The cold-start brand sequence: a kaleidoscope. A mirrored field of shards
|
* The cold-start brand sequence, kept short because desktop startup is quick:
|
||||||
* turns and gathers into the mark's six facets; if startup is still going,
|
* the mark's six facets spin in from a loose ring and snap together with a
|
||||||
* small shards keep circling the mark. Once startup is ready the camera flies
|
* ring pulse. If startup is still going, small shards circle the mark. Once
|
||||||
* through the mark's open centre, revealing the app drawn beneath (which
|
* startup is ready the camera flies through the mark's open centre, revealing
|
||||||
* settles from a slight zoom, `html.splash-arrival`).
|
* the app drawn beneath (which settles from a slight zoom, `html.splash-arrival`).
|
||||||
*/
|
*/
|
||||||
|
|
||||||
type Point = { x: number; y: number };
|
type Point = { x: number; y: number };
|
||||||
|
|
@ -51,7 +51,7 @@ const rad = (deg: number) => (deg * Math.PI) / 180;
|
||||||
const PALETTE = ['#C3E8D3', '#71B9B0', '#3D7C7B', '#D0A977', '#E9D8AE', '#EEF2DD'];
|
const PALETTE = ['#C3E8D3', '#71B9B0', '#3D7C7B', '#D0A977', '#E9D8AE', '#EEF2DD'];
|
||||||
|
|
||||||
// The brand mark's facets, centred on its 64-unit viewport, each with the
|
// The brand mark's facets, centred on its 64-unit viewport, each with the
|
||||||
// angle of its hexagon edge's outward normal and its centroid.
|
// outward normal of its hexagon edge and its centroid.
|
||||||
const FACETS = [
|
const FACETS = [
|
||||||
[33, 4, 55.5, 17, 42.5, 24.5, 33, 19],
|
[33, 4, 55.5, 17, 42.5, 24.5, 33, 19],
|
||||||
[56.5, 19, 56.5, 45, 43.5, 37.5, 43.5, 26.5],
|
[56.5, 19, 56.5, 45, 43.5, 37.5, 43.5, 26.5],
|
||||||
|
|
@ -63,48 +63,46 @@ const FACETS = [
|
||||||
const points: Point[] = [];
|
const points: Point[] = [];
|
||||||
for (let k = 0; k < pts.length; k += 2) points.push({ x: pts[k] - 32, y: pts[k + 1] - 32 });
|
for (let k = 0; k < pts.length; k += 2) points.push({ x: pts[k] - 32, y: pts[k + 1] - 32 });
|
||||||
const centroid = { x: points.reduce((s, p) => s + p.x, 0) / 4, y: points.reduce((s, p) => s + p.y, 0) / 4 };
|
const centroid = { x: points.reduce((s, p) => s + p.x, 0) / 4, y: points.reduce((s, p) => s + p.y, 0) / 4 };
|
||||||
return { points, centroid, color: PALETTE[i], angle: rad(-60 + 60 * i) };
|
const angle = rad(-60 + 60 * i);
|
||||||
|
return { points, centroid, color: PALETTE[i], normal: { x: Math.cos(angle), y: Math.sin(angle) } };
|
||||||
});
|
});
|
||||||
type Facet = (typeof FACETS)[number];
|
type Facet = (typeof FACETS)[number];
|
||||||
|
|
||||||
// Loose shards around each facet: angle offset from the facet's normal, starting
|
|
||||||
// radius (px), size, palette offset and how far they tumble on the way in.
|
|
||||||
const SHARDS = [
|
|
||||||
{ angle: 20, radius: 170, scale: 0.42, color: 2, spin: 1.2 },
|
|
||||||
{ angle: -20, radius: 170, scale: 0.42, color: 4, spin: -1.2 },
|
|
||||||
{ angle: 36, radius: 320, scale: 0.3, color: 3, spin: 2.1 },
|
|
||||||
{ angle: -36, radius: 320, scale: 0.3, color: 1, spin: -2.1 },
|
|
||||||
{ angle: 8, radius: 420, scale: 0.2, color: 5, spin: 3 },
|
|
||||||
{ angle: -8, radius: 420, scale: 0.2, color: 5, spin: -3 },
|
|
||||||
];
|
|
||||||
|
|
||||||
// The inner hexagon traced by the facets' inner edges: the aperture the exit flies through.
|
// The inner hexagon traced by the facets' inner edges: the aperture the exit flies through.
|
||||||
const INNER_RADIUS = 13.6;
|
const INNER_RADIUS = 13.6;
|
||||||
const MARK_BOX = 140;
|
const MARK_BOX = 140;
|
||||||
// Timeline (ms): the mark has formed at INTRO_END; the sequence then idles until startup is ready.
|
// Timeline (ms): the last facet locks at INTRO_END; the sequence then idles until startup is ready.
|
||||||
const INTRO_END = 1700;
|
const FACET_STAGGER = 18;
|
||||||
const EXIT_MS = 640;
|
const FACET_MS = 350;
|
||||||
// The mark is larger than the old lockup, so it zooms less to end the flight at the same size.
|
const INTRO_END = FACET_STAGGER * 5 + FACET_MS;
|
||||||
|
// Still waiting at this point: shards start circling and a sheen crosses the mark.
|
||||||
|
const IDLE_START = 1100;
|
||||||
|
// Keep in step with the `splash-arrival` animation in app.css.
|
||||||
|
const EXIT_MS = 540;
|
||||||
const FLIGHT_ZOOM = 30;
|
const FLIGHT_ZOOM = 30;
|
||||||
|
|
||||||
const INK = '#090a0c';
|
const INK = '#090a0c';
|
||||||
const SEA_GLASS = [113, 185, 176];
|
const SEA_GLASS = [113, 185, 176];
|
||||||
const LIGHT = [238, 242, 221];
|
|
||||||
const rgba = (c: number[], a: number) => `rgba(${c[0]}, ${c[1]}, ${c[2]}, ${Math.max(0, a)})`;
|
const rgba = (c: number[], a: number) => `rgba(${c[0]}, ${c[1]}, ${c[2]}, ${Math.max(0, a)})`;
|
||||||
|
|
||||||
/** A facet turned `rot` about the mark centre, shrunk and spun about its own centroid, then offset. */
|
/**
|
||||||
function facetPath(ctx: CanvasRenderingContext2D, f: Facet, o: Point, unit: number, rot: number, scale: number, spin: number, offset: Point) {
|
* Facet `f` around mark centre `o`, `unit` px per grid unit: pushed `out` along its
|
||||||
|
* normal, shrunk and spun about its own centroid, then turned `rot` about the mark centre.
|
||||||
|
*/
|
||||||
|
function facetPath(ctx: CanvasRenderingContext2D, f: Facet, o: Point, unit: number, out = 0, scale = 1, spin = 0, rot = 0) {
|
||||||
const cr = Math.cos(rot);
|
const cr = Math.cos(rot);
|
||||||
const sr = Math.sin(rot);
|
const sr = Math.sin(rot);
|
||||||
const cs = Math.cos(spin);
|
const cs = Math.cos(spin);
|
||||||
const ss = Math.sin(spin);
|
const ss = Math.sin(spin);
|
||||||
|
const cx = f.centroid.x + f.normal.x * out;
|
||||||
|
const cy = f.centroid.y + f.normal.y * out;
|
||||||
f.points.forEach((p, i) => {
|
f.points.forEach((p, i) => {
|
||||||
const rx = p.x - f.centroid.x;
|
const rx = p.x + f.normal.x * out - cx;
|
||||||
const ry = p.y - f.centroid.y;
|
const ry = p.y + f.normal.y * out - cy;
|
||||||
const x = f.centroid.x + (rx * cs - ry * ss) * scale;
|
const x = cx + (rx * cs - ry * ss) * scale;
|
||||||
const y = f.centroid.y + (rx * ss + ry * cs) * scale;
|
const y = cy + (rx * ss + ry * cs) * scale;
|
||||||
const px = o.x + (x * cr - y * sr) * unit + offset.x;
|
const px = o.x + (x * cr - y * sr) * unit;
|
||||||
const py = o.y + (x * sr + y * cr) * unit + offset.y;
|
const py = o.y + (x * sr + y * cr) * unit;
|
||||||
if (i === 0) ctx.moveTo(px, py);
|
if (i === 0) ctx.moveTo(px, py);
|
||||||
else ctx.lineTo(px, py);
|
else ctx.lineTo(px, py);
|
||||||
});
|
});
|
||||||
|
|
@ -142,9 +140,6 @@ function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number,
|
||||||
ctx.clearRect(0, 0, w, h);
|
ctx.clearRect(0, 0, w, h);
|
||||||
const zoom = q > 0 ? Math.exp(Math.log(FLIGHT_ZOOM) * Flight(q)) : 1;
|
const zoom = q > 0 ? Math.exp(Math.log(FLIGHT_ZOOM) * Flight(q)) : 1;
|
||||||
const unit = (MARK_BOX / 64) * zoom;
|
const unit = (MARK_BOX / 64) * zoom;
|
||||||
const gather = Emphasized(phase(time, 0, 1450));
|
|
||||||
// The whole field turns a little less than half a revolution as it gathers.
|
|
||||||
const field = rad(-150) * (1 - Emphasized(phase(time, 0, 1550)));
|
|
||||||
|
|
||||||
// The surface: ink everywhere, with the aperture's centre cut away on exit.
|
// The surface: ink everywhere, with the aperture's centre cut away on exit.
|
||||||
const hole = InOut(phase(q, 0.12, 0.5));
|
const hole = InOut(phase(q, 0.12, 0.5));
|
||||||
|
|
@ -163,25 +158,7 @@ function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number,
|
||||||
ctx.globalAlpha = 1;
|
ctx.globalAlpha = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The kaleidoscope's mirror lines, turning with the field.
|
const bloom = 0.09 * InOut(phase(time, 0, 260)) * (1 - Standard(phase(time, 420, 1100)));
|
||||||
const lines = InOut(phase(time, 0, 450)) * (1 - Standard(phase(time, 1100, 1700)));
|
|
||||||
if (lines > 0) {
|
|
||||||
ctx.lineWidth = 1;
|
|
||||||
for (let s = 0; s < 6; s++) {
|
|
||||||
const a = field + rad(-90 + 60 * s);
|
|
||||||
const end = { x: o.x + Math.cos(a) * 640, y: o.y + Math.sin(a) * 640 };
|
|
||||||
const g = ctx.createLinearGradient(o.x, o.y, end.x, end.y);
|
|
||||||
g.addColorStop(0, rgba(LIGHT, 0.2 * lines));
|
|
||||||
g.addColorStop(1, rgba(LIGHT, 0));
|
|
||||||
ctx.strokeStyle = g;
|
|
||||||
ctx.beginPath();
|
|
||||||
ctx.moveTo(o.x, o.y);
|
|
||||||
ctx.lineTo(end.x, end.y);
|
|
||||||
ctx.stroke();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const bloom = 0.09 * InOut(phase(time, 200, 1000)) * (1 - Standard(phase(time, 1500, 2600)));
|
|
||||||
if (bloom > 0.001) {
|
if (bloom > 0.001) {
|
||||||
ctx.globalCompositeOperation = 'lighter';
|
ctx.globalCompositeOperation = 'lighter';
|
||||||
const g = ctx.createRadialGradient(o.x, o.y, 0, o.x, o.y, 300);
|
const g = ctx.createRadialGradient(o.x, o.y, 0, o.x, o.y, 300);
|
||||||
|
|
@ -195,56 +172,36 @@ function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number,
|
||||||
ctx.globalCompositeOperation = 'source-over';
|
ctx.globalCompositeOperation = 'source-over';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Shards spiral inward, faster than the field turns, and vanish into the centre.
|
// The six facets spin in from a loose ring and lock into the mark.
|
||||||
ctx.globalCompositeOperation = 'screen';
|
|
||||||
const inward = Emphasized(phase(time, 0, 1350));
|
|
||||||
FACETS.forEach((f, s) => {
|
FACETS.forEach((f, s) => {
|
||||||
SHARDS.forEach((d, j) => {
|
const start = s * FACET_STAGGER;
|
||||||
const appear = Standard(phase(time, j * 50 + s * 25, j * 50 + s * 25 + 420));
|
const p = Emphasized(phase(time, start, start + FACET_MS));
|
||||||
const vanish = Standard(phase(time, 750 + j * 45, 1350 + j * 45));
|
ctx.globalAlpha = Standard(phase(time, start, start + 160));
|
||||||
if (appear <= 0 || vanish >= 1) return;
|
|
||||||
const a = f.angle + rad(d.angle) + field * 1.5;
|
|
||||||
const r = d.radius * (1 - 0.88 * inward);
|
|
||||||
ctx.globalAlpha = appear * (1 - vanish) * 0.9;
|
|
||||||
ctx.fillStyle = PALETTE[(s + d.color) % 6];
|
|
||||||
ctx.beginPath();
|
|
||||||
shardPath(ctx, f, { x: o.x + Math.cos(a) * r, y: o.y + Math.sin(a) * r }, unit * d.scale * (1 - 0.6 * vanish), field * 2 + d.spin * (1 - gather));
|
|
||||||
ctx.fill();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
ctx.globalAlpha = 1;
|
|
||||||
ctx.globalCompositeOperation = 'source-over';
|
|
||||||
|
|
||||||
// The six facets ride in from the field and lock into the mark.
|
|
||||||
FACETS.forEach((f, s) => {
|
|
||||||
const r = 240 * (1 - gather);
|
|
||||||
const a = f.angle + field;
|
|
||||||
ctx.globalAlpha = Standard(phase(time, s * 25, s * 25 + 420));
|
|
||||||
ctx.fillStyle = f.color;
|
ctx.fillStyle = f.color;
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
facetPath(ctx, f, o, unit, field, mix(0.55, 1, gather), rad(-60) * (1 - gather), { x: Math.cos(a) * r, y: Math.sin(a) * r });
|
facetPath(ctx, f, o, unit, 7 * (1 - p), mix(0.5, 1, p), rad(-45) * (1 - p), rad(-60) * (1 - p));
|
||||||
ctx.fill();
|
ctx.fill();
|
||||||
});
|
});
|
||||||
ctx.globalAlpha = 1;
|
ctx.globalAlpha = 1;
|
||||||
|
|
||||||
// A ring pulses out as the facets lock.
|
// A ring pulses out as the facets lock.
|
||||||
const pulse = phase(time, 1380, 2050);
|
const pulse = phase(time, 340, 900);
|
||||||
if (pulse > 0 && pulse < 1) {
|
if (pulse > 0 && pulse < 1) {
|
||||||
ctx.strokeStyle = rgba(SEA_GLASS, 0.45 * (1 - pulse));
|
ctx.strokeStyle = rgba(SEA_GLASS, 0.45 * (1 - pulse) * (1 - phase(q, 0, 0.3)));
|
||||||
ctx.lineWidth = 1.5;
|
ctx.lineWidth = 1.5;
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
hexagon(ctx, o, (30 + 24 * EmphasizedDecelerate(pulse)) * unit);
|
hexagon(ctx, o, (30 + 22 * EmphasizedDecelerate(pulse)) * unit);
|
||||||
ctx.stroke();
|
ctx.stroke();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Still starting: small shards keep circling the mark.
|
// Still starting: small shards circle the mark.
|
||||||
const idle = Standard(phase(time, 2300, 2900)) * (1 - phase(q, 0, 0.25));
|
const idle = Standard(phase(time, IDLE_START, IDLE_START + 600)) * (1 - phase(q, 0, 0.25));
|
||||||
if (idle > 0) {
|
if (idle > 0) {
|
||||||
ctx.globalCompositeOperation = 'screen';
|
ctx.globalCompositeOperation = 'screen';
|
||||||
ctx.globalAlpha = 0.4 * idle;
|
ctx.globalAlpha = 0.4 * idle;
|
||||||
for (let s = 0; s < 6; s++) {
|
for (let s = 0; s < 6; s++) {
|
||||||
for (const side of [-1, 1]) {
|
for (const side of [-1, 1]) {
|
||||||
const a = rad(-60 + 60 * s) + side * rad(11) + (time - 2300) * 0.00032;
|
const a = rad(-60 + 60 * s) + side * rad(11) + (time - IDLE_START) * 0.00032;
|
||||||
ctx.fillStyle = PALETTE[(s + (side > 0 ? 2 : 4)) % 6];
|
ctx.fillStyle = PALETTE[(s + (side > 0 ? 2 : 4)) % 6];
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
shardPath(ctx, FACETS[s], { x: o.x + Math.cos(a) * 50 * unit, y: o.y + Math.sin(a) * 50 * unit }, unit * 0.16, a * 2);
|
shardPath(ctx, FACETS[s], { x: o.x + Math.cos(a) * 50 * unit, y: o.y + Math.sin(a) * 50 * unit }, unit * 0.16, a * 2);
|
||||||
|
|
@ -255,12 +212,12 @@ function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number,
|
||||||
ctx.globalCompositeOperation = 'source-over';
|
ctx.globalCompositeOperation = 'source-over';
|
||||||
}
|
}
|
||||||
|
|
||||||
// A band of light crosses the settled mark, then again every few seconds while it waits.
|
// While it waits, a band of light crosses the mark every few seconds.
|
||||||
const sheen = time < 1500 ? 0 : ((time - 1500) % 3600) / 900;
|
const sheen = time < IDLE_START ? 0 : ((time - IDLE_START) % 3600) / 900;
|
||||||
if (q === 0 && sheen > 0 && sheen < 1) {
|
if (q === 0 && sheen > 0 && sheen < 1) {
|
||||||
ctx.save();
|
ctx.save();
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
FACETS.forEach((f) => facetPath(ctx, f, o, unit, 0, 1, 0, { x: 0, y: 0 }));
|
FACETS.forEach((f) => facetPath(ctx, f, o, unit));
|
||||||
ctx.clip();
|
ctx.clip();
|
||||||
const reach = 40 * unit;
|
const reach = 40 * unit;
|
||||||
const a = rad(36);
|
const a = rad(36);
|
||||||
|
|
@ -334,7 +291,7 @@ export function Splash({ ready, onDone }: { ready: boolean; onDone: () => void }
|
||||||
cancelAnimationFrame(raf);
|
cancelAnimationFrame(raf);
|
||||||
window.removeEventListener('resize', size);
|
window.removeEventListener('resize', size);
|
||||||
// Let the arrival settle finish after the splash is gone.
|
// Let the arrival settle finish after the splash is gone.
|
||||||
setTimeout(() => document.documentElement.classList.remove('splash-arrival'), 700);
|
setTimeout(() => document.documentElement.classList.remove('splash-arrival'), EXIT_MS + 60);
|
||||||
};
|
};
|
||||||
}, [reduced]);
|
}, [reduced]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -270,10 +270,11 @@ html.os-macos:not(.window-fullscreen) .topbar {
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
/* The app beneath settles from a slight zoom as the camera flies through the
|
/* The app beneath settles from a slight zoom as the camera flies through the
|
||||||
aperture (held for the first quarter of the exit, then decelerating). */
|
aperture (held for the first quarter of the exit, then decelerating).
|
||||||
|
The duration matches EXIT_MS in Splash.tsx. */
|
||||||
html.splash-arrival .app-shell,
|
html.splash-arrival .app-shell,
|
||||||
html.splash-arrival .auth-screen {
|
html.splash-arrival .auth-screen {
|
||||||
animation: splash-arrival 640ms linear both;
|
animation: splash-arrival 540ms linear both;
|
||||||
}
|
}
|
||||||
@keyframes splash-arrival {
|
@keyframes splash-arrival {
|
||||||
0% {
|
0% {
|
||||||
|
|
@ -853,6 +854,7 @@ html.splash-arrival .auth-screen {
|
||||||
overflow-y: hidden;
|
overflow-y: hidden;
|
||||||
scroll-snap-type: x proximity;
|
scroll-snap-type: x proximity;
|
||||||
scroll-padding: 0 var(--gutter);
|
scroll-padding: 0 var(--gutter);
|
||||||
|
overflow-anchor: none;
|
||||||
padding: 4px var(--gutter) 10px;
|
padding: 4px var(--gutter) 10px;
|
||||||
scrollbar-width: none;
|
scrollbar-width: none;
|
||||||
}
|
}
|
||||||
|
|
@ -1091,6 +1093,23 @@ html.splash-arrival .auth-screen {
|
||||||
.card.landscape .card-title {
|
.card.landscape .card-title {
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
}
|
}
|
||||||
|
.card-title-link {
|
||||||
|
max-width: 100%;
|
||||||
|
font: inherit;
|
||||||
|
color: inherit;
|
||||||
|
text-align: left;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-decoration: underline;
|
||||||
|
text-decoration-color: transparent;
|
||||||
|
text-underline-offset: 3px;
|
||||||
|
transition: text-decoration-color var(--t-fast);
|
||||||
|
}
|
||||||
|
.card-title-link:hover {
|
||||||
|
color: #fff;
|
||||||
|
text-decoration-color: rgba(255, 255, 255, 0.5);
|
||||||
|
}
|
||||||
.card-meta {
|
.card-meta {
|
||||||
font-size: 11.5px;
|
font-size: 11.5px;
|
||||||
color: #8a9196;
|
color: #8a9196;
|
||||||
|
|
|
||||||
|
|
@ -350,6 +350,10 @@ html.os-macos:not(.window-fullscreen) .player-top {
|
||||||
.player-controls-center {
|
.player-controls-center {
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
}
|
}
|
||||||
|
.player-icon-spacer {
|
||||||
|
width: 44px;
|
||||||
|
height: 44px;
|
||||||
|
}
|
||||||
.player-icon:disabled {
|
.player-icon:disabled {
|
||||||
opacity: 0.32;
|
opacity: 0.32;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
|
|
||||||
|
|
@ -430,6 +430,30 @@ button.chip:hover {
|
||||||
letter-spacing: -0.035em;
|
letter-spacing: -0.035em;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
|
.season-switch {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
margin-left: -8px;
|
||||||
|
padding: 2px 6px 2px 8px;
|
||||||
|
border-radius: 8px;
|
||||||
|
font: inherit;
|
||||||
|
letter-spacing: inherit;
|
||||||
|
transition: background var(--t-fast);
|
||||||
|
}
|
||||||
|
.season-switch svg {
|
||||||
|
color: #aeb5b8;
|
||||||
|
transition:
|
||||||
|
color var(--t-fast),
|
||||||
|
transform var(--t-fast);
|
||||||
|
}
|
||||||
|
.season-switch:hover {
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
}
|
||||||
|
.season-switch:hover svg {
|
||||||
|
color: #fff;
|
||||||
|
transform: translateY(1px);
|
||||||
|
}
|
||||||
.synopsis-wrap {
|
.synopsis-wrap {
|
||||||
max-width: 640px;
|
max-width: 640px;
|
||||||
}
|
}
|
||||||
|
|
@ -580,122 +604,29 @@ button.chip:hover {
|
||||||
}
|
}
|
||||||
/* Episodes */
|
/* Episodes */
|
||||||
.episodes {
|
.episodes {
|
||||||
margin-bottom: 36px;
|
margin-bottom: 34px;
|
||||||
}
|
}
|
||||||
.episodes-head {
|
.episodes .shelf-head {
|
||||||
display: flex;
|
padding: 0;
|
||||||
align-items: center;
|
|
||||||
gap: 16px;
|
|
||||||
margin-bottom: 8px;
|
|
||||||
}
|
}
|
||||||
.episodes-head h2 {
|
.episode-grid {
|
||||||
margin: 0;
|
display: grid;
|
||||||
font-size: 19px;
|
grid-template-columns: repeat(auto-fill, minmax(clamp(240px, 19vw, 320px), 1fr));
|
||||||
letter-spacing: -0.028em;
|
gap: 30px 16px;
|
||||||
}
|
}
|
||||||
.episodes-sub {
|
.episode-grid .card {
|
||||||
color: var(--dim);
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
.season-summary {
|
|
||||||
color: #aeb5b8;
|
|
||||||
font-size: 12.5px;
|
|
||||||
line-height: 1.6;
|
|
||||||
max-width: 760px;
|
|
||||||
margin: 4px 0 8px;
|
|
||||||
}
|
|
||||||
.episode-row {
|
|
||||||
scroll-margin: 96px 0 48px;
|
scroll-margin: 96px 0 48px;
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 34px 220px minmax(0, 1fr) 40px;
|
|
||||||
gap: 20px;
|
|
||||||
align-items: center;
|
|
||||||
padding: 16px 12px 16px 6px;
|
|
||||||
border-bottom: 1px solid var(--line-soft);
|
|
||||||
border-radius: 10px;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: background var(--t-fast);
|
|
||||||
}
|
}
|
||||||
.episode-row:hover,
|
.episode-card-summary {
|
||||||
.episode-row:focus-visible {
|
margin: 7px 0 0;
|
||||||
background: rgba(255, 255, 255, 0.045);
|
|
||||||
}
|
|
||||||
.episode-row:focus-visible {
|
|
||||||
outline: 2px solid #f2f5f4;
|
|
||||||
outline-offset: 0;
|
|
||||||
}
|
|
||||||
.episode-index {
|
|
||||||
font-size: 22px;
|
|
||||||
font-weight: 650;
|
|
||||||
color: #8a9196;
|
|
||||||
text-align: center;
|
|
||||||
font-variant-numeric: tabular-nums;
|
|
||||||
}
|
|
||||||
.episode-pic {
|
|
||||||
position: relative;
|
|
||||||
aspect-ratio: 16 / 9;
|
|
||||||
border-radius: 6px;
|
|
||||||
overflow: hidden;
|
|
||||||
background: #1c2024;
|
|
||||||
}
|
|
||||||
.episode-pic .artwork {
|
|
||||||
position: absolute;
|
|
||||||
inset: 0;
|
|
||||||
}
|
|
||||||
.episode-play {
|
|
||||||
position: absolute;
|
|
||||||
left: 50%;
|
|
||||||
top: 50%;
|
|
||||||
width: 42px;
|
|
||||||
height: 42px;
|
|
||||||
margin: -21px 0 0 -21px;
|
|
||||||
border-radius: 50%;
|
|
||||||
display: grid;
|
|
||||||
place-items: center;
|
|
||||||
background: rgba(255, 255, 255, 0.92);
|
|
||||||
color: #121314;
|
|
||||||
opacity: 0;
|
|
||||||
transform: scale(0.9);
|
|
||||||
transition:
|
|
||||||
opacity var(--t),
|
|
||||||
transform var(--t) var(--ease-out);
|
|
||||||
}
|
|
||||||
.episode-row:hover .episode-play {
|
|
||||||
opacity: 1;
|
|
||||||
transform: none;
|
|
||||||
}
|
|
||||||
.episode-text h3 {
|
|
||||||
font-size: 14px;
|
|
||||||
margin: 0 0 4px;
|
|
||||||
font-weight: 640;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
}
|
|
||||||
.episode-watched {
|
|
||||||
color: #9fd6bb;
|
|
||||||
}
|
|
||||||
.episode-meta {
|
|
||||||
font-size: 11.5px;
|
|
||||||
color: #8a9196;
|
|
||||||
margin-bottom: 7px;
|
|
||||||
}
|
|
||||||
.episode-text p {
|
|
||||||
margin: 0;
|
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
line-height: 1.55;
|
line-height: 1.55;
|
||||||
color: #a8afb3;
|
color: #a1a8ac;
|
||||||
display: -webkit-box;
|
display: -webkit-box;
|
||||||
-webkit-line-clamp: 2;
|
-webkit-line-clamp: 3;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
.episode-more {
|
|
||||||
opacity: 0;
|
|
||||||
}
|
|
||||||
.episode-row:hover .episode-more {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* —— Search ————————————————————————————————————————————————— */
|
/* —— Search ————————————————————————————————————————————————— */
|
||||||
.search-hero {
|
.search-hero {
|
||||||
|
|
@ -2045,10 +1976,6 @@ button.chip:hover {
|
||||||
.download-intro {
|
.download-intro {
|
||||||
grid-template-columns: minmax(0, 1fr);
|
grid-template-columns: minmax(0, 1fr);
|
||||||
}
|
}
|
||||||
.episode-row {
|
|
||||||
grid-template-columns: 26px 160px minmax(0, 1fr) 36px;
|
|
||||||
gap: 14px;
|
|
||||||
}
|
|
||||||
.history-row {
|
.history-row {
|
||||||
grid-template-columns: 36px minmax(0, 1fr) 120px 90px;
|
grid-template-columns: 36px minmax(0, 1fr) 120px 90px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ const PATHS: Record<string, string> = {
|
||||||
arrowLeft: '<path d="M19 12H5m6-6-6 6 6 6"/>',
|
arrowLeft: '<path d="M19 12H5m6-6-6 6 6 6"/>',
|
||||||
play: '<path d="M7 4.8v14.4a.8.8 0 0 0 1.2.7l11.6-7.2a.8.8 0 0 0 0-1.4L8.2 4.1a.8.8 0 0 0-1.2.7Z" fill="currentColor" stroke="none"/>',
|
play: '<path d="M7 4.8v14.4a.8.8 0 0 0 1.2.7l11.6-7.2a.8.8 0 0 0 0-1.4L8.2 4.1a.8.8 0 0 0-1.2.7Z" fill="currentColor" stroke="none"/>',
|
||||||
pause: '<rect x="6" y="4.5" width="4" height="15" rx="1.2" fill="currentColor" stroke="none"/><rect x="14" y="4.5" width="4" height="15" rx="1.2" fill="currentColor" stroke="none"/>',
|
pause: '<rect x="6" y="4.5" width="4" height="15" rx="1.2" fill="currentColor" stroke="none"/><rect x="14" y="4.5" width="4" height="15" rx="1.2" fill="currentColor" stroke="none"/>',
|
||||||
|
stop: '<rect x="5.5" y="5.5" width="13" height="13" rx="1.6" fill="currentColor" stroke="none"/>',
|
||||||
plus: '<path d="M12 5v14M5 12h14"/>',
|
plus: '<path d="M12 5v14M5 12h14"/>',
|
||||||
minus: '<path d="M5 12h14"/>',
|
minus: '<path d="M5 12h14"/>',
|
||||||
check: '<path d="m5 12.5 4.2 4.2L19 7"/>',
|
check: '<path d="m5 12.5 4.2 4.2L19 7"/>',
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
import { memo, useEffect, useRef, useState, type ReactNode } from 'react';
|
import { memo, useEffect, useLayoutEffect, useRef, useState, type ReactNode } from 'react';
|
||||||
import type { Item } from '../plex/types';
|
import type { Item } from '../plex/types';
|
||||||
import { useServer, useSession } from '../app/session';
|
import { useServer, useSession } from '../app/session';
|
||||||
import { useSettings } from '../app/settings';
|
import { useSettings } from '../app/settings';
|
||||||
import { art, displayTitle, duration, episodeLabel, formatBadges, isWatched, progress, remaining, remainingEpisodes } from '../app/format';
|
import { art, date, displayTitle, duration, episodeLabel, formatBadges, isWatched, progress, remaining, remainingEpisodes } from '../app/format';
|
||||||
import { itemMenu, openItem, playWithVersion } from '../app/actions';
|
import { itemMenu, openItem, playWithVersion } from '../app/actions';
|
||||||
|
import { navigate } from '../app/router';
|
||||||
import { Artwork } from './primitives';
|
import { Artwork } from './primitives';
|
||||||
import { Icon } from './Icon';
|
import { Icon } from './Icon';
|
||||||
import { openMenu } from './overlays';
|
import { openMenu } from './overlays';
|
||||||
|
|
@ -141,9 +142,14 @@ function WatchBadge({ item }: { item: Item }) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function ProgressLine({ item }: { item: Item }) {
|
/**
|
||||||
|
* A watched title's leftover position (from an unfinished rewatch) only shows where it's
|
||||||
|
* what you're resuming: Continue Watching, or the season's up-next episode.
|
||||||
|
*/
|
||||||
|
function ProgressLine({ item, always = false }: { item: Item; always?: boolean }) {
|
||||||
|
const percent = useSettings((s) => s.watchedPercent);
|
||||||
const p = progress(item);
|
const p = progress(item);
|
||||||
if (!p || p > 0.995) return null;
|
if (!p || p > 0.995 || (!always && isWatched(item, percent))) return null;
|
||||||
return (
|
return (
|
||||||
<span className="progress-line">
|
<span className="progress-line">
|
||||||
<i style={{ width: `${Math.max(3, p * 100)}%` }} />
|
<i style={{ width: `${Math.max(3, p * 100)}%` }} />
|
||||||
|
|
@ -204,12 +210,15 @@ export const PosterCard = memo(function PosterCard({ item, caption = 'year', cla
|
||||||
const server = useServer();
|
const server = useServer();
|
||||||
const handlers = useCardHandlers(item);
|
const handlers = useCardHandlers(item);
|
||||||
const path = art.poster(item);
|
const path = art.poster(item);
|
||||||
|
// On its show's page a season is just "Season 2"; anywhere else it needs the show's name.
|
||||||
|
const seasonAlone = item.type === 'season' && caption !== 'episodes' && !!item.parentTitle;
|
||||||
|
const title = item.type === 'season' && !seasonAlone ? item.title : displayTitle(item);
|
||||||
let meta: ReactNode = null;
|
let meta: ReactNode = null;
|
||||||
if (caption === 'year') meta = item.type === 'episode' ? episodeLabel(item) : item.type === 'season' ? (item.leafCount ? `${item.leafCount} episodes` : '') : item.type === 'collection' ? (item.childCount ? `${item.childCount} titles` : 'Collection') : item.year || '';
|
if (caption === 'year') meta = item.type === 'episode' ? episodeLabel(item) : item.type === 'season' ? item.title : item.type === 'collection' ? (item.childCount ? `${item.childCount} titles` : 'Collection') : item.year || '';
|
||||||
if (caption === 'episodes') meta = item.leafCount ? `${item.leafCount} episodes` : '';
|
if (caption === 'episodes') meta = item.leafCount ? `${item.leafCount} episodes` : '';
|
||||||
if (caption === 'role') meta = (item as any).roleName ?? item.year;
|
if (caption === 'role') meta = (item as any).roleName ?? item.year;
|
||||||
return (
|
return (
|
||||||
<article className={`card poster ${className}`} role="button" tabIndex={0} aria-label={item.title} {...handlers} {...previewHandlers(item)}>
|
<article className={`card poster ${className}`} role="button" tabIndex={0} aria-label={seasonAlone ? `${title}, ${item.title}` : title} {...handlers} {...previewHandlers(item)}>
|
||||||
<div className="card-cover">
|
<div className="card-cover">
|
||||||
<Artwork src={server.image(path, 240, 360)} alt="" fallback={<span className="cover-fallback">{displayTitle(item)}</span>} />
|
<Artwork src={server.image(path, 240, 360)} alt="" fallback={<span className="cover-fallback">{displayTitle(item)}</span>} />
|
||||||
<div className="card-hover" />
|
<div className="card-hover" />
|
||||||
|
|
@ -219,8 +228,8 @@ export const PosterCard = memo(function PosterCard({ item, caption = 'year', cla
|
||||||
</div>
|
</div>
|
||||||
{caption !== 'none' && (
|
{caption !== 'none' && (
|
||||||
<div className="card-caption">
|
<div className="card-caption">
|
||||||
<div className="card-title" title={item.type === 'season' ? item.title : displayTitle(item)}>
|
<div className="card-title" title={title}>
|
||||||
{item.type === 'season' ? item.title : displayTitle(item)}
|
{title}
|
||||||
</div>
|
</div>
|
||||||
{meta ? <div className="card-meta">{meta}</div> : null}
|
{meta ? <div className="card-meta">{meta}</div> : null}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -232,14 +241,16 @@ export const PosterCard = memo(function PosterCard({ item, caption = 'year', cla
|
||||||
export const LandscapeCard = memo(function LandscapeCard({ item, continueWatching, showTitle = true, episodeStyle = false }: { item: Item; continueWatching?: boolean; showTitle?: boolean; episodeStyle?: boolean }) {
|
export const LandscapeCard = memo(function LandscapeCard({ item, continueWatching, showTitle = true, episodeStyle = false }: { item: Item; continueWatching?: boolean; showTitle?: boolean; episodeStyle?: boolean }) {
|
||||||
const server = useServer();
|
const server = useServer();
|
||||||
const handlers = useCardHandlers(item, { continueWatching });
|
const handlers = useCardHandlers(item, { continueWatching });
|
||||||
|
const percent = useSettings((s) => s.watchedPercent);
|
||||||
|
const inProgress = !!item.viewOffset && (continueWatching || !isWatched(item, percent));
|
||||||
const isEp = item.type === 'episode';
|
const isEp = item.type === 'episode';
|
||||||
const path = isEp ? item.thumb || item.grandparentArt : art.landscape(item);
|
const path = isEp ? item.thumb || item.grandparentArt : art.landscape(item);
|
||||||
const title = episodeStyle && isEp ? `${item.index}. ${item.title}` : displayTitle(item);
|
const title = episodeStyle && isEp ? `${item.index}. ${item.title}` : displayTitle(item);
|
||||||
const meta = isEp
|
const meta = isEp
|
||||||
? episodeStyle
|
? episodeStyle
|
||||||
? [duration(item.duration), item.viewOffset ? remaining(item) : ''].filter(Boolean).join(' · ')
|
? [duration(item.duration), inProgress ? remaining(item) : ''].filter(Boolean).join(' · ')
|
||||||
: `${episodeLabel(item)} ${item.title}`
|
: `${episodeLabel(item)} ${item.title}`
|
||||||
: item.viewOffset
|
: inProgress
|
||||||
? remaining(item)
|
? remaining(item)
|
||||||
: [item.year, duration(item.duration)].filter(Boolean).join(' · ');
|
: [item.year, duration(item.duration)].filter(Boolean).join(' · ');
|
||||||
return (
|
return (
|
||||||
|
|
@ -254,12 +265,25 @@ export const LandscapeCard = memo(function LandscapeCard({ item, continueWatchin
|
||||||
<div className="card-hover" />
|
<div className="card-hover" />
|
||||||
<CardActions item={item} ctx={{ continueWatching }} />
|
<CardActions item={item} ctx={{ continueWatching }} />
|
||||||
{episodeStyle && <WatchBadge item={item} />}
|
{episodeStyle && <WatchBadge item={item} />}
|
||||||
<ProgressLine item={item} />
|
<ProgressLine item={item} always={continueWatching} />
|
||||||
</div>
|
</div>
|
||||||
{showTitle && (
|
{showTitle && (
|
||||||
<div className="card-caption">
|
<div className="card-caption">
|
||||||
<div className="card-title" title={title}>
|
<div className="card-title" title={title}>
|
||||||
{title}
|
{isEp && !episodeStyle && item.grandparentId ? (
|
||||||
|
<button
|
||||||
|
className="card-title-link"
|
||||||
|
tabIndex={-1}
|
||||||
|
onClick={(e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
navigate({ name: 'item', id: item.grandparentId, title: item.grandparentTitle });
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{title}
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
|
title
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="card-meta">{meta}</div>
|
<div className="card-meta">{meta}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -268,6 +292,34 @@ export const LandscapeCard = memo(function LandscapeCard({ item, continueWatchin
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/** An episode with its synopsis, for a season's episode grid. `upNext` shows its resume point even when watched. */
|
||||||
|
export const EpisodeCard = memo(function EpisodeCard({ item, upNext = false }: { item: Item; upNext?: boolean }) {
|
||||||
|
const server = useServer();
|
||||||
|
const handlers = useCardHandlers(item);
|
||||||
|
const percent = useSettings((s) => s.watchedPercent);
|
||||||
|
const inProgress = !!item.viewOffset && (upNext || !isWatched(item, percent));
|
||||||
|
const title = item.index ? `${item.index}. ${item.title}` : item.title;
|
||||||
|
const meta = [duration(item.duration), inProgress ? remaining(item) : date(item.originallyAvailableAt)].filter(Boolean).join(' · ');
|
||||||
|
return (
|
||||||
|
<article className="card landscape episode-card" role="button" tabIndex={0} aria-label={title} {...handlers}>
|
||||||
|
<div className="card-cover">
|
||||||
|
<Artwork src={server.image(item.thumb || item.grandparentArt, 400, 225)} alt="" fallback={<span className="cover-fallback">{title}</span>} />
|
||||||
|
<div className="card-hover" />
|
||||||
|
<CardActions item={item} />
|
||||||
|
<WatchBadge item={item} />
|
||||||
|
<ProgressLine item={item} always={upNext} />
|
||||||
|
</div>
|
||||||
|
<div className="card-caption">
|
||||||
|
<div className="card-title" title={title}>
|
||||||
|
{title}
|
||||||
|
</div>
|
||||||
|
<div className="card-meta">{meta}</div>
|
||||||
|
{item.summary && <p className="episode-card-summary">{item.summary}</p>}
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
export function PersonCard({ name, role, thumb, onClick }: { name: string; role?: string; thumb?: string; onClick?: () => void }) {
|
export function PersonCard({ name, role, thumb, onClick }: { name: string; role?: string; thumb?: string; onClick?: () => void }) {
|
||||||
const server = useServer();
|
const server = useServer();
|
||||||
const initials = name
|
const initials = name
|
||||||
|
|
@ -290,15 +342,22 @@ export function PersonCard({ name, role, thumb, onClick }: { name: string; role?
|
||||||
|
|
||||||
export function Shelf({ title, subtitle, onViewAll, children, className = '', kind = 'poster' }: { title: ReactNode; subtitle?: ReactNode; onViewAll?: () => void; children: ReactNode; className?: string; kind?: 'poster' | 'landscape' | 'people' | 'wide' }) {
|
export function Shelf({ title, subtitle, onViewAll, children, className = '', kind = 'poster' }: { title: ReactNode; subtitle?: ReactNode; onViewAll?: () => void; children: ReactNode; className?: string; kind?: 'poster' | 'landscape' | 'people' | 'wide' }) {
|
||||||
const row = useRef<HTMLDivElement>(null);
|
const row = useRef<HTMLDivElement>(null);
|
||||||
|
const atStart = useRef(true);
|
||||||
const [edges, setEdges] = useState({ start: true, end: false });
|
const [edges, setEdges] = useState({ start: true, end: false });
|
||||||
const update = () => {
|
const update = () => {
|
||||||
const el = row.current;
|
const el = row.current;
|
||||||
if (!el) return;
|
if (!el) return;
|
||||||
const start = el.scrollLeft < 8;
|
const start = el.scrollLeft < 8;
|
||||||
const end = el.scrollLeft + el.clientWidth >= el.scrollWidth - 8;
|
const end = el.scrollLeft + el.clientWidth >= el.scrollWidth - 8;
|
||||||
|
atStart.current = start;
|
||||||
// Runs on every scroll event; re-render only when an edge changes.
|
// Runs on every scroll event; re-render only when an edge changes.
|
||||||
setEdges((prev) => (prev.start === start && prev.end === end ? prev : { start, end }));
|
setEdges((prev) => (prev.start === start && prev.end === end ? prev : { start, end }));
|
||||||
};
|
};
|
||||||
|
// A row the viewer hasn't scrolled stays at its start when items are added
|
||||||
|
// in front (Continue Watching), rather than holding on to the old first card.
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
if (atStart.current && row.current) row.current.scrollLeft = 0;
|
||||||
|
}, [children]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
update();
|
update();
|
||||||
const el = row.current;
|
const el = row.current;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
{
|
{
|
||||||
"version": "0.1.0-beta.18",
|
"version": "1.0.1",
|
||||||
"notes": "A rebuilt Up Next screen that looks and works like the rest of Kaleido.\r\n\r\n- Up Next now uses the same artwork backdrop, colour wash, buttons and cards as the title pages. The credits keep playing in the top-left corner beside the next episode, and the Play next episode button fills as the countdown runs.\r\n- The Season and Related shows rows scroll with the side arrows, like every other row, instead of scrollbars. The season row starts at the episode you just watched.\r\n- Click the video or press Esc to go back to the credits; at the end of an episode this no longer restarts it from the beginning.\r\n- Up Next fits smaller windows, and the window buttons stay visible on Mac while it's open.\r\n- Playback settings are a simple list again: Skip intros, Skip movie credits, Automatic skip delay and Autoplay next episode.",
|
"notes": "A quicker start, a Stop button, and recovery when the server drops out mid-video.\r\n\r\n- Kaleido starts faster: the opening animation is shorter, so you reach your library in about a second.\r\n- The player has a Stop button, next to the forward controls, which closes the player completely instead of moving it to the miniplayer.\r\n- If your Plex server goes down while you're watching, the player waits for it once the buffered video runs out, then carries on from the same spot when the server is back. Before, it treated the video as finished and Play started it again from the beginning. Pressing Play while it waits tries to reconnect straight away.",
|
||||||
"pub_date": "2026-11-12T19:30:25.877Z",
|
"pub_date": "2026-11-17T17:47:20.996Z",
|
||||||
"platforms": {
|
"platforms": {
|
||||||
"windows-x86_64": {
|
"windows-x86_64": {
|
||||||
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NGRBcFhBTklWTmpyb3I2SnpGWmVna3BuV1hCbUJNVnZPMUdSc1lYcCsveU1pL1VoUU8wOFkvSVBhb2lFQlBXaUNzODRTcEgyMEpQYkFTSHFIbjFGWEFjPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0NTExODAzCWZpbGU6S2FsZWlkb18wLjEuMC1iZXRhLjE4X3g2NC1zZXR1cC5leGUJdmVyc2lvbjowLjEuMC1iZXRhLjE4CndhbUZxaStzMWZvNzlpcUhJUUQzbFJmZHg0ZWJxUzd1N3FHSGlvejhvTDdja0wvQVhsbzRwY0lnVGN6OFJ3ZHFFejNtMTAxTlVyMEdDTXBZUnhPRUNnPT0K",
|
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NFZMQVRPVll0SHZPQWJWUlIyQnZEME10bldKUnYxSkhHWEJSWWxOT3FoVHp6NlNsU0dwdlg1UmUweGlEdzNoQnduSnora0dZempZS2ZWdFZLa3BIRkFJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0OTM3NjI5CWZpbGU6S2FsZWlkb18xLjAuMV94NjQtc2V0dXAuZXhlCXZlcnNpb246MS4wLjEKeUI5aUJ4d3hONmVlNlBBWDFxQkFkYTV4WXU0eHIzb1ZKaVZjaDhpODhpbXdvL2RWRlhTRTBwQXJGV3hJYlg2RERnMDBhSFBRWHZDekxCRTVNNCtIRFE9PQo=",
|
||||||
"url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v0.1.0-beta.18/Kaleido_0.1.0-beta.18_x64-setup.exe"
|
"url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v1.0.1/Kaleido_1.0.1_x64-setup.exe"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue