Compare commits
40 commits
v0.1.0-bet
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| b42f77a3aa | |||
| 1f9474c2fd | |||
| 0d423eb708 | |||
| 624f01f745 | |||
| 6775d29249 | |||
| 940fe0a6b6 | |||
| bc3358cb07 | |||
| 5719432fe8 | |||
| bb204796ac | |||
| e2166070d0 | |||
| 70530e30e2 | |||
| 2db7d8b272 | |||
| 28e633dad1 | |||
| dfe865d8f4 | |||
| c7dcdffc30 | |||
| 82c0a8e758 | |||
| 0361a98fa4 | |||
| 59e00cde4b | |||
| 1d7f497594 | |||
| b5dc5d8666 | |||
| 8755d16735 | |||
| c70aeede74 | |||
| 328a93695a | |||
| 9729755dc9 | |||
| 8ed44c2fe4 | |||
| c3d2f4b6a7 | |||
| 4985f1dde0 | |||
| 0eb8518927 | |||
| a38db53161 | |||
| 10103d0e77 | |||
|
|
c7b391d6b4 | ||
|
|
6f92aa42cc | ||
|
|
a7aad59409 | ||
|
|
3aacb94048 | ||
|
|
1a0a5ffbee | ||
|
|
7d0803481b | ||
| a3c05e9062 | |||
| e0df581f0b | |||
| 242a1cec1b | |||
| faab5a7e69 |
|
|
@ -1,8 +1,8 @@
|
||||||
name: Build Kaleido Desktop installers
|
name: Build Kaleido Desktop installers
|
||||||
# Started by hand (Actions, then this workflow, then Run). Each platform needs a runner
|
# Started by hand (Actions, then this workflow, then Run). Each platform needs a runner
|
||||||
# with its label; without one the job would wait indefinitely, so this never runs on
|
# with its label; without one the job would wait indefinitely, so this never runs on
|
||||||
# push. Releases can instead be built with scripts/build.ps1 and published with
|
# push. Releases can instead be built with scripts/build.ps1 (Windows) or
|
||||||
# scripts/publish-release.mjs.
|
# scripts/build.sh (macOS) and published with scripts/publish-release.mjs.
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
|
@ -29,11 +29,14 @@ jobs:
|
||||||
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
||||||
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
|
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
|
||||||
run: ./scripts/build.ps1
|
run: ./scripts/build.ps1
|
||||||
- name: Build (macOS / Linux)
|
- name: Build (macOS)
|
||||||
if: matrix.os != 'windows'
|
if: matrix.os == 'macos'
|
||||||
env:
|
env:
|
||||||
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
||||||
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
|
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
|
||||||
|
run: sh scripts/build.sh
|
||||||
|
- name: Build (Linux)
|
||||||
|
if: matrix.os == 'linux'
|
||||||
run: |
|
run: |
|
||||||
sh scripts/fetch-libmpv.sh
|
sh scripts/fetch-libmpv.sh
|
||||||
npm ci
|
npm ci
|
||||||
|
|
|
||||||
1
.gitignore
vendored
|
|
@ -10,5 +10,6 @@ vendor/mpv/*/
|
||||||
.env
|
.env
|
||||||
.env.*
|
.env.*
|
||||||
evidence/
|
evidence/
|
||||||
|
.DS_Store
|
||||||
*.log
|
*.log
|
||||||
.claude/
|
.claude/
|
||||||
|
|
|
||||||
19
AGENTS.md
|
|
@ -11,7 +11,7 @@
|
||||||
- Keep the interface restrained: no redundant buttons or navigation.
|
- Keep the interface restrained: no redundant buttons or navigation.
|
||||||
- `.env` (`PLEX_SERVER_URL`, `PLEX_TOKEN`) is for local testing only. Never print,
|
- `.env` (`PLEX_SERVER_URL`, `PLEX_TOKEN`) is for local testing only. Never print,
|
||||||
commit or embed credentials. `.tools/updater.key` signs updates; never commit or
|
commit or embed credentials. `.tools/updater.key` signs updates; never commit or
|
||||||
replace it.
|
replace it. `.tools/macos-signing.*` backs up the macOS signing certificate; same rules.
|
||||||
- Shared code goes in `src/` and `src-tauri/src/`; anything OS-specific goes in
|
- Shared code goes in `src/` and `src-tauri/src/`; anything OS-specific goes in
|
||||||
`src-tauri/src/platform/<os>.rs` or `tauri.<os>.conf.json`.
|
`src-tauri/src/platform/<os>.rs` or `tauri.<os>.conf.json`.
|
||||||
|
|
||||||
|
|
@ -19,19 +19,20 @@
|
||||||
|
|
||||||
- `npm run typecheck`, `npm test`, `cargo check --manifest-path src-tauri/Cargo.toml`.
|
- `npm run typecheck`, `npm test`, `cargo check --manifest-path src-tauri/Cargo.toml`.
|
||||||
- UI: `npm run dev` and a browser at http://localhost:1420 (signs in from `.env`).
|
- UI: `npm run dev` and a browser at http://localhost:1420 (signs in from `.env`).
|
||||||
- Native: `npm run tauri dev` with `WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS=--remote-debugging-port=9333`;
|
- Native: `npm run tauri dev` (on Windows with `WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS=--remote-debugging-port=9333`);
|
||||||
`window.__kaleido` exposes the stores in development.
|
`window.__kaleido` exposes the stores in development. On macOS the Rust toolchain is
|
||||||
|
Homebrew's keg-only `rustup` (`export PATH=/opt/homebrew/opt/rustup/bin:$PATH`).
|
||||||
- Mute before playback tests (`__kaleido.useSettings.getState().set('volume', 0)`).
|
- Mute before playback tests (`__kaleido.useSettings.getState().set('volume', 0)`).
|
||||||
Playback changes real Plex progress and track selections; restore them.
|
Playback changes real Plex progress and track selections; restore them.
|
||||||
|
|
||||||
## Releases
|
## Releases
|
||||||
|
|
||||||
Built and published locally (CI only validates). In short: bump the version in
|
Built and published locally, Windows and macOS each on their own machine, into one
|
||||||
`package.json`, `src-tauri/Cargo.toml`, `src-tauri/tauri.conf.json` (+ lockfile), add a
|
release (CI only validates). In short: bump the version in `package.json`,
|
||||||
`CHANGELOG.md` section, `.\scripts\build.ps1`, commit + tag `vX.Y.Z` + push,
|
`src-tauri/Cargo.toml`, `src-tauri/tauri.conf.json` (+ lockfile), add a `CHANGELOG.md`
|
||||||
`node scripts/publish-release.mjs X.Y.Z [--prerelease]`, then
|
section, commit + tag `vX.Y.Z` + push; on each OS build (`.\scripts\build.ps1` /
|
||||||
`node scripts/update-manifest.mjs X.Y.Z <release download URL>` and commit/push
|
`sh scripts/build.sh`) and `node scripts/publish-release.mjs X.Y.Z [--prerelease]`; then
|
||||||
`updates/latest.json`. Full checklist: `docs/development.md` → Releases. Only push or
|
`node scripts/update-manifest.mjs X.Y.Z` and commit/push `updates/latest.json`. Full checklist: `docs/development.md` → Releases. Only push or
|
||||||
publish when the user asks. `FORGEJO_TOKEN` lives in the ignored `.env`.
|
publish when the user asks. `FORGEJO_TOKEN` lives in the ignored `.env`.
|
||||||
|
|
||||||
See `docs/architecture.md` and `docs/development.md`.
|
See `docs/architecture.md` and `docs/development.md`.
|
||||||
|
|
|
||||||
140
CHANGELOG.md
|
|
@ -1,5 +1,145 @@
|
||||||
# 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
|
||||||
|
|
||||||
|
Up Next fixes.
|
||||||
|
|
||||||
|
- Up Next now opens every time the credits start: going back to the credits and seeking into the episode brings it back when they come round again, and it always opens when an episode reaches the end.
|
||||||
|
- The back arrow and a full-screen button are back at the top of Up Next, so you can return to browsing (playback continues in the miniplayer) or leave full screen.
|
||||||
|
- Click the show's logo to go to its page, with playback moving to the miniplayer.
|
||||||
|
- The Play next episode countdown fills smoothly.
|
||||||
|
- The episode rows are sized to fill the screen instead of leaving a gap at the bottom.
|
||||||
|
- The backdrop now shows the next episode, and its description is easier to read over bright artwork.
|
||||||
|
|
||||||
|
## 0.1.0-beta.18
|
||||||
|
|
||||||
|
A rebuilt Up Next screen that looks and works like the rest of Kaleido.
|
||||||
|
|
||||||
|
- 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.
|
||||||
|
- 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.
|
||||||
|
- 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.
|
||||||
|
- Up Next fits smaller windows, and the window buttons stay visible on Mac while it's open.
|
||||||
|
- Playback settings are a simple list again: Skip intros, Skip movie credits, Automatic skip delay and Autoplay next episode.
|
||||||
|
|
||||||
|
## 0.1.0-beta.17
|
||||||
|
|
||||||
|
- Fix the Up Next countdown stalling when the native video has keyboard focus instead of the webview. Count elapsed time accurately through delayed timer callbacks, and keep the countdown independent of the video's pause state, as on Android TV.
|
||||||
|
- Open Up Next at the first episode credit marker, including after seeking into credits, independently of movie-credit skip preferences. Open the screen immediately while episode context loads, and start autoplay once the next episode is known. Without markers, use the end of the episode as a fallback.
|
||||||
|
- Cancel autoplay on mouse movement, clicks, scrolling or keypresses. A stationary pointer does not cancel it; cancelled autoplay stays cancelled when delayed metadata arrives.
|
||||||
|
- Match the Android TV screen more closely: remove the extra toolbar actions, Cancel autoplay button and autoplay-status text; show only a white video outline on hover or keyboard focus. Use compact episode metadata, full runtime, landscape related shows and captions beneath the artwork.
|
||||||
|
|
||||||
|
## 0.1.0-beta.16
|
||||||
|
|
||||||
|
- Simplify playback settings: group intro, credits and skip-delay choices together, show the delay only when automatic skipping is enabled, and combine the next-episode switch and countdown into one Off / After … seconds selection. Existing preferences are preserved.
|
||||||
|
- Make Up Next readable over bright artwork with a dark backdrop across the page, brighter secondary text and larger synopsis and autoplay hints. The playing video stays at its original brightness.
|
||||||
|
|
||||||
|
## 0.1.0-beta.15
|
||||||
|
|
||||||
|
A new Up Next screen, adapted from Kaleido for Android TV for mouse and keyboard.
|
||||||
|
|
||||||
|
- Replace the corner countdown with a full Up Next screen. Credits keep playing in the top-left corner beside the next episode’s artwork, title, rating and synopsis, with the season and related shows below. The Play next episode button fills during the single countdown.
|
||||||
|
- Click the video or Return to video, or press Esc, to return to the credits. Click Play next episode to start immediately, choose any season episode, or open a related show. Tab and Shift+Tab move between controls with visible keyboard focus.
|
||||||
|
- Click, scroll or press any key to cancel autoplay while keeping Up Next open. Moving the mouse alone leaves the countdown running. The timer pauses while Kaleido is hidden, unfocused or paused, and never restarts after cancellation or returning to the credits.
|
||||||
|
- Respect the credits preference: Skip automatically opens Up Next as episode credits begin; Show button opens it when clicked; Off waits for the episode to end. Episode credits use only the Up Next countdown, independent of the intro/movie skip delay. A series finale shows More to watch without autoplay.
|
||||||
|
|
||||||
|
## 0.1.0-beta.14
|
||||||
|
|
||||||
|
Full screen stays on with the miniplayer, a smoother colour wash, and a round of playback and download fixes.
|
||||||
|
|
||||||
|
- Going back from the full-screen player to the miniplayer now keeps Kaleido in full screen, so you can browse full screen while the video plays in the corner. Press Esc to go back to a window, or on Windows use the new Exit full screen button beside the window controls. Closing the miniplayer leaves the window as it is.
|
||||||
|
- The colour wash behind the featured titles and title pages now blends into the next title's colours instead of jumping when the artwork changes. Clicking quickly through featured titles no longer blanks the background for a moment.
|
||||||
|
- Playback stays with the server it started on: progress and watched marks never go to a server you switch to later, and switching account, profile or server ends playback from the old one. Downloads report only to their own server.
|
||||||
|
- When Plex converts a video, the audio and subtitle tracks you chose (and your language preferences) are now applied, and kept when you change quality.
|
||||||
|
- Watching a download offline now saves where you stopped and marks it watched.
|
||||||
|
- Fixed: playing something offline could crash the player.
|
||||||
|
- Fixed: closing or switching titles while a video was still starting could start it anyway.
|
||||||
|
- Fixed: Home and the libraries could still show the previous account's or profile's titles after switching.
|
||||||
|
- Fixed: titles split into several files were downloaded only in part; Kaleido now picks a single-file version, or says it can't download the title.
|
||||||
|
- Fixed: episodes downloaded into the same season folder could overwrite or delete each other's artwork, and pause or remove could stop working after a download restarted.
|
||||||
|
- Library grids refresh fully when something changes, slow server responses time out properly, and the featured titles start rotating again when you scroll back to them.
|
||||||
|
|
||||||
|
## 0.1.0-beta.13
|
||||||
|
|
||||||
|
A gentler automatic intro skip, and home screens that keep up with your other Plex apps.
|
||||||
|
|
||||||
|
- "Skip automatically" for intros (and credits) now waits a moment first: the Skip button reads "Skipping intro" and fills as it counts down, then skips. Pause, seek or press any key before then to keep watching; the button stays as a regular Skip intro for the rest of the intro. Click it to skip straight away.
|
||||||
|
- Choose how long it waits in Settings → Playback → Automatic skip delay (3, 5 or 10 seconds, or straight away as before). It's 5 seconds by default.
|
||||||
|
- Jumping into the middle of an intro yourself no longer skips it automatically.
|
||||||
|
- Fixed: Continue Watching, a show's next episode, and watched marks didn't update after watching something on another device (a TV, a phone) while Kaleido stayed open. They now refresh when you switch back to Kaleido, and Continue Watching also refreshes every minute while it's on screen.
|
||||||
|
|
||||||
|
## 0.1.0-beta.12
|
||||||
|
|
||||||
|
A smoother miniplayer on Windows.
|
||||||
|
|
||||||
|
- The miniplayer is now a small window of its own, so dragging it moves the video and its controls together: the video keeps playing smoothly as you move it, with no flicker around its edges.
|
||||||
|
- Letting go snaps it to the nearest corner of the window, or the corner you flick it towards, and it remembers that corner. It stays in place as the window moves or resizes.
|
||||||
|
- Using its buttons no longer takes focus from the main window, so keyboard shortcuts keep working.
|
||||||
|
- On Mac the miniplayer is unchanged for now.
|
||||||
|
|
||||||
|
## 0.1.0-beta.11
|
||||||
|
|
||||||
|
Fixes the app freezing when leaving full screen for the miniplayer, and adds local hang and crash reports.
|
||||||
|
|
||||||
|
- Fixed: going back from the full-screen player to the miniplayer (or moving or resizing the miniplayer) could freeze the window — it turned see-through and "Not Responding" while the video kept playing. Two parts of the player were each waiting for the other when the window resized at the wrong moment.
|
||||||
|
- When the window stops responding for 5 seconds, or the app crashes, Kaleido now saves a report of what each part of the app was doing in its log folder (`%LOCALAPPDATA%\tv.kaleido.desktop\logs`), so a rare problem can be traced the first time it happens. Reports stay on your computer.
|
||||||
|
|
||||||
|
## 0.1.0-beta.10
|
||||||
|
|
||||||
|
A redesigned player control bar, previous episode, and a movable miniplayer.
|
||||||
|
|
||||||
|
- The player's controls are rearranged the way most media players lay them out: play/pause sits in the centre under the timeline, with 10-second skips either side and previous/next episode beyond those. Volume and the time are on the left; subtitles, settings and full screen stay on the right.
|
||||||
|
- New previous-episode button (and Shift+P) to go back an episode. For episodes both buttons always show, dimmed at the start or end of a show, so play/pause stays put.
|
||||||
|
- The miniplayer can be dragged anywhere in the window. It stays inside the window when it's resized, and remembers where you left it.
|
||||||
|
- Fixed: the Play now and Cancel buttons on the next-episode card during the credits couldn't be clicked (the player's title row covered them). The Skip intro/credits button had the same problem with tall show logos.
|
||||||
|
- Fixed: clicking Skip intro or Skip credits also paused the video.
|
||||||
|
- The featured titles at the top of Home, Movies and TV Shows no longer carry a "Highly rated" / "Recommended" label, and their logo has room above the details line instead of touching it.
|
||||||
|
|
||||||
|
## 0.1.0-beta.9
|
||||||
|
|
||||||
|
Fixes for the Mac version.
|
||||||
|
|
||||||
|
- Regular (SDR) video no longer looks washed out on Mac; HDR was unaffected.
|
||||||
|
- Downloaded titles show their artwork again on Mac.
|
||||||
|
|
||||||
|
## 0.1.0-beta.8
|
||||||
|
|
||||||
|
Kaleido for Mac.
|
||||||
|
|
||||||
|
- Kaleido now runs on Macs with Apple silicon (macOS 26 or later), with the same interface and features as on Windows: browsing, playback with hardware decoding, the miniplayer, downloads, server management and in-app updates. The window uses the Mac's own close, minimize and zoom buttons, which fade with the player's controls, and shortcuts use ⌘ (⌘K to search, ⌘[ to go back, ⌃⌘F for full screen).
|
||||||
|
- HDR passthrough works on Mac too: HDR titles play in the display's extended dynamic range instead of being converted to SDR.
|
||||||
|
- Each release now includes both the Windows and Mac versions.
|
||||||
|
- Updates are signed with a new key, so the Windows version needs to be reinstalled once from this release; later updates install in the app as before.
|
||||||
|
|
||||||
|
## 0.1.0-beta.7
|
||||||
|
|
||||||
|
A new startup animation and a bolder app icon.
|
||||||
|
|
||||||
|
- New startup animation: a kaleidoscope of shards turns and gathers into the Kaleido mark, then the view flies through its centre into the app. If the server is slow to answer, small shards keep circling the mark instead of the animation freezing.
|
||||||
|
- The app icon's mark is much larger, so it reads clearly on the taskbar and in the Start menu.
|
||||||
|
|
||||||
## 0.1.0-beta.6
|
## 0.1.0-beta.6
|
||||||
|
|
||||||
RTX Video upscaling, stopped streams and a live bandwidth graph.
|
RTX Video upscaling, stopped streams and a live bandwidth graph.
|
||||||
|
|
|
||||||
28
README.md
|
|
@ -4,9 +4,10 @@ A cinematic Plex client for the desktop, built in the same artwork-led style as
|
||||||
[Kaleido for Android TV](https://git.elijahkuntz.com/Elijah/Kaleido), and designed for
|
[Kaleido for Android TV](https://git.elijahkuntz.com/Elijah/Kaleido), and designed for
|
||||||
mouse and keyboard.
|
mouse and keyboard.
|
||||||
|
|
||||||
Windows is supported today. The repository is structured for Windows, macOS and Linux:
|
Kaleido runs on Windows and macOS (Apple silicon) with the same interface and features;
|
||||||
the interface and nearly all of the native core are shared, and each platform's
|
each release carries both, and installed copies update themselves. The interface and
|
||||||
differences live in one place (see [Architecture](docs/architecture.md)).
|
nearly all of the native core are shared, and each platform's differences live in one
|
||||||
|
place (see [Architecture](docs/architecture.md)). Linux builds browse but don't play yet.
|
||||||
|
|
||||||
## What's in the app
|
## What's in the app
|
||||||
|
|
||||||
|
|
@ -61,18 +62,20 @@ differences live in one place (see [Architecture](docs/architecture.md)).
|
||||||
|
|
||||||
| Browsing | | Player | |
|
| Browsing | | Player | |
|
||||||
| --- | --- | --- | --- |
|
| --- | --- | --- | --- |
|
||||||
| Ctrl+K | Search | Space / K | Play/pause |
|
| Ctrl+K (⌘K) | Search | Space / K | Play/pause |
|
||||||
| Arrow keys | Move between titles | ← / → | Seek (Shift: 1 min) |
|
| Arrow keys | Move between titles | ← / → | Seek (Shift: 1 min) |
|
||||||
| Enter / Space | Open / play | ↑ / ↓, wheel | Volume |
|
| Enter / Space | Open / play | ↑ / ↓, wheel | Volume |
|
||||||
| Menu or Shift+F10 | Title actions | F, double-click | Full screen |
|
| Menu or Shift+F10 | Title actions | F, double-click | Full screen |
|
||||||
| Alt+← / mouse back | Back | C | Next subtitle |
|
| Alt+← (⌘[) / mouse back | Back | C | Next subtitle |
|
||||||
| / | Focus search | Shift+N | Next episode |
|
| / | Focus search | Shift+P / N | Previous / next episode |
|
||||||
| F11 | Full screen | Esc | Exit full screen, then player |
|
| F11 (⌃⌘F) | Full screen | Esc | Exit full screen, then player |
|
||||||
|
|
||||||
|
Keys in brackets are the macOS equivalents.
|
||||||
|
|
||||||
## Build from source
|
## Build from source
|
||||||
|
|
||||||
Requirements: Node 22+, Rust (stable), and on Windows the Visual Studio C++ build tools
|
Requirements: Node 22+, Rust (stable); on Windows the Visual Studio C++ build tools and
|
||||||
and 7-Zip.
|
7-Zip, on macOS the Xcode command line tools and Homebrew.
|
||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
npm ci
|
npm ci
|
||||||
|
|
@ -81,6 +84,13 @@ npm run tauri dev # development app
|
||||||
.\scripts\build.ps1 # signed release installer (NSIS)
|
.\scripts\build.ps1 # signed release installer (NSIS)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm ci
|
||||||
|
sh scripts/fetch-libmpv.sh # libmpv and its libraries into vendor/mpv/macos
|
||||||
|
npm run tauri dev # development app
|
||||||
|
sh scripts/build.sh # .app, .dmg and the signed update archive
|
||||||
|
```
|
||||||
|
|
||||||
During development the app signs in automatically from an ignored `.env` in the
|
During development the app signs in automatically from an ignored `.env` in the
|
||||||
repository root (`PLEX_SERVER_URL`, `PLEX_TOKEN`). Release builds never read it.
|
repository root (`PLEX_SERVER_URL`, `PLEX_TOKEN`). Release builds never read it.
|
||||||
`npm run dev` serves the interface alone in a browser for UI work (no playback or
|
`npm run dev` serves the interface alone in a browser for UI work (no playback or
|
||||||
|
|
|
||||||
|
|
@ -35,21 +35,34 @@ updates/latest.json Signed update feed for every platform
|
||||||
`src-tauri/src/platform/mod.rs` selects one of `windows.rs`, `macos.rs` or `linux.rs`.
|
`src-tauri/src/platform/mod.rs` selects one of `windows.rs`, `macos.rs` or `linux.rs`.
|
||||||
Each exposes the same items:
|
Each exposes the same items:
|
||||||
|
|
||||||
| Item | Windows implementation |
|
| Item | Windows | macOS |
|
||||||
| --- | --- |
|
| --- | --- | --- |
|
||||||
| `VideoSurface` | mpv renders with `d3d11-output-mode=composition`; its swapchain (`display-swapchain`) is set as the content of a DirectComposition visual targeted at the window with `topmost = false`, i.e. behind the web view's child windows. For the miniplayer the visual is offset and mpv's composition size shrunk to a corner rectangle (`player_rect`). |
|
| `VideoSurface` | mpv renders with `d3d11-output-mode=composition`; its swapchain (`display-swapchain`) is set as the content of a DirectComposition visual targeted at the window with `topmost = false`, i.e. behind the web view's child windows. For the miniplayer the visual is offset and mpv's composition size shrunk to a corner rectangle (`player_rect`). | mpv's render API (`vo=libmpv`, OpenGL) draws into a `CAOpenGLLayer` hosted by a view inserted beneath the WKWebView, whose background is turned off (`drawsBackground`). `start` creates the render context once mpv is initialized; a render thread redraws the layer whenever mpv reports a new frame. For the miniplayer the view is moved to the corner rectangle. |
|
||||||
| `MPV_LIBRARIES` | `libmpv-2.dll` |
|
| `MPV_LIBRARIES` | `libmpv-2.dll` | `libmpv.2.dylib` (in `Contents/Frameworks` with the libraries it links) |
|
||||||
| `hold_awake` | `SetThreadExecutionState` while video plays |
|
| `hold_awake` | `SetThreadExecutionState` | an IOKit `PreventUserIdleDisplaySleep` assertion |
|
||||||
|
| Window buttons | drawn by the page (`WindowControls`) | the native traffic lights (`titleBarStyle: Overlay`, placed on the top bar's centre line); `set_window_buttons` hides them with the player's controls |
|
||||||
|
| `device_name` | `COMPUTERNAME` | the computer name from Sharing settings |
|
||||||
|
|
||||||
macOS and Linux currently provide stubs for `VideoSurface` (browsing, downloads,
|
Linux provides stubs for `VideoSurface` (browsing, downloads, settings and updates
|
||||||
settings and updates work; playback reports that it is unavailable). To add playback
|
work; playback reports that it is unavailable); the macOS approach (render API beneath
|
||||||
there, render through mpv's render API into a layer beneath the web view and implement
|
the web view) applies there with an OpenGL surface under WebKitGTK. Per-OS bundling
|
||||||
the same methods (`set_rect` places the video in part of the window for the miniplayer). Per-OS bundling (libmpv, targets, dependencies) lives in
|
(libmpv, targets, window style) lives in `tauri.<os>.conf.json`. Credentials use the
|
||||||
`tauri.macos.conf.json` and `tauri.linux.conf.json`. Credentials use the platform's
|
platform's keychain through the `keyring` crate with per-OS features in `Cargo.toml`;
|
||||||
keychain through the `keyring` crate with per-OS features in `Cargo.toml`.
|
macOS debug builds keep them in a private file instead, because each unsigned rebuild
|
||||||
|
would make the Keychain ask again.
|
||||||
|
|
||||||
On Windows the main window is created transparent and the page background turns
|
The page background turns transparent only while video is visible
|
||||||
transparent only while video is visible (`html.video-active`), so browsing is opaque.
|
(`html.video-active`), so browsing is opaque. The page knows its OS synchronously
|
||||||
|
(`hostOS` in `platform/native.ts`, from the web view's user agent) and tags the root
|
||||||
|
element (`html.os-macos`) for the few styles that differ, such as room for the traffic
|
||||||
|
lights.
|
||||||
|
|
||||||
|
HDR passthrough (`target-colorspace-hint`) works differently on each OS. On Windows mpv
|
||||||
|
switches its swapchain's colour space itself. On macOS the surface watches
|
||||||
|
`video-params/gamma`: for PQ or HLG video it has mpv output PQ in BT.2020
|
||||||
|
(`target-trc`, `target-prim`) into the 16-bit float framebuffer and turns on the layer's
|
||||||
|
extended dynamic range with the BT.2100 PQ colour space, so macOS maps the picture
|
||||||
|
into the display's HDR headroom; SDR video returns both to their defaults.
|
||||||
|
|
||||||
## Interface
|
## Interface
|
||||||
|
|
||||||
|
|
@ -69,8 +82,17 @@ transparent only while video is visible (`html.video-active`), so browsing is op
|
||||||
on demand. Timeline reports every 10 seconds (and when playback stalls) make the session appear in
|
on demand. Timeline reports every 10 seconds (and when playback stalls) make the session appear in
|
||||||
Plex; a reply carrying a termination (the server owner stopped the stream) stops
|
Plex; a reply carrying a termination (the server owner stopped the stream) stops
|
||||||
playback and shows their message. The title is marked watched at the configured percentage. The player's back arrow (or Esc)
|
playback and shows their message. The title is marked watched at the configured percentage. The player's back arrow (or Esc)
|
||||||
shrinks playback into a miniplayer: the video is drawn in a corner rectangle and the
|
shrinks playback into a miniplayer. On Windows it is a window of its own
|
||||||
interface stays visible around it, with a matching hole masked out of the page
|
(`src-tauri/src/mini.rs`, page `mini.html` → `src/mini/`): a small borderless window
|
||||||
|
owned by the main one, which the video moves into (`VideoSurface::set_host`, one
|
||||||
|
composition target per window, swapped in a single commit). Dragging moves that whole
|
||||||
|
window, so video and controls never drift apart; letting go glides it to a corner of
|
||||||
|
the main window (or the one it's flicked towards), and it follows the main window as
|
||||||
|
that moves or resizes. Its page mirrors the player from the main window and sends its
|
||||||
|
buttons back (`player/miniWindow.ts`, events `mini:state` / `mini:action`). The video
|
||||||
|
moves into it once the main page is opaque again, and back before the page turns
|
||||||
|
transparent, so neither window flashes. On macOS the miniplayer stays inside the page:
|
||||||
|
the video is drawn in a corner rectangle with a matching hole masked out of the page
|
||||||
(`html.player-mini`).
|
(`html.player-mini`).
|
||||||
- **Upscaling** (`player/enhance.ts`): Performance and Balanced set mpv's scalers and
|
- **Upscaling** (`player/enhance.ts`): Performance and Balanced set mpv's scalers and
|
||||||
debanding and load shaders bundled from `src-tauri/shaders/` (FSRCNNX 16, nlmeans,
|
debanding and load shaders bundled from `src-tauri/shaders/` (FSRCNNX 16, nlmeans,
|
||||||
|
|
@ -85,4 +107,5 @@ transparent only while video is visible (`html.video-active`), so browsing is op
|
||||||
cached in the app cache folder (`gpu-shader-cache-dir`), so a slow first Direct3D
|
cached in the app cache folder (`gpu-shader-cache-dir`), so a slow first Direct3D
|
||||||
compile happens once per shader set, mpv version and GPU driver.
|
compile happens once per shader set, mpv version and GPU driver.
|
||||||
- **Updates**: `app/updater.ts` checks the signed feed on start; installs need the
|
- **Updates**: `app/updater.ts` checks the signed feed on start; installs need the
|
||||||
user's confirmation and then relaunch.
|
user's confirmation and then relaunch. One release carries every platform's build and
|
||||||
|
the feed lists each of them (`windows-x86_64`, `darwin-aarch64`).
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,22 @@
|
||||||
debug builds and the Vite dev server. Never commit or print it.
|
debug builds and the Vite dev server. Never commit or print it.
|
||||||
5. `npm run tauri dev`
|
5. `npm run tauri dev`
|
||||||
|
|
||||||
|
## Setup (macOS)
|
||||||
|
|
||||||
|
1. Node 22+, Rust stable (`brew install rustup && rustup default stable`), the Xcode
|
||||||
|
command line tools and Homebrew.
|
||||||
|
2. `npm ci`
|
||||||
|
3. `sh scripts/fetch-libmpv.sh` installs Homebrew's `mpv` and copies libmpv with every
|
||||||
|
library it links into `vendor/mpv/macos`, rewritten to find each other there
|
||||||
|
(`@loader_path`) and signed, so the bundle doesn't depend on Homebrew. Homebrew
|
||||||
|
builds for the macOS it runs on, so the app's minimum macOS is that of the build
|
||||||
|
machine (`scripts/build.sh` sets it from the libraries).
|
||||||
|
4. `.env` as on Windows, then `npm run tauri dev`.
|
||||||
|
|
||||||
|
Debug builds on macOS keep the Plex token in `dev-secrets.json` in the app data folder
|
||||||
|
rather than the Keychain: every rebuild is a new unsigned binary, which the Keychain
|
||||||
|
would ask about again. Release builds always use the Keychain.
|
||||||
|
|
||||||
The interface alone runs in a browser with `npm run dev` (port 1420), which is handy for
|
The interface alone runs in a browser with `npm run dev` (port 1420), which is handy for
|
||||||
layout work; playback, downloads and native dialogs need the desktop app. In development
|
layout work; playback, downloads and native dialogs need the desktop app. In development
|
||||||
builds the stores are available as `window.__kaleido` for debugging.
|
builds the stores are available as `window.__kaleido` for debugging.
|
||||||
|
|
@ -31,45 +47,107 @@ Playback tests change real Plex progress; resume an in-progress title near its s
|
||||||
position, or restore it afterwards. Selecting audio or subtitle tracks is saved to Plex
|
position, or restore it afterwards. Selecting audio or subtitle tracks is saved to Plex
|
||||||
for that file.
|
for that file.
|
||||||
|
|
||||||
|
Up Next (`player/PostPlay.tsx`) opens at an episode's first credits marker, or at the end
|
||||||
|
without markers. The video is drawn into its top-left frame (`player_rect`) behind a
|
||||||
|
matching hole in the page; check that the two line up after resizing, changing display
|
||||||
|
scale and returning to the video. In the browser, open it from the console by setting
|
||||||
|
`postPlay: true` (with `item`, `nextUp`, `episodeContextReady`) on `__kaleido.usePlayer`.
|
||||||
|
|
||||||
|
## Diagnostics
|
||||||
|
|
||||||
|
`src-tauri/src/diagnostics.rs` writes to the app's log folder
|
||||||
|
(`%LOCALAPPDATA%\tv.kaleido.desktop\logs` on Windows); nothing is uploaded.
|
||||||
|
|
||||||
|
- **Hangs**: a watchdog asks the UI thread to answer every second. After 5 seconds of
|
||||||
|
silence it writes `kaleido-hang-<time>-v<version>.dmp` with every thread's stack (once
|
||||||
|
per stall) and notes the stall and the recovery in `diagnostics.log`.
|
||||||
|
- **Crashes** (Windows): an unhandled exception writes `kaleido-crash-…dmp` and logs the
|
||||||
|
exception and faulting module, e.g. `access violation at libmpv-2.dll+0x1234`.
|
||||||
|
- **Panics** are logged with a backtrace.
|
||||||
|
|
||||||
|
The newest five dumps of each kind are kept. To read one, open it in WinDbg with the
|
||||||
|
symbols of the exact build that wrote it: `scripts/build.ps1` keeps each release's
|
||||||
|
`kaleido.exe` and `kaleido.pdb` in `.tools/symbols/<version>/` (release builds keep
|
||||||
|
function names and line tables in the `.pdb`; the installer doesn't change). In WinDbg:
|
||||||
|
`.sympath+ <that folder>`, `.reload`, then `~*k` for every thread's stack.
|
||||||
|
|
||||||
|
Development builds have two test commands: `debug_freeze_ui` (`{ seconds }`, holds the
|
||||||
|
UI thread) and `debug_crash` (an access violation); both refuse to run in release builds.
|
||||||
|
|
||||||
|
Threading rule learned the hard way: Tauri's window getters (`hwnd()`, sizes…) called
|
||||||
|
off the UI thread wait for it to answer, so never call one while holding a lock the UI
|
||||||
|
thread might wait on, and keep window-event handlers from waiting on the player's locks
|
||||||
|
(they run on the UI thread; `lib.rs` hands resize handling to a background thread).
|
||||||
|
|
||||||
|
## App icon
|
||||||
|
|
||||||
|
`src-tauri/icons/app-icon.svg` is the source. Render it to a 1024×1024 `app-icon.png`
|
||||||
|
with a transparent background, run `npx tauri icon src-tauri/icons/app-icon.png -o <temp dir>`,
|
||||||
|
and copy back only the files already in `src-tauri/icons` (the Android and iOS sets aren't used).
|
||||||
|
|
||||||
## Releases
|
## Releases
|
||||||
|
|
||||||
Releases are built and published from this Windows machine. CI only validates; it never
|
Releases are built and published locally: Windows on the Windows machine, macOS on the
|
||||||
builds installers on push (there are no Windows/macOS runners). Versions follow SemVer;
|
Mac. CI only validates; it never builds installers on push (there are no Windows/macOS
|
||||||
betas use a prerelease suffix (`0.1.0-beta.1`) and are published as pre-releases.
|
runners). Versions follow SemVer; betas use a prerelease suffix (`0.1.0-beta.1`) and are
|
||||||
|
published as pre-releases. **Each release carries both platforms**, and the update feed
|
||||||
|
is written only once both are uploaded.
|
||||||
|
|
||||||
Checklist for version `X.Y.Z` (run from the repository root):
|
Checklist for version `X.Y.Z` (run from the repository root):
|
||||||
|
|
||||||
1. **Version**: set `X.Y.Z` in `package.json`, `src-tauri/Cargo.toml` and
|
1. **Version** (either machine): set `X.Y.Z` in `package.json`, `src-tauri/Cargo.toml`
|
||||||
`src-tauri/tauri.conf.json`, then `npm install --package-lock-only` to update
|
and `src-tauri/tauri.conf.json`, then `npm install --package-lock-only` to update
|
||||||
`package-lock.json`.
|
`package-lock.json`.
|
||||||
2. **Changelog**: add a `## X.Y.Z` section at the top of `CHANGELOG.md`. It becomes the
|
2. **Changelog**: add a `## X.Y.Z` section at the top of `CHANGELOG.md`. It becomes the
|
||||||
release notes and the in-app update notes.
|
release notes and the in-app update notes.
|
||||||
3. **Check**: `npm run typecheck`, `npm test`, `cargo check --manifest-path src-tauri/Cargo.toml`.
|
3. **Check**: `npm run typecheck`, `npm test`, `cargo check --manifest-path src-tauri/Cargo.toml`.
|
||||||
4. **Build**: `.\scripts\build.ps1` → `src-tauri/target/release/bundle/nsis/Kaleido_X.Y.Z_x64-setup.exe`
|
4. **Commit and tag**: commit as `Release Kaleido Desktop X.Y.Z`, then
|
||||||
and its `.sig`. The updater key is read from `.tools/updater.key` (ignored; keep it
|
|
||||||
safe — replacing it breaks in-app updates for existing installs) or from
|
|
||||||
`TAURI_SIGNING_PRIVATE_KEY`.
|
|
||||||
5. **Commit and tag**: commit as `Release Kaleido Desktop X.Y.Z`, then
|
|
||||||
`git tag -a vX.Y.Z -m "Kaleido Desktop X.Y.Z"` and `git push origin main vX.Y.Z`
|
`git tag -a vX.Y.Z -m "Kaleido Desktop X.Y.Z"` and `git push origin main vX.Y.Z`
|
||||||
(SSH remote `origin`, already configured).
|
(SSH remote `origin`, already configured). Pull it on the other machine.
|
||||||
6. **Publish**: `node scripts/publish-release.mjs X.Y.Z` (add `--prerelease` for betas)
|
5. **Build and publish on Windows**: `.\scripts\build.ps1` →
|
||||||
creates the Forgejo release with the notes from `CHANGELOG.md` and uploads the
|
`src-tauri/target/release/bundle/nsis/Kaleido_X.Y.Z_x64-setup.exe` and its `.sig`;
|
||||||
installer and `.sig`. It reads `FORGEJO_TOKEN` (repository read/write) from the
|
then `node scripts/publish-release.mjs X.Y.Z` (add `--prerelease` for betas) creates
|
||||||
environment or the ignored `.env`, and never prints it. Re-running it replaces the
|
the Forgejo release with the notes from `CHANGELOG.md` and uploads them.
|
||||||
assets.
|
6. **Build and publish on macOS**: `sh scripts/build.sh` → `bundle/dmg/Kaleido_X.Y.Z_aarch64.dmg`
|
||||||
7. **Update feed**: `node scripts/update-manifest.mjs X.Y.Z https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/vX.Y.Z`
|
(first installs) and `bundle/macos/Kaleido_X.Y.Z_aarch64.app.tar.gz` with its `.sig`
|
||||||
rewrites `updates/latest.json`; commit it (`Publish the X.Y.Z update feed`) and push.
|
(updates); then `node scripts/publish-release.mjs X.Y.Z [--prerelease]` adds them to
|
||||||
Installed copies offer the update on their next start. Publish the feed only after
|
the same release. The order of 5 and 6 doesn't matter.
|
||||||
the release assets exist, or clients would be sent to a missing file.
|
7. **Update feed** (either machine): `node scripts/update-manifest.mjs X.Y.Z` reads the
|
||||||
8. **Verify**: download the installer from the release URL and compare its SHA-256 with
|
release's assets (downloading each `.sig`) and rewrites `updates/latest.json`; commit
|
||||||
the local file; `https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/raw/branch/main/updates/latest.json`
|
it (`Publish the X.Y.Z update feed`) and push. Installed copies offer the update on
|
||||||
should show the new version; CI on Actions should finish green.
|
their next start. The script refuses while a platform's build is missing from the
|
||||||
|
release, so neither OS is ever pointed at an older build; `--allow-missing` publishes
|
||||||
|
the feed without it (that OS then sees no update until the feed is regenerated).
|
||||||
|
8. **Verify**: download each artifact from the release and compare its SHA-256 with the
|
||||||
|
local file; `https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/raw/branch/main/updates/latest.json`
|
||||||
|
should list both platforms at the new version; CI on Actions should finish green.
|
||||||
|
|
||||||
The installer is per user (`%LOCALAPPDATA%\Kaleido`, no admin) and is not code-signed,
|
Both publishing scripts read `FORGEJO_TOKEN` (repository read/write) from the
|
||||||
so SmartScreen warns on first run. In-app updates run it in passive mode and relaunch.
|
environment or the ignored `.env`, and never print it. Re-running `publish-release.mjs`
|
||||||
|
replaces that machine's assets.
|
||||||
|
|
||||||
For macOS and Linux, build on those systems (`scripts/fetch-libmpv.sh`, then
|
**Update signing**: both build scripts sign update artifacts with the updater key from
|
||||||
`npx tauri build`) and merge their bundles into the same feed with `KALEIDO_BUNDLES`.
|
`.tools/updater.key` (ignored; keep it safe — replacing it breaks in-app updates for
|
||||||
`.forgejo/workflows/release.yml` validates every push and tag;
|
existing installs) or `TAURI_SIGNING_PRIVATE_KEY`. Both build machines need the same
|
||||||
|
key in `.tools/`; without it a build has no update archive.
|
||||||
|
|
||||||
|
**Windows** installs per user (`%LOCALAPPDATA%\Kaleido`, no admin) and is not
|
||||||
|
code-signed, so SmartScreen warns on first run. In-app updates run the installer in
|
||||||
|
passive mode and relaunch.
|
||||||
|
|
||||||
|
**macOS** builds are signed with a self-signed certificate, "Kaleido Self-Signed", in
|
||||||
|
the build Mac's login keychain (backed up, with its password, as
|
||||||
|
`.tools/macos-signing.p12` and `.tools/macos-signing.password`). A lasting signature
|
||||||
|
keeps the app's identity across updates, so the Keychain keeps trusting it with the
|
||||||
|
Plex token; ad hoc signatures change with every build and would make macOS ask again
|
||||||
|
after each update. To build on another Mac, import the backup:
|
||||||
|
`security import .tools/macos-signing.p12 -k ~/Library/Keychains/login.keychain-db -P "$(cat .tools/macos-signing.password)" -T /usr/bin/codesign`.
|
||||||
|
The app isn't notarized, so the first launch of a downloaded `.dmg` needs
|
||||||
|
System Settings → Privacy & Security → Open Anyway (or right-click → Open); in-app
|
||||||
|
updates aren't quarantined and install without that. Building runs Finder through
|
||||||
|
AppleScript to lay out the disk image window; set `CI=true` to skip that step.
|
||||||
|
|
||||||
|
Linux can be built with `sh scripts/fetch-libmpv.sh` and `npx tauri build` but isn't
|
||||||
|
published. `.forgejo/workflows/release.yml` validates every push and tag;
|
||||||
`.forgejo/workflows/build-installers.yml` can build installers in CI once runners exist
|
`.forgejo/workflows/build-installers.yml` can build installers in CI once runners exist
|
||||||
for each platform, and only runs when started by hand.
|
for each platform, and only runs when started by hand.
|
||||||
|
|
|
||||||
12
mini.html
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
<!doctype html>
|
||||||
|
<html lang="en" class="mini-window">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Kaleido</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="root"></div>
|
||||||
|
<script type="module" src="/src/mini/main.tsx"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
4
package-lock.json
generated
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "kaleido-desktop",
|
"name": "kaleido-desktop",
|
||||||
"version": "0.1.0-beta.6",
|
"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.6",
|
"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.6",
|
"version": "1.0.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,25 @@ if (-not $env:TAURI_SIGNING_PRIVATE_KEY) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (-not (Test-Path (Join-Path $root "node_modules"))) { npm ci }
|
if (-not (Test-Path (Join-Path $root "node_modules"))) { npm ci }
|
||||||
|
|
||||||
|
# Symbols for reading hang and crash dumps (diagnostics.rs): keep function names
|
||||||
|
# and line tables in kaleido.pdb. They stay out of the executable.
|
||||||
|
$env:CARGO_PROFILE_RELEASE_STRIP = "none"
|
||||||
|
$env:CARGO_PROFILE_RELEASE_DEBUG = "line-tables-only"
|
||||||
$buildArgs = @("tauri", "build")
|
$buildArgs = @("tauri", "build")
|
||||||
if ($Debug) { $buildArgs += "--debug" }
|
if ($Debug) { $buildArgs += "--debug" }
|
||||||
npx @buildArgs
|
npx @buildArgs
|
||||||
if ($LASTEXITCODE -ne 0) { throw "Build failed" }
|
if ($LASTEXITCODE -ne 0) { throw "Build failed" }
|
||||||
|
|
||||||
$profile = if ($Debug) { "debug" } else { "release" }
|
$profile = if ($Debug) { "debug" } else { "release" }
|
||||||
|
|
||||||
|
# Keep this version's executable and symbols: a dump can only be read with the
|
||||||
|
# exact build that wrote it (.tools/ is ignored).
|
||||||
|
if (-not $Debug) {
|
||||||
|
$version = (Get-Content (Join-Path $root "src-tauri\tauri.conf.json") -Raw | ConvertFrom-Json).version
|
||||||
|
$symbols = Join-Path $root ".tools\symbols\$version"
|
||||||
|
New-Item -ItemType Directory -Force $symbols | Out-Null
|
||||||
|
Copy-Item (Join-Path $root "src-tauri\target\release\kaleido.exe"), (Join-Path $root "src-tauri\target\release\kaleido.pdb") $symbols -Force
|
||||||
|
Write-Host "Symbols kept in $symbols"
|
||||||
|
}
|
||||||
Get-ChildItem (Join-Path $root "src-tauri\target\$profile\bundle\nsis") | Select-Object Name, Length
|
Get-ChildItem (Join-Path $root "src-tauri\target\$profile\bundle\nsis") | Select-Object Name, Length
|
||||||
|
|
|
||||||
54
scripts/build.sh
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
#!/usr/bin/env sh
|
||||||
|
# Builds Kaleido for macOS: the .app, a .dmg for first installs and the signed updater
|
||||||
|
# archive, renamed Kaleido_<version>_<arch>.app.tar.gz for the release.
|
||||||
|
# sh scripts/build.sh # release build
|
||||||
|
# sh scripts/build.sh --debug # faster unoptimized build
|
||||||
|
set -eu
|
||||||
|
root=$(cd "$(dirname "$0")/.." && pwd)
|
||||||
|
cd "$root"
|
||||||
|
profile=release
|
||||||
|
[ "${1:-}" = "--debug" ] && profile=debug
|
||||||
|
|
||||||
|
sh scripts/fetch-libmpv.sh
|
||||||
|
|
||||||
|
# The bundled libraries decide the oldest macOS Kaleido runs on (Homebrew builds them
|
||||||
|
# for the macOS of the machine that installed them).
|
||||||
|
minos=$(for f in vendor/mpv/macos/*.dylib; do otool -l "$f" | awk '/LC_BUILD_VERSION/{b=1} b&&/minos/{print $2; b=0}'; done | sort -V | tail -1)
|
||||||
|
|
||||||
|
# Signing with one lasting certificate keeps the app's identity across updates, so the
|
||||||
|
# Keychain keeps trusting it with the Plex token (ad hoc signatures change every build).
|
||||||
|
# "Kaleido Self-Signed" lives in the login keychain; .tools/macos-signing.p12 backs it up.
|
||||||
|
identity=${KALEIDO_SIGNING_IDENTITY:-Kaleido Self-Signed}
|
||||||
|
if security find-identity -p codesigning | grep -q "\"$identity\""; then
|
||||||
|
codesign --force --sign "$identity" vendor/mpv/macos/*.dylib 2>/dev/null
|
||||||
|
else
|
||||||
|
echo "warning: no \"$identity\" signing certificate; signing ad hoc (the Keychain will ask again after updates)." >&2
|
||||||
|
identity=-
|
||||||
|
fi
|
||||||
|
|
||||||
|
# The updater signing key stays outside git (.tools/), as on Windows.
|
||||||
|
updater=true
|
||||||
|
if [ -z "${TAURI_SIGNING_PRIVATE_KEY:-}" ]; then
|
||||||
|
if [ -f .tools/updater.key ]; then
|
||||||
|
TAURI_SIGNING_PRIVATE_KEY=$(cat .tools/updater.key)
|
||||||
|
TAURI_SIGNING_PRIVATE_KEY_PASSWORD=${TAURI_SIGNING_PRIVATE_KEY_PASSWORD:-}
|
||||||
|
export TAURI_SIGNING_PRIVATE_KEY TAURI_SIGNING_PRIVATE_KEY_PASSWORD
|
||||||
|
else
|
||||||
|
echo "warning: no updater signing key (.tools/updater.key); building without update artifacts." >&2
|
||||||
|
updater=false
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
config="{\"bundle\":{\"createUpdaterArtifacts\":$updater,\"macOS\":{\"minimumSystemVersion\":\"$minos\",\"signingIdentity\":\"$identity\"}}}"
|
||||||
|
|
||||||
|
[ -d node_modules ] || npm ci
|
||||||
|
if [ "$profile" = debug ]; then npx tauri build --debug --config "$config"; else npx tauri build --config "$config"; fi
|
||||||
|
|
||||||
|
version=$(node -p "require('./package.json').version")
|
||||||
|
arch=$(uname -m | sed 's/arm64/aarch64/; s/x86_64/x64/')
|
||||||
|
bundle="src-tauri/target/$profile/bundle"
|
||||||
|
if [ -f "$bundle/macos/Kaleido.app.tar.gz" ]; then
|
||||||
|
cp "$bundle/macos/Kaleido.app.tar.gz" "$bundle/macos/Kaleido_${version}_${arch}.app.tar.gz"
|
||||||
|
cp "$bundle/macos/Kaleido.app.tar.gz.sig" "$bundle/macos/Kaleido_${version}_${arch}.app.tar.gz.sig"
|
||||||
|
fi
|
||||||
|
echo "Built for macOS $minos or later:"
|
||||||
|
ls -l "$bundle/dmg" "$bundle/macos"
|
||||||
|
|
@ -1,14 +1,39 @@
|
||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
# macOS: copies Homebrew's libmpv into vendor/mpv/macos for bundling.
|
# macOS: copies Homebrew's libmpv and every library it links (ffmpeg, libplacebo, ...)
|
||||||
|
# into vendor/mpv/macos, pointing them at each other with @loader_path so the folder is
|
||||||
|
# self-contained; the bundle ships it as Contents/Frameworks.
|
||||||
# Linux: libmpv comes from the system package (libmpv2); nothing to copy.
|
# Linux: libmpv comes from the system package (libmpv2); nothing to copy.
|
||||||
set -eu
|
set -eu
|
||||||
root=$(cd "$(dirname "$0")/.." && pwd)
|
root=$(cd "$(dirname "$0")/.." && pwd)
|
||||||
case "$(uname -s)" in
|
case "$(uname -s)" in
|
||||||
Darwin)
|
Darwin)
|
||||||
|
out="$root/vendor/mpv/macos"
|
||||||
|
if [ -f "$out/libmpv.2.dylib" ] && [ "${1:-}" != "--force" ]; then
|
||||||
|
echo "libmpv already in vendor/mpv/macos (pass --force to refresh)"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
brew list mpv >/dev/null 2>&1 || brew install mpv
|
brew list mpv >/dev/null 2>&1 || brew install mpv
|
||||||
mkdir -p "$root/vendor/mpv/macos"
|
command -v dylibbundler >/dev/null 2>&1 || brew install dylibbundler
|
||||||
cp "$(brew --prefix mpv)/lib/libmpv.2.dylib" "$root/vendor/mpv/macos/"
|
rm -rf "$out" && mkdir -p "$out"
|
||||||
echo "libmpv copied to vendor/mpv/macos" ;;
|
cp "$(brew --prefix mpv)/lib/libmpv.2.dylib" "$out/"
|
||||||
|
chmod u+w "$out/libmpv.2.dylib"
|
||||||
|
install_name_tool -id @loader_path/libmpv.2.dylib "$out/libmpv.2.dylib"
|
||||||
|
# -of: overwrite, -b: bundle dependencies, -x: fix this file, -d: where they go,
|
||||||
|
# -p: how they're referenced, -s: also search Homebrew's lib folder for @rpath names.
|
||||||
|
dylibbundler -of -b -x "$out/libmpv.2.dylib" -d "$out" -p @loader_path/ -s "$(brew --prefix)/lib" >/dev/null
|
||||||
|
for f in "$out"/*.dylib; do
|
||||||
|
# dylibbundler can repeat an rpath, which dyld refuses to load; keep one of each.
|
||||||
|
for rpath in $(otool -l "$f" | awk '/cmd LC_RPATH/{getline; getline; print $2}' | sort | uniq -d); do
|
||||||
|
while [ "$(otool -l "$f" | awk '/cmd LC_RPATH/{getline; getline; print $2}' | grep -cx "$rpath")" -gt 1 ]; do
|
||||||
|
install_name_tool -delete_rpath "$rpath" "$f" 2>/dev/null
|
||||||
|
done
|
||||||
|
done
|
||||||
|
# Rewriting load commands invalidates signatures; Apple silicon refuses unsigned code.
|
||||||
|
codesign --force --sign - "$f" 2>/dev/null
|
||||||
|
done
|
||||||
|
# Homebrew builds for the macOS it runs on: the oldest macOS these libraries load on.
|
||||||
|
minos=$(for f in "$out"/*.dylib; do otool -l "$f" | awk '/LC_BUILD_VERSION/{b=1} b&&/minos/{print $2; b=0}'; done | sort -V | tail -1)
|
||||||
|
echo "libmpv and $(($(ls "$out" | wc -l) - 1)) libraries copied to vendor/mpv/macos (need macOS $minos or later)" ;;
|
||||||
Linux)
|
Linux)
|
||||||
echo "Install libmpv from your distribution (e.g. apt install libmpv2 libmpv-dev)." ;;
|
echo "Install libmpv from your distribution (e.g. apt install libmpv2 libmpv-dev)." ;;
|
||||||
*) echo "Use scripts/fetch-libmpv.ps1 on Windows." ;;
|
*) echo "Use scripts/fetch-libmpv.ps1 on Windows." ;;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,12 @@
|
||||||
// Creates (or reuses) a Forgejo release for a tag and uploads the Windows installer and
|
// Creates (or reuses) a Forgejo release for a tag and uploads this machine's build of it:
|
||||||
// its updater signature. Reads FORGEJO_TOKEN from the environment or the ignored .env.
|
// the Windows installer, or the macOS disk image and updater archive, each with its
|
||||||
|
// updater signature. Run it on each OS after building; both land in the same release.
|
||||||
|
// Reads FORGEJO_TOKEN from the environment or the ignored .env.
|
||||||
// Usage: node scripts/publish-release.mjs <version> [--prerelease]
|
// Usage: node scripts/publish-release.mjs <version> [--prerelease]
|
||||||
import fs from 'node:fs';
|
import fs from 'node:fs';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
|
import { api, bundleDir, releaseNotes, token } from './release-common.mjs';
|
||||||
|
|
||||||
const API = 'https://git.elijahkuntz.com/api/v1/repos/Elijah/Kaleido-Desktop';
|
|
||||||
const root = path.resolve(import.meta.dirname, '..');
|
|
||||||
const version = process.argv[2];
|
const version = process.argv[2];
|
||||||
const prerelease = process.argv.includes('--prerelease');
|
const prerelease = process.argv.includes('--prerelease');
|
||||||
if (!version) {
|
if (!version) {
|
||||||
|
|
@ -13,43 +14,38 @@ if (!version) {
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
let token = process.env.FORGEJO_TOKEN;
|
/** This version's release files as built on this OS (scripts/build.ps1 or scripts/build.sh). */
|
||||||
if (!token && fs.existsSync(path.join(root, '.env'))) {
|
function builtFiles() {
|
||||||
token = fs.readFileSync(path.join(root, '.env'), 'utf8').match(/^FORGEJO_TOKEN=(.*)$/m)?.[1]?.trim().replace(/^"|"$/g, '');
|
if (process.platform === 'win32') {
|
||||||
|
const dir = path.join(bundleDir, 'nsis');
|
||||||
|
return [`Kaleido_${version}_x64-setup.exe`, `Kaleido_${version}_x64-setup.exe.sig`].map((n) => path.join(dir, n));
|
||||||
|
}
|
||||||
|
if (process.platform === 'darwin') {
|
||||||
|
const arch = process.arch === 'arm64' ? 'aarch64' : 'x64';
|
||||||
|
return [
|
||||||
|
path.join(bundleDir, 'dmg', `Kaleido_${version}_${arch}.dmg`),
|
||||||
|
path.join(bundleDir, 'macos', `Kaleido_${version}_${arch}.app.tar.gz`),
|
||||||
|
path.join(bundleDir, 'macos', `Kaleido_${version}_${arch}.app.tar.gz.sig`),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
throw new Error('Publish releases from Windows or macOS.');
|
||||||
}
|
}
|
||||||
if (!token) {
|
|
||||||
console.error('FORGEJO_TOKEN is not set.');
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
const headers = { Authorization: `token ${token}`, Accept: 'application/json' };
|
|
||||||
|
|
||||||
async function api(method, url, body) {
|
token(true);
|
||||||
const r = await fetch(url.startsWith('http') ? url : API + url, {
|
const files = builtFiles();
|
||||||
method,
|
for (const file of files) {
|
||||||
headers: body instanceof FormData ? headers : { ...headers, 'Content-Type': 'application/json' },
|
if (!fs.existsSync(file)) throw new Error(`Missing ${file}; build this version first.`);
|
||||||
body: body === undefined ? undefined : body instanceof FormData ? body : JSON.stringify(body),
|
|
||||||
});
|
|
||||||
const text = await r.text();
|
|
||||||
if (!r.ok) throw new Error(`${method} ${url} → ${r.status} ${text.slice(0, 300)}`);
|
|
||||||
return text ? JSON.parse(text) : null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const tag = `v${version}`;
|
const tag = `v${version}`;
|
||||||
const changelog = fs.readFileSync(path.join(root, 'CHANGELOG.md'), 'utf8');
|
|
||||||
const section = changelog.split(/^## /m).find((s) => s.startsWith(version));
|
|
||||||
const notes = section ? section.slice(version.length).trim() : '';
|
|
||||||
|
|
||||||
let release = await api('GET', `/releases/tags/${tag}`).catch(() => null);
|
let release = await api('GET', `/releases/tags/${tag}`).catch(() => null);
|
||||||
if (!release) {
|
if (!release) {
|
||||||
release = await api('POST', '/releases', { tag_name: tag, name: `Kaleido Desktop ${version}`, body: notes, prerelease, draft: false });
|
release = await api('POST', '/releases', { tag_name: tag, name: `Kaleido Desktop ${version}`, body: releaseNotes(version), prerelease, draft: false });
|
||||||
console.log(`Created release ${release.name}`);
|
console.log(`Created release ${release.name}`);
|
||||||
} else console.log(`Using existing release ${release.name}`);
|
} else console.log(`Using existing release ${release.name}`);
|
||||||
|
|
||||||
const dir = path.join(root, 'src-tauri/target/release/bundle/nsis');
|
for (const file of files) {
|
||||||
const files = [`Kaleido_${version}_x64-setup.exe`, `Kaleido_${version}_x64-setup.exe.sig`];
|
const name = path.basename(file);
|
||||||
for (const name of files) {
|
|
||||||
const file = path.join(dir, name);
|
|
||||||
if (!fs.existsSync(file)) throw new Error(`Missing ${file}; run scripts/build.ps1 first.`);
|
|
||||||
const existing = release.assets?.find((a) => a.name === name);
|
const existing = release.assets?.find((a) => a.name === name);
|
||||||
if (existing) await api('DELETE', `/releases/${release.id}/assets/${existing.id}`);
|
if (existing) await api('DELETE', `/releases/${release.id}/assets/${existing.id}`);
|
||||||
const form = new FormData();
|
const form = new FormData();
|
||||||
|
|
|
||||||
49
scripts/release-common.mjs
Normal file
|
|
@ -0,0 +1,49 @@
|
||||||
|
// Shared by the release scripts: the Forgejo API (FORGEJO_TOKEN from the environment or
|
||||||
|
// the ignored .env, never printed), release notes and the bundle folder.
|
||||||
|
import fs from 'node:fs';
|
||||||
|
import path from 'node:path';
|
||||||
|
|
||||||
|
export const API = 'https://git.elijahkuntz.com/api/v1/repos/Elijah/Kaleido-Desktop';
|
||||||
|
export const root = path.resolve(import.meta.dirname, '..');
|
||||||
|
export const bundleDir = path.join(root, 'src-tauri/target/release/bundle');
|
||||||
|
|
||||||
|
/** FORGEJO_TOKEN; reads of a public repository work without it, uploads don't. */
|
||||||
|
export function token(required = false) {
|
||||||
|
let t = process.env.FORGEJO_TOKEN;
|
||||||
|
if (!t && fs.existsSync(path.join(root, '.env'))) {
|
||||||
|
t = fs.readFileSync(path.join(root, '.env'), 'utf8').match(/^FORGEJO_TOKEN=(.*)$/m)?.[1]?.trim().replace(/^"|"$/g, '');
|
||||||
|
}
|
||||||
|
if (!t && required) {
|
||||||
|
console.error('FORGEJO_TOKEN is not set.');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auth = () => (token() ? { Authorization: `token ${token()}` } : {});
|
||||||
|
|
||||||
|
export async function api(method, url, body) {
|
||||||
|
const headers = { ...auth(), Accept: 'application/json' };
|
||||||
|
const r = await fetch(url.startsWith('http') ? url : API + url, {
|
||||||
|
method,
|
||||||
|
headers: body instanceof FormData ? headers : { ...headers, 'Content-Type': 'application/json' },
|
||||||
|
body: body === undefined ? undefined : body instanceof FormData ? body : JSON.stringify(body),
|
||||||
|
});
|
||||||
|
const text = await r.text();
|
||||||
|
if (!r.ok) throw new Error(`${method} ${url} → ${r.status} ${text.slice(0, 300)}`);
|
||||||
|
return text ? JSON.parse(text) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Downloads a release asset's text (an updater signature). */
|
||||||
|
export async function download(url) {
|
||||||
|
const r = await fetch(url, { headers: auth() });
|
||||||
|
if (!r.ok) throw new Error(`GET ${url} → ${r.status}`);
|
||||||
|
return r.text();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The version's section of CHANGELOG.md. */
|
||||||
|
export function releaseNotes(version) {
|
||||||
|
const changelog = fs.readFileSync(path.join(root, 'CHANGELOG.md'), 'utf8');
|
||||||
|
const section = changelog.split(/^## /m).find((s) => s.startsWith(version));
|
||||||
|
return section ? section.slice(version.length).trim() : '';
|
||||||
|
}
|
||||||
|
|
@ -1,53 +1,56 @@
|
||||||
// Writes updates/latest.json, the feed Kaleido's updater reads, from built bundles.
|
// Writes updates/latest.json, the feed Kaleido's updater reads, from a published release:
|
||||||
// Usage: node scripts/update-manifest.mjs <version> <baseDownloadUrl> [notesFile]
|
// each platform's updater artifact and signature are taken from the release's assets, so
|
||||||
// Notes come from the version's CHANGELOG.md section unless a notes file is given.
|
// the feed only ever points at this version's files, whichever machine runs it.
|
||||||
// Each platform's signed artifact (and its .sig) must be in src-tauri/target/release/bundle,
|
// Usage: node scripts/update-manifest.mjs <version> [--allow-missing] [notesFile]
|
||||||
// or pass several bundle folders via KALEIDO_BUNDLES (path;path) when collecting CI outputs.
|
// Every platform in PLATFORMS must be in the release (publish from each OS first);
|
||||||
|
// --allow-missing writes the feed anyway, leaving the missing platforms out of it, so
|
||||||
|
// their installs simply see no update until the feed is regenerated.
|
||||||
import fs from 'node:fs';
|
import fs from 'node:fs';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
|
import { api, download, releaseNotes, root } from './release-common.mjs';
|
||||||
|
|
||||||
const [version, baseUrl, notesFile] = process.argv.slice(2);
|
const args = process.argv.slice(2);
|
||||||
if (!version || !baseUrl) {
|
const allowMissing = args.includes('--allow-missing');
|
||||||
console.error('usage: node scripts/update-manifest.mjs <version> <baseDownloadUrl> [notesFile]');
|
const [version, notesFile] = args.filter((a) => !a.startsWith('--'));
|
||||||
|
if (!version) {
|
||||||
|
console.error('usage: node scripts/update-manifest.mjs <version> [--allow-missing] [notesFile]');
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
const root = path.resolve(import.meta.dirname, '..');
|
|
||||||
const bundles = (process.env.KALEIDO_BUNDLES ?? path.join(root, 'src-tauri/target/release/bundle')).split(';');
|
|
||||||
|
|
||||||
/** Tauri updater platform keys and the artifact each one installs. */
|
/** Tauri updater platform keys and the release asset each one installs. */
|
||||||
const PLATFORMS = [
|
const PLATFORMS = [
|
||||||
{ key: 'windows-x86_64', dir: 'nsis', match: /-setup\.exe$/ },
|
{ key: 'windows-x86_64', match: (f) => f === `Kaleido_${version}_x64-setup.exe` },
|
||||||
{ key: 'darwin-aarch64', dir: 'macos', match: /aarch64.*\.app\.tar\.gz$/ },
|
{ key: 'darwin-aarch64', match: (f) => f === `Kaleido_${version}_aarch64.app.tar.gz` },
|
||||||
{ key: 'darwin-x86_64', dir: 'macos', match: /x64.*\.app\.tar\.gz$/ },
|
|
||||||
{ key: 'linux-x86_64', dir: 'appimage', match: /\.AppImage$/ },
|
|
||||||
];
|
];
|
||||||
|
|
||||||
const manifestPath = path.join(root, 'updates/latest.json');
|
const release = await api('GET', `/releases/tags/v${version}`).catch(() => null);
|
||||||
const manifest = fs.existsSync(manifestPath) ? JSON.parse(fs.readFileSync(manifestPath, 'utf8')) : { platforms: {} };
|
if (!release) throw new Error(`No release v${version}; publish it with scripts/publish-release.mjs first.`);
|
||||||
manifest.version = version;
|
const assets = release.assets ?? [];
|
||||||
// Notes default to this version's section of CHANGELOG.md.
|
|
||||||
const changelogNotes = () => {
|
|
||||||
const section = fs.readFileSync(path.join(root, 'CHANGELOG.md'), 'utf8').split(/^## /m).find((x) => x.startsWith(version));
|
|
||||||
return section ? section.slice(version.length).trim() : '';
|
|
||||||
};
|
|
||||||
manifest.notes = notesFile ? fs.readFileSync(notesFile, 'utf8').trim() : changelogNotes();
|
|
||||||
manifest.pub_date = new Date().toISOString();
|
|
||||||
manifest.platforms ??= {};
|
|
||||||
|
|
||||||
for (const bundle of bundles) {
|
const platforms = {};
|
||||||
for (const p of PLATFORMS) {
|
const missing = [];
|
||||||
const dir = path.join(bundle, p.dir);
|
for (const p of PLATFORMS) {
|
||||||
if (!fs.existsSync(dir)) continue;
|
const artifact = assets.find((a) => p.match(a.name));
|
||||||
const file = fs.readdirSync(dir).find((f) => p.match.test(f) && f.includes(version));
|
const sig = artifact && assets.find((a) => a.name === `${artifact.name}.sig`);
|
||||||
if (!file || !fs.existsSync(path.join(dir, `${file}.sig`))) continue;
|
if (!artifact || !sig) {
|
||||||
manifest.platforms[p.key] = {
|
missing.push(p.key);
|
||||||
signature: fs.readFileSync(path.join(dir, `${file}.sig`), 'utf8').trim(),
|
continue;
|
||||||
url: `${baseUrl.replace(/\/$/, '')}/${encodeURIComponent(file)}`,
|
|
||||||
};
|
|
||||||
console.log(`${p.key}: ${file}`);
|
|
||||||
}
|
}
|
||||||
|
platforms[p.key] = { signature: (await download(sig.browser_download_url)).trim(), url: artifact.browser_download_url };
|
||||||
|
console.log(`${p.key}: ${artifact.name}`);
|
||||||
}
|
}
|
||||||
|
if (missing.length && !allowMissing) {
|
||||||
|
console.error(`v${version} has no build for ${missing.join(', ')}. Publish it from that OS, or pass --allow-missing.`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
if (!Object.keys(platforms).length) throw new Error(`v${version} has no updater artifacts.`);
|
||||||
|
|
||||||
fs.mkdirSync(path.dirname(manifestPath), { recursive: true });
|
const manifest = {
|
||||||
|
version,
|
||||||
|
notes: notesFile ? fs.readFileSync(notesFile, 'utf8').trim() : releaseNotes(version),
|
||||||
|
pub_date: new Date().toISOString(),
|
||||||
|
platforms,
|
||||||
|
};
|
||||||
|
const manifestPath = path.join(root, 'updates/latest.json');
|
||||||
fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
|
fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
|
||||||
console.log(`Wrote ${path.relative(root, manifestPath)}`);
|
console.log(`Wrote ${path.relative(root, manifestPath)}${missing.length ? ` (without ${missing.join(', ')})` : ''}`);
|
||||||
|
|
|
||||||
57
src-tauri/Cargo.lock
generated
|
|
@ -2173,13 +2173,21 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "kaleido"
|
name = "kaleido"
|
||||||
version = "0.1.0-beta.6"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fs2",
|
"fs2",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"keyring",
|
"keyring",
|
||||||
"libloading 0.8.9",
|
"libloading 0.8.9",
|
||||||
"log",
|
"log",
|
||||||
|
"objc2",
|
||||||
|
"objc2-app-kit",
|
||||||
|
"objc2-core-foundation",
|
||||||
|
"objc2-core-graphics",
|
||||||
|
"objc2-core-video",
|
||||||
|
"objc2-foundation",
|
||||||
|
"objc2-open-gl",
|
||||||
|
"objc2-quartz-core",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"reqwest 0.12.28",
|
"reqwest 0.12.28",
|
||||||
|
|
@ -2605,8 +2613,15 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.2",
|
"bitflags 2.13.2",
|
||||||
"block2",
|
"block2",
|
||||||
|
"libc",
|
||||||
"objc2",
|
"objc2",
|
||||||
|
"objc2-cloud-kit",
|
||||||
|
"objc2-core-data",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
|
"objc2-core-graphics",
|
||||||
|
"objc2-core-image",
|
||||||
|
"objc2-core-text",
|
||||||
|
"objc2-core-video",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
"objc2-quartz-core",
|
"objc2-quartz-core",
|
||||||
]
|
]
|
||||||
|
|
@ -2628,6 +2643,7 @@ version = "0.3.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
|
checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"bitflags 2.13.2",
|
||||||
"objc2",
|
"objc2",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
]
|
]
|
||||||
|
|
@ -2688,6 +2704,19 @@ dependencies = [
|
||||||
"objc2-core-graphics",
|
"objc2-core-graphics",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2-core-video"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.13.2",
|
||||||
|
"objc2",
|
||||||
|
"objc2-core-foundation",
|
||||||
|
"objc2-core-graphics",
|
||||||
|
"objc2-io-surface",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "objc2-encode"
|
name = "objc2-encode"
|
||||||
version = "4.1.0"
|
version = "4.1.0"
|
||||||
|
|
@ -2727,6 +2756,26 @@ dependencies = [
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2-metal"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.13.2",
|
||||||
|
"objc2",
|
||||||
|
"objc2-foundation",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2-open-gl"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0ecc7fd7519a189d9ba9ed9de51af81e41d096aea1d08cca59fd9d8c65d8f585"
|
||||||
|
dependencies = [
|
||||||
|
"objc2",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "objc2-osa-kit"
|
name = "objc2-osa-kit"
|
||||||
version = "0.3.2"
|
version = "0.3.2"
|
||||||
|
|
@ -2746,9 +2795,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
|
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.2",
|
"bitflags 2.13.2",
|
||||||
|
"block2",
|
||||||
|
"libc",
|
||||||
"objc2",
|
"objc2",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
|
"objc2-core-graphics",
|
||||||
|
"objc2-core-video",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
|
"objc2-metal",
|
||||||
|
"objc2-open-gl",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "kaleido"
|
name = "kaleido"
|
||||||
version = "0.1.0-beta.6"
|
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"
|
||||||
|
|
@ -34,6 +34,14 @@ log = "0.4"
|
||||||
# Credentials use each OS's native store: Credential Manager, Keychain, Secret Service.
|
# Credentials use each OS's native store: Credential Manager, Keychain, Secret Service.
|
||||||
[target.'cfg(target_os = "macos")'.dependencies]
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
keyring = { version = "3", features = ["apple-native"] }
|
keyring = { version = "3", features = ["apple-native"] }
|
||||||
|
objc2 = "0.6"
|
||||||
|
objc2-foundation = { version = "0.3", features = ["NSGeometry", "NSString", "NSValue", "NSHost", "NSProcessInfo", "NSKeyValueCoding"] }
|
||||||
|
objc2-core-foundation = { version = "0.3", default-features = false, features = ["std", "CFDate", "CFString"] }
|
||||||
|
objc2-app-kit = { version = "0.3", features = ["NSView", "NSWindow", "NSResponder", "NSButton", "NSControl", "NSGraphics"] }
|
||||||
|
objc2-quartz-core = { version = "0.3", features = ["CALayer", "CAOpenGLLayer", "CATransaction", "CAMediaTiming", "objc2-open-gl", "objc2-core-video", "objc2-core-graphics"] }
|
||||||
|
objc2-core-graphics = { version = "0.3", default-features = false, features = ["std", "CGColorSpace"] }
|
||||||
|
objc2-open-gl = { version = "0.3", default-features = false, features = ["std", "CGLTypes", "CGLCurrent"] }
|
||||||
|
objc2-core-video = { version = "0.3", default-features = false, features = ["std", "CVBase"] }
|
||||||
|
|
||||||
[target.'cfg(target_os = "linux")'.dependencies]
|
[target.'cfg(target_os = "linux")'.dependencies]
|
||||||
keyring = { version = "3", features = ["sync-secret-service", "crypto-rust"] }
|
keyring = { version = "3", features = ["sync-secret-service", "crypto-rust"] }
|
||||||
|
|
@ -54,6 +62,13 @@ windows = { version = "0.61", features = [
|
||||||
"Win32_Graphics_Direct3D",
|
"Win32_Graphics_Direct3D",
|
||||||
"Win32_Graphics_Direct3D11",
|
"Win32_Graphics_Direct3D11",
|
||||||
"Foundation_Numerics",
|
"Foundation_Numerics",
|
||||||
|
# Hang and crash dumps (diagnostics.rs).
|
||||||
|
"Win32_System_Diagnostics_Debug",
|
||||||
|
"Win32_System_Kernel",
|
||||||
|
"Win32_System_Memory",
|
||||||
|
"Win32_System_Threading",
|
||||||
|
# The miniplayer window's rounded corners (mini.rs).
|
||||||
|
"Win32_Graphics_Dwm",
|
||||||
] }
|
] }
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
{
|
{
|
||||||
"$schema": "../gen/schemas/desktop-schema.json",
|
"$schema": "../gen/schemas/desktop-schema.json",
|
||||||
"identifier": "default",
|
"identifier": "default",
|
||||||
"description": "Kaleido main window",
|
"description": "Kaleido main window and miniplayer window",
|
||||||
"windows": [
|
"windows": [
|
||||||
"main"
|
"main",
|
||||||
|
"mini"
|
||||||
],
|
],
|
||||||
"permissions": [
|
"permissions": [
|
||||||
"core:default",
|
"core:default",
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 4 KiB |
|
Before Width: | Height: | Size: 153 KiB After Width: | Height: | Size: 447 KiB |
35
src-tauri/icons/app-icon.svg
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024">
|
||||||
|
<!-- Source for app-icon.png: the brand mark filling ~77% of the tile. Regenerate the
|
||||||
|
icon set with `npx tauri icon` (see docs/development.md → App icon). -->
|
||||||
|
<defs>
|
||||||
|
<radialGradient id="teal" cx="900" cy="110" r="920" gradientUnits="userSpaceOnUse">
|
||||||
|
<stop offset="0" stop-color="#3D7C7B" stop-opacity="0.38"/>
|
||||||
|
<stop offset="1" stop-color="#3D7C7B" stop-opacity="0"/>
|
||||||
|
</radialGradient>
|
||||||
|
<radialGradient id="warm" cx="110" cy="950" r="820" gradientUnits="userSpaceOnUse">
|
||||||
|
<stop offset="0" stop-color="#D0A977" stop-opacity="0.17"/>
|
||||||
|
<stop offset="1" stop-color="#D0A977" stop-opacity="0"/>
|
||||||
|
</radialGradient>
|
||||||
|
<radialGradient id="core" cx="512" cy="512" r="300" gradientUnits="userSpaceOnUse">
|
||||||
|
<stop offset="0" stop-color="#71B9B0" stop-opacity="0.12"/>
|
||||||
|
<stop offset="1" stop-color="#71B9B0" stop-opacity="0"/>
|
||||||
|
</radialGradient>
|
||||||
|
<clipPath id="tile">
|
||||||
|
<rect width="1024" height="1024" rx="200"/>
|
||||||
|
</clipPath>
|
||||||
|
</defs>
|
||||||
|
<g clip-path="url(#tile)">
|
||||||
|
<rect width="1024" height="1024" fill="#0d1011"/>
|
||||||
|
<rect width="1024" height="1024" fill="url(#teal)"/>
|
||||||
|
<rect width="1024" height="1024" fill="url(#warm)"/>
|
||||||
|
<rect width="1024" height="1024" fill="url(#core)"/>
|
||||||
|
</g>
|
||||||
|
<g transform="translate(64 64) scale(14)">
|
||||||
|
<path fill="#C3E8D3" d="M33,4 L55.5,17 L42.5,24.5 L33,19 Z"/>
|
||||||
|
<path fill="#71B9B0" d="M56.5,19 L56.5,45 L43.5,37.5 L43.5,26.5 Z"/>
|
||||||
|
<path fill="#3D7C7B" d="M55.5,47 L33,60 L33,45 L42.5,39.5 Z"/>
|
||||||
|
<path fill="#D0A977" d="M31,60 L8.5,47 L21.5,39.5 L31,45 Z"/>
|
||||||
|
<path fill="#E9D8AE" d="M7.5,45 L7.5,19 L20.5,26.5 L20.5,37.5 Z"/>
|
||||||
|
<path fill="#EEF2DD" d="M8.5,17 L31,4 L31,19 L21.5,24.5 Z"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 93 KiB |
158
src-tauri/src/diagnostics.rs
Normal file
|
|
@ -0,0 +1,158 @@
|
||||||
|
//! Diagnostics that stay on this computer, in the app's log folder
|
||||||
|
//! (`%LOCALAPPDATA%\tv.kaleido.desktop\logs` on Windows):
|
||||||
|
//!
|
||||||
|
//! - A watchdog: if the UI thread stops answering for `HANG_AFTER`, it writes
|
||||||
|
//! a dump of every thread's stack (`kaleido-hang-*.dmp`), once per stall.
|
||||||
|
//! - Crashes write a dump of the crashing thread and the rest
|
||||||
|
//! (`kaleido-crash-*.dmp`; Windows only), and panics are logged.
|
||||||
|
//! - `diagnostics.log` notes each of these with the time.
|
||||||
|
//!
|
||||||
|
//! Nothing is uploaded. Dumps need the release's `kaleido.pdb` to read; the
|
||||||
|
//! build script keeps one per version (docs/development.md → Diagnostics).
|
||||||
|
|
||||||
|
use std::io::Write;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::sync::atomic::{AtomicU64, Ordering};
|
||||||
|
use std::sync::OnceLock;
|
||||||
|
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
|
use tauri::{AppHandle, Manager, Runtime};
|
||||||
|
|
||||||
|
/// How long the UI thread may go without answering before a hang dump.
|
||||||
|
const HANG_AFTER: Duration = Duration::from_secs(5);
|
||||||
|
/// Dumps kept of each kind; older ones are removed.
|
||||||
|
const KEEP_DUMPS: usize = 5;
|
||||||
|
|
||||||
|
static DIR: OnceLock<PathBuf> = OnceLock::new();
|
||||||
|
static ORIGIN: OnceLock<Instant> = OnceLock::new();
|
||||||
|
/// When the UI thread last answered, in ms since `ORIGIN`.
|
||||||
|
static BEAT: AtomicU64 = AtomicU64::new(0);
|
||||||
|
|
||||||
|
fn now_ms() -> u64 {
|
||||||
|
ORIGIN.get_or_init(Instant::now).elapsed().as_millis() as u64
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The folder for logs and dumps, once `start` has run.
|
||||||
|
pub fn dir() -> Option<&'static Path> {
|
||||||
|
DIR.get().map(PathBuf::as_path)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// UTC date and time, e.g. `2026-11-04 16:43:07` (file names use `-` for `:`).
|
||||||
|
fn timestamp() -> String {
|
||||||
|
let secs = SystemTime::now().duration_since(UNIX_EPOCH).map(|d| d.as_secs()).unwrap_or(0);
|
||||||
|
let (days, rem) = (secs / 86_400, secs % 86_400);
|
||||||
|
// Civil date from days since 1970-01-01 (Howard Hinnant's algorithm).
|
||||||
|
let z = days as i64 + 719_468;
|
||||||
|
let era = z.div_euclid(146_097);
|
||||||
|
let doe = z - era * 146_097;
|
||||||
|
let yoe = (doe - doe / 1_460 + doe / 36_524 - doe / 146_096) / 365;
|
||||||
|
let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
|
||||||
|
let mp = (5 * doy + 2) / 153;
|
||||||
|
let day = doy - (153 * mp + 2) / 5 + 1;
|
||||||
|
let month = if mp < 10 { mp + 3 } else { mp - 9 };
|
||||||
|
let year = yoe + era * 400 + i64::from(month <= 2);
|
||||||
|
format!("{year:04}-{month:02}-{day:02} {:02}:{:02}:{:02}", rem / 3600, rem / 60 % 60, rem % 60)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Appends a line to `diagnostics.log`.
|
||||||
|
pub fn log(line: &str) {
|
||||||
|
let Some(dir) = dir() else { return };
|
||||||
|
if let Ok(mut f) = std::fs::OpenOptions::new().create(true).append(true).open(dir.join("diagnostics.log")) {
|
||||||
|
let _ = writeln!(f, "{} UTC {line}", timestamp());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A new dump's path, after removing the oldest of its kind beyond `KEEP_DUMPS`.
|
||||||
|
pub fn dump_path(kind: &str) -> Option<PathBuf> {
|
||||||
|
let dir = dir()?;
|
||||||
|
let prefix = format!("kaleido-{kind}-");
|
||||||
|
if let Ok(entries) = std::fs::read_dir(dir) {
|
||||||
|
let mut old: Vec<PathBuf> = entries
|
||||||
|
.flatten()
|
||||||
|
.map(|e| e.path())
|
||||||
|
.filter(|p| p.file_name().and_then(|n| n.to_str()).is_some_and(|n| n.starts_with(&prefix) && n.ends_with(".dmp")))
|
||||||
|
.collect();
|
||||||
|
old.sort();
|
||||||
|
while old.len() >= KEEP_DUMPS {
|
||||||
|
let _ = std::fs::remove_file(old.remove(0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let name = format!("{prefix}{}-v{}.dmp", timestamp().replace([' ', ':'], "-"), env!("CARGO_PKG_VERSION"));
|
||||||
|
Some(dir.join(name))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sets up the log folder, crash and panic reporting, and the hang watchdog.
|
||||||
|
pub fn start<R: Runtime>(app: &AppHandle<R>) {
|
||||||
|
let Ok(dir) = app.path().app_log_dir() else { return };
|
||||||
|
if std::fs::create_dir_all(&dir).is_err() || DIR.set(dir).is_err() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
crate::platform::install_crash_handler();
|
||||||
|
|
||||||
|
let previous = std::panic::take_hook();
|
||||||
|
std::panic::set_hook(Box::new(move |info| {
|
||||||
|
let thread = std::thread::current();
|
||||||
|
log(&format!(
|
||||||
|
"panic on thread {}: {info}\n{}",
|
||||||
|
thread.name().unwrap_or("unnamed"),
|
||||||
|
std::backtrace::Backtrace::force_capture()
|
||||||
|
));
|
||||||
|
previous(info);
|
||||||
|
}));
|
||||||
|
|
||||||
|
let app = app.clone();
|
||||||
|
let _ = std::thread::Builder::new().name("ui-watchdog".into()).spawn(move || watchdog(app));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Development builds only: holds the UI thread for `seconds`, to test the watchdog.
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn debug_freeze_ui<R: Runtime>(app: AppHandle<R>, seconds: u64) -> Result<(), String> {
|
||||||
|
if !cfg!(debug_assertions) {
|
||||||
|
return Err("Only available in development builds.".into());
|
||||||
|
}
|
||||||
|
app.run_on_main_thread(move || std::thread::sleep(Duration::from_secs(seconds.min(30)))).map_err(|e| e.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Development builds only: crashes with an access violation, to test crash dumps.
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn debug_crash() -> Result<(), String> {
|
||||||
|
if !cfg!(debug_assertions) {
|
||||||
|
return Err("Only available in development builds.".into());
|
||||||
|
}
|
||||||
|
let _ = std::thread::Builder::new().name("debug-crash".into()).spawn(|| unsafe {
|
||||||
|
std::ptr::null_mut::<u8>().write_volatile(1);
|
||||||
|
});
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Asks the UI thread to note the time every second; if it hasn't for
|
||||||
|
/// `HANG_AFTER`, the UI thread is stuck: dump every thread's stack.
|
||||||
|
fn watchdog<R: Runtime>(app: AppHandle<R>) {
|
||||||
|
BEAT.store(now_ms(), Ordering::Relaxed);
|
||||||
|
let mut last_tick = now_ms();
|
||||||
|
let mut stalled_since: Option<u64> = None;
|
||||||
|
loop {
|
||||||
|
let _ = app.run_on_main_thread(|| BEAT.store(now_ms(), Ordering::Relaxed));
|
||||||
|
std::thread::sleep(Duration::from_secs(1));
|
||||||
|
let now = now_ms();
|
||||||
|
// This thread was itself held up (the computer slept): not a hang.
|
||||||
|
if now - last_tick > 3_000 {
|
||||||
|
BEAT.store(now, Ordering::Relaxed);
|
||||||
|
}
|
||||||
|
last_tick = now;
|
||||||
|
let silent = now.saturating_sub(BEAT.load(Ordering::Relaxed));
|
||||||
|
if silent >= HANG_AFTER.as_millis() as u64 {
|
||||||
|
if stalled_since.is_none() {
|
||||||
|
stalled_since = Some(now - silent);
|
||||||
|
let written = dump_path("hang").map(|p| (crate::platform::write_dump(&p), p));
|
||||||
|
match written {
|
||||||
|
Some((Ok(()), path)) => log(&format!("UI thread stopped answering for {}s; wrote {}", silent / 1000, path.display())),
|
||||||
|
Some((Err(e), _)) => log(&format!("UI thread stopped answering for {}s; no dump: {e}", silent / 1000)),
|
||||||
|
None => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if let Some(since) = stalled_since.take() {
|
||||||
|
log(&format!("UI thread answering again after {:.1}s", (now - since) as f64 / 1000.0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -5,8 +5,9 @@
|
||||||
//! server-relative source path; resuming after a restart asks the interface for
|
//! server-relative source path; resuming after a restart asks the interface for
|
||||||
//! a freshly signed URL.
|
//! a freshly signed URL.
|
||||||
|
|
||||||
use std::collections::HashMap;
|
use std::collections::{HashMap, HashSet};
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::sync::atomic::{AtomicU64, Ordering};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
|
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
|
|
@ -47,10 +48,19 @@ pub struct Item {
|
||||||
pub speed: u64,
|
pub speed: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The transfer task that currently owns a download (and its `.part` file).
|
||||||
|
struct Worker {
|
||||||
|
generation: u64,
|
||||||
|
cancel: watch::Sender<bool>,
|
||||||
|
/// Closes once the task has exited and let go of the file.
|
||||||
|
done: watch::Receiver<()>,
|
||||||
|
}
|
||||||
|
|
||||||
pub struct Downloads {
|
pub struct Downloads {
|
||||||
items: Mutex<Vec<Item>>,
|
items: Mutex<Vec<Item>>,
|
||||||
dir: Mutex<Option<PathBuf>>,
|
dir: Mutex<Option<PathBuf>>,
|
||||||
cancels: Mutex<HashMap<String, watch::Sender<bool>>>,
|
workers: Mutex<HashMap<String, Worker>>,
|
||||||
|
generation: AtomicU64,
|
||||||
permits: Arc<Semaphore>,
|
permits: Arc<Semaphore>,
|
||||||
client: reqwest::Client,
|
client: reqwest::Client,
|
||||||
}
|
}
|
||||||
|
|
@ -60,7 +70,8 @@ impl Default for Downloads {
|
||||||
Downloads {
|
Downloads {
|
||||||
items: Mutex::new(Vec::new()),
|
items: Mutex::new(Vec::new()),
|
||||||
dir: Mutex::new(None),
|
dir: Mutex::new(None),
|
||||||
cancels: Mutex::new(HashMap::new()),
|
workers: Mutex::new(HashMap::new()),
|
||||||
|
generation: AtomicU64::new(0),
|
||||||
permits: Arc::new(Semaphore::new(MAX_ACTIVE)),
|
permits: Arc::new(Semaphore::new(MAX_ACTIVE)),
|
||||||
client: reqwest::Client::builder()
|
client: reqwest::Client::builder()
|
||||||
.connect_timeout(Duration::from_secs(20))
|
.connect_timeout(Duration::from_secs(20))
|
||||||
|
|
@ -168,8 +179,11 @@ pub async fn download_start<R: Runtime>(app: AppHandle<R>, request: StartRequest
|
||||||
let mut meta = request.meta.clone();
|
let mut meta = request.meta.clone();
|
||||||
if let Value::Object(map) = &mut meta {
|
if let Value::Object(map) = &mut meta {
|
||||||
let mut local = serde_json::Map::new();
|
let mut local = serde_json::Map::new();
|
||||||
|
// Episodes share their season's folder, so artwork is named after the file it
|
||||||
|
// belongs to: one episode's still never replaces another's.
|
||||||
|
let stem = file_path.file_stem().and_then(|s| s.to_str()).map(sanitize).unwrap_or_else(|| sanitize(&request.id));
|
||||||
for (name, url) in &request.assets {
|
for (name, url) in &request.assets {
|
||||||
let target = folder.join(format!(".{}.jpg", sanitize(name)));
|
let target = folder.join(format!(".{stem}.{}.jpg", sanitize(name)));
|
||||||
if fetch_to(&state.client, url, &target).await.is_ok() {
|
if fetch_to(&state.client, url, &target).await.is_ok() {
|
||||||
local.insert(name.clone(), Value::String(target.display().to_string()));
|
local.insert(name.clone(), Value::String(target.display().to_string()));
|
||||||
}
|
}
|
||||||
|
|
@ -204,21 +218,48 @@ async fn fetch_to(client: &reqwest::Client, url: &str, target: &Path) -> Result<
|
||||||
tokio::fs::write(target, bytes).await.map_err(|e| e.to_string())
|
tokio::fs::write(target, bytes).await.map_err(|e| e.to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Starts a transfer task for `id`, taking over from any task still running for it:
|
||||||
|
/// that one is cancelled and the new one waits for it to exit before touching the file.
|
||||||
fn spawn<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
fn spawn<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
||||||
|
let state = app.state::<Downloads>();
|
||||||
|
let generation = state.generation.fetch_add(1, Ordering::Relaxed);
|
||||||
let (tx, rx) = watch::channel(false);
|
let (tx, rx) = watch::channel(false);
|
||||||
app.state::<Downloads>().cancels.lock().insert(id.clone(), tx);
|
let (done_tx, done_rx) = watch::channel(());
|
||||||
|
let previous = state.workers.lock().insert(id.clone(), Worker { generation, cancel: tx, done: done_rx });
|
||||||
|
let previous = previous.map(|w| {
|
||||||
|
let _ = w.cancel.send(true);
|
||||||
|
w.done
|
||||||
|
});
|
||||||
tauri::async_runtime::spawn(async move {
|
tauri::async_runtime::spawn(async move {
|
||||||
|
// Held until this task ends: whoever waits on `done` then knows the file is free.
|
||||||
|
let _done = done_tx;
|
||||||
|
let took_over = previous.is_some();
|
||||||
|
if let Some(done) = previous {
|
||||||
|
exited(done).await;
|
||||||
|
}
|
||||||
|
let stopped = rx.clone();
|
||||||
|
if *stopped.borrow() {
|
||||||
|
release(&app, &id, generation);
|
||||||
|
return;
|
||||||
|
}
|
||||||
let permits = app.state::<Downloads>().permits.clone();
|
let permits = app.state::<Downloads>().permits.clone();
|
||||||
let _permit = tokio::select! {
|
let _permit = tokio::select! {
|
||||||
p = permits.acquire_owned() => p,
|
p = permits.acquire_owned() => p,
|
||||||
_ = cancelled(rx.clone()) => return,
|
_ = cancelled(rx.clone()) => { release(&app, &id, generation); return; }
|
||||||
};
|
};
|
||||||
let result = transfer(&app, &id, &url, rx).await;
|
// The task it replaced may have finished the file just as it was stopped.
|
||||||
app.state::<Downloads>().cancels.lock().remove(&id);
|
let result = if took_over && finished_file(&app, &id) { Ok(true) } else { transfer(&app, &id, &url, rx).await };
|
||||||
|
release(&app, &id, generation);
|
||||||
|
// Once paused, removed or replaced, the outcome is no longer this task's to
|
||||||
|
// report, except a finished file, which is complete whatever happened since.
|
||||||
|
if *stopped.borrow() && !matches!(result, Ok(true)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
match result {
|
match result {
|
||||||
Ok(true) => {
|
Ok(true) => {
|
||||||
update(&app, &id, |i| {
|
update(&app, &id, |i| {
|
||||||
i.status = Status::Completed;
|
i.status = Status::Completed;
|
||||||
|
i.error = None;
|
||||||
i.speed = 0;
|
i.speed = 0;
|
||||||
i.received = i.total.max(i.received);
|
i.received = i.total.max(i.received);
|
||||||
});
|
});
|
||||||
|
|
@ -236,6 +277,30 @@ fn spawn<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Drops the worker entry, unless a newer task has taken it over.
|
||||||
|
fn release<R: Runtime>(app: &AppHandle<R>, id: &str, generation: u64) {
|
||||||
|
let state = app.state::<Downloads>();
|
||||||
|
let mut workers = state.workers.lock();
|
||||||
|
if workers.get(id).map(|w| w.generation) == Some(generation) {
|
||||||
|
workers.remove(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The download's file is in place and nothing is left to transfer.
|
||||||
|
fn finished_file<R: Runtime>(app: &AppHandle<R>, id: &str) -> bool {
|
||||||
|
let Some(path) = app.state::<Downloads>().items.lock().iter().find(|i| i.id == id).map(|i| PathBuf::from(&i.file_path)) else { return false };
|
||||||
|
path.exists() && !part_path(&path).exists()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn part_path(path: &Path) -> PathBuf {
|
||||||
|
path.with_extension(format!("{}.part", path.extension().and_then(|e| e.to_str()).unwrap_or("bin")))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Resolves once a worker task has exited.
|
||||||
|
async fn exited(mut done: watch::Receiver<()>) {
|
||||||
|
while done.changed().await.is_ok() {}
|
||||||
|
}
|
||||||
|
|
||||||
async fn cancelled(mut rx: watch::Receiver<bool>) {
|
async fn cancelled(mut rx: watch::Receiver<bool>) {
|
||||||
while !*rx.borrow() {
|
while !*rx.borrow() {
|
||||||
if rx.changed().await.is_err() {
|
if rx.changed().await.is_err() {
|
||||||
|
|
@ -248,10 +313,7 @@ async fn cancelled(mut rx: watch::Receiver<bool>) {
|
||||||
async fn transfer<R: Runtime>(app: &AppHandle<R>, id: &str, url: &str, rx: watch::Receiver<bool>) -> Result<bool, String> {
|
async fn transfer<R: Runtime>(app: &AppHandle<R>, id: &str, url: &str, rx: watch::Receiver<bool>) -> Result<bool, String> {
|
||||||
let Some(item) = app.state::<Downloads>().items.lock().iter().find(|i| i.id == id).cloned() else { return Ok(false) };
|
let Some(item) = app.state::<Downloads>().items.lock().iter().find(|i| i.id == id).cloned() else { return Ok(false) };
|
||||||
let final_path = PathBuf::from(&item.file_path);
|
let final_path = PathBuf::from(&item.file_path);
|
||||||
let part_path = final_path.with_extension(format!(
|
let part_path = part_path(&final_path);
|
||||||
"{}.part",
|
|
||||||
final_path.extension().and_then(|e| e.to_str()).unwrap_or("bin")
|
|
||||||
));
|
|
||||||
let existing = tokio::fs::metadata(&part_path).await.map(|m| m.len()).unwrap_or(0);
|
let existing = tokio::fs::metadata(&part_path).await.map(|m| m.len()).unwrap_or(0);
|
||||||
|
|
||||||
let client = app.state::<Downloads>().client.clone();
|
let client = app.state::<Downloads>().client.clone();
|
||||||
|
|
@ -259,7 +321,10 @@ async fn transfer<R: Runtime>(app: &AppHandle<R>, id: &str, url: &str, rx: watch
|
||||||
if existing > 0 {
|
if existing > 0 {
|
||||||
request = request.header("Range", format!("bytes={existing}-"));
|
request = request.header("Range", format!("bytes={existing}-"));
|
||||||
}
|
}
|
||||||
let response = request.send().await.map_err(|e| format!("Could not reach the server: {e}"))?;
|
let response = tokio::select! {
|
||||||
|
r = request.send() => r.map_err(|e| format!("Could not reach the server: {e}"))?,
|
||||||
|
_ = cancelled(rx.clone()) => return Ok(false),
|
||||||
|
};
|
||||||
let status = response.status();
|
let status = response.status();
|
||||||
if status.as_u16() == 401 || status.as_u16() == 403 {
|
if status.as_u16() == 401 || status.as_u16() == 403 {
|
||||||
return Err("The server does not allow downloads for this account.".into());
|
return Err("The server does not allow downloads for this account.".into());
|
||||||
|
|
@ -336,10 +401,14 @@ async fn transfer<R: Runtime>(app: &AppHandle<R>, id: &str, url: &str, rx: watch
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn cancel<R: Runtime>(app: &AppHandle<R>, id: &str) {
|
/// Stops the transfer for `id`, if one is running; the receiver closes once it has exited.
|
||||||
if let Some(tx) = app.state::<Downloads>().cancels.lock().remove(id) {
|
/// The entry stays until then, so a task started meanwhile knows to wait for it.
|
||||||
let _ = tx.send(true);
|
fn cancel<R: Runtime>(app: &AppHandle<R>, id: &str) -> Option<watch::Receiver<()>> {
|
||||||
}
|
let state = app.state::<Downloads>();
|
||||||
|
let workers = state.workers.lock();
|
||||||
|
let worker = workers.get(id)?;
|
||||||
|
let _ = worker.cancel.send(true);
|
||||||
|
Some(worker.done.clone())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
|
@ -356,7 +425,7 @@ pub fn download_pause<R: Runtime>(app: AppHandle<R>, id: String) {
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn download_resume<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
pub fn download_resume<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
||||||
cancel(&app, &id);
|
// `spawn` takes over from a transfer still winding down.
|
||||||
update(&app, &id, |i| {
|
update(&app, &id, |i| {
|
||||||
i.status = Status::Queued;
|
i.status = Status::Queued;
|
||||||
i.error = None;
|
i.error = None;
|
||||||
|
|
@ -366,7 +435,7 @@ pub fn download_resume<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn download_remove<R: Runtime>(app: AppHandle<R>, id: String, delete_files: bool) -> Result<(), String> {
|
pub async fn download_remove<R: Runtime>(app: AppHandle<R>, id: String, delete_files: bool) -> Result<(), String> {
|
||||||
cancel(&app, &id);
|
let running = cancel(&app, &id);
|
||||||
let removed = {
|
let removed = {
|
||||||
let state = app.state::<Downloads>();
|
let state = app.state::<Downloads>();
|
||||||
let mut items = state.items.lock();
|
let mut items = state.items.lock();
|
||||||
|
|
@ -375,14 +444,24 @@ pub async fn download_remove<R: Runtime>(app: AppHandle<R>, id: String, delete_f
|
||||||
};
|
};
|
||||||
if let (Some(item), true) = (removed, delete_files) {
|
if let (Some(item), true) = (removed, delete_files) {
|
||||||
let path = PathBuf::from(&item.file_path);
|
let path = PathBuf::from(&item.file_path);
|
||||||
// Give the cancelled transfer a moment to release its file handle.
|
// Let the cancelled transfer release its file handle first.
|
||||||
tokio::time::sleep(Duration::from_millis(150)).await;
|
if let Some(done) = running {
|
||||||
|
let _ = tokio::time::timeout(Duration::from_secs(10), exited(done)).await;
|
||||||
|
}
|
||||||
let _ = tokio::fs::remove_file(&path).await;
|
let _ = tokio::fs::remove_file(&path).await;
|
||||||
let part = path.with_extension(format!("{}.part", path.extension().and_then(|e| e.to_str()).unwrap_or("bin")));
|
let _ = tokio::fs::remove_file(part_path(&path)).await;
|
||||||
let _ = tokio::fs::remove_file(&part).await;
|
// Older downloads shared artwork between a season's episodes: keep what others still use.
|
||||||
|
let in_use: HashSet<String> = app
|
||||||
|
.state::<Downloads>()
|
||||||
|
.items
|
||||||
|
.lock()
|
||||||
|
.iter()
|
||||||
|
.filter_map(|i| i.meta.get("localAssets").and_then(Value::as_object))
|
||||||
|
.flat_map(|a| a.values().filter_map(Value::as_str).map(str::to_owned))
|
||||||
|
.collect();
|
||||||
if let Value::Object(assets) = &item.meta["localAssets"] {
|
if let Value::Object(assets) = &item.meta["localAssets"] {
|
||||||
for v in assets.values() {
|
for v in assets.values() {
|
||||||
if let Some(p) = v.as_str() {
|
if let Some(p) = v.as_str().filter(|p| !in_use.contains(*p)) {
|
||||||
let _ = tokio::fs::remove_file(p).await;
|
let _ = tokio::fs::remove_file(p).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
|
mod diagnostics;
|
||||||
mod downloads;
|
mod downloads;
|
||||||
|
mod mini;
|
||||||
mod mpv;
|
mod mpv;
|
||||||
mod platform;
|
mod platform;
|
||||||
mod player;
|
mod player;
|
||||||
|
|
@ -15,6 +17,8 @@ pub fn run() {
|
||||||
.plugin(tauri_plugin_process::init())
|
.plugin(tauri_plugin_process::init())
|
||||||
.plugin(
|
.plugin(
|
||||||
tauri_plugin_window_state::Builder::default()
|
tauri_plugin_window_state::Builder::default()
|
||||||
|
// The miniplayer window is always placed from the main window (mini.rs).
|
||||||
|
.with_denylist(&["mini"])
|
||||||
.with_state_flags(
|
.with_state_flags(
|
||||||
tauri_plugin_window_state::StateFlags::SIZE
|
tauri_plugin_window_state::StateFlags::SIZE
|
||||||
| tauri_plugin_window_state::StateFlags::POSITION
|
| tauri_plugin_window_state::StateFlags::POSITION
|
||||||
|
|
@ -23,15 +27,24 @@ pub fn run() {
|
||||||
.build(),
|
.build(),
|
||||||
)
|
)
|
||||||
.manage(player::PlayerState::default())
|
.manage(player::PlayerState::default())
|
||||||
|
.manage(mini::MiniState::default())
|
||||||
.manage(downloads::Downloads::default())
|
.manage(downloads::Downloads::default())
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
let handle = app.handle().clone();
|
let handle = app.handle().clone();
|
||||||
|
diagnostics::start(&handle);
|
||||||
downloads::restore(&handle);
|
downloads::restore(&handle);
|
||||||
if let Some(window) = app.get_webview_window("main") {
|
if let Some(window) = app.get_webview_window("main") {
|
||||||
let w = window.clone();
|
let w = window.clone();
|
||||||
window.on_window_event(move |event| {
|
window.on_window_event(move |event| {
|
||||||
|
// On the UI thread: places the miniplayer window without waiting on anything.
|
||||||
|
if let WindowEvent::Moved(_) | WindowEvent::Resized(_) | WindowEvent::ScaleFactorChanged { .. } = event {
|
||||||
|
mini::follow_main(&w);
|
||||||
|
}
|
||||||
if let WindowEvent::Resized(_) | WindowEvent::ScaleFactorChanged { .. } = event {
|
if let WindowEvent::Resized(_) | WindowEvent::ScaleFactorChanged { .. } = event {
|
||||||
player::on_resize(&w);
|
// Never on the UI thread: the player's locks may be held by a
|
||||||
|
// command that is itself waiting on the UI thread (see player.rs).
|
||||||
|
let w = w.clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || player::on_resize(&w));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -44,6 +57,7 @@ pub fn run() {
|
||||||
player::player_command,
|
player::player_command,
|
||||||
player::player_set,
|
player::player_set,
|
||||||
player::player_get,
|
player::player_get,
|
||||||
|
player::window_buttons,
|
||||||
system::secret_get,
|
system::secret_get,
|
||||||
system::secret_set,
|
system::secret_set,
|
||||||
system::secret_delete,
|
system::secret_delete,
|
||||||
|
|
@ -59,6 +73,13 @@ pub fn run() {
|
||||||
downloads::download_list,
|
downloads::download_list,
|
||||||
downloads::download_set_dir,
|
downloads::download_set_dir,
|
||||||
downloads::download_write_meta,
|
downloads::download_write_meta,
|
||||||
|
mini::mini_show,
|
||||||
|
mini::mini_hide,
|
||||||
|
mini::mini_drag_start,
|
||||||
|
mini::mini_drag,
|
||||||
|
mini::mini_snap,
|
||||||
|
diagnostics::debug_freeze_ui,
|
||||||
|
diagnostics::debug_crash,
|
||||||
])
|
])
|
||||||
.run(tauri::generate_context!())
|
.run(tauri::generate_context!())
|
||||||
.expect("error while running Kaleido");
|
.expect("error while running Kaleido");
|
||||||
|
|
|
||||||
334
src-tauri/src/mini.rs
Normal file
|
|
@ -0,0 +1,334 @@
|
||||||
|
//! The miniplayer as a window of its own (where `platform::SEPARATE_MINI`):
|
||||||
|
//! a small borderless window owned by the main one, which the video moves
|
||||||
|
//! into. Dragging moves the whole window, so video and controls move as one;
|
||||||
|
//! letting go glides it to a corner of the main window. Its page is
|
||||||
|
//! `mini.html` (src/mini/), which mirrors the player's state from the main
|
||||||
|
//! window and sends its buttons back (src/player/miniWindow.ts).
|
||||||
|
//!
|
||||||
|
//! Positions are physical screen pixels. Never hold `MiniState`'s locks while
|
||||||
|
//! calling a window getter: off the UI thread those wait for it (player.rs).
|
||||||
|
|
||||||
|
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use parking_lot::Mutex;
|
||||||
|
use tauri::{AppHandle, Manager, PhysicalPosition, PhysicalSize, Runtime, WebviewUrl, WebviewWindow, WebviewWindowBuilder, WindowEvent};
|
||||||
|
|
||||||
|
const LABEL: &str = "mini";
|
||||||
|
/// Logical pixels, as in the page's former in-window miniplayer (player.css).
|
||||||
|
const MARGIN: f64 = 24.0;
|
||||||
|
/// Top corners sit below the main window's navigation bar (64px).
|
||||||
|
const TOP_INSET: f64 = 64.0 + 12.0;
|
||||||
|
const SNAP: Duration = Duration::from_millis(260);
|
||||||
|
/// How far a flick carries the box when choosing a corner (ms of travel).
|
||||||
|
const FLICK_MS: f64 = 220.0;
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, PartialEq)]
|
||||||
|
enum Corner {
|
||||||
|
TopLeft,
|
||||||
|
TopRight,
|
||||||
|
BottomLeft,
|
||||||
|
BottomRight,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Corner {
|
||||||
|
fn parse(s: &str) -> Corner {
|
||||||
|
match s {
|
||||||
|
"tl" => Corner::TopLeft,
|
||||||
|
"tr" => Corner::TopRight,
|
||||||
|
"bl" => Corner::BottomLeft,
|
||||||
|
_ => Corner::BottomRight,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn name(self) -> &'static str {
|
||||||
|
match self {
|
||||||
|
Corner::TopLeft => "tl",
|
||||||
|
Corner::TopRight => "tr",
|
||||||
|
Corner::BottomLeft => "bl",
|
||||||
|
Corner::BottomRight => "br",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The main window's client area on screen and the miniplayer's size there.
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
struct Bounds {
|
||||||
|
left: i32,
|
||||||
|
top: i32,
|
||||||
|
width: i32,
|
||||||
|
height: i32,
|
||||||
|
mini_w: i32,
|
||||||
|
mini_h: i32,
|
||||||
|
scale: f64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Bounds {
|
||||||
|
fn of<R: Runtime>(main: &WebviewWindow<R>) -> Option<Bounds> {
|
||||||
|
let pos = main.inner_position().ok()?;
|
||||||
|
let size = main.inner_size().ok()?;
|
||||||
|
let scale = main.scale_factor().ok()?;
|
||||||
|
// As the page sized it: 26% of the window's width, 300 to 440 logical pixels, 16:9.
|
||||||
|
let w = (size.width as f64 / scale * 0.26).clamp(300.0, 440.0);
|
||||||
|
Some(Bounds {
|
||||||
|
left: pos.x,
|
||||||
|
top: pos.y,
|
||||||
|
width: size.width as i32,
|
||||||
|
height: size.height as i32,
|
||||||
|
mini_w: (w * scale).round() as i32,
|
||||||
|
mini_h: (w * 9.0 / 16.0 * scale).round() as i32,
|
||||||
|
scale,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn corner(&self, corner: Corner) -> (i32, i32) {
|
||||||
|
let margin = (MARGIN * self.scale).round() as i32;
|
||||||
|
let x = match corner {
|
||||||
|
Corner::TopLeft | Corner::BottomLeft => self.left + margin,
|
||||||
|
_ => self.left + self.width - self.mini_w - margin,
|
||||||
|
};
|
||||||
|
let y = match corner {
|
||||||
|
Corner::TopLeft | Corner::TopRight => self.top + (TOP_INSET * self.scale).round() as i32,
|
||||||
|
_ => self.top + self.height - self.mini_h - margin,
|
||||||
|
};
|
||||||
|
(x, y)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keeps the box inside the main window while it's dragged.
|
||||||
|
fn clamp(&self, x: i32, y: i32) -> (i32, i32) {
|
||||||
|
let x = x.clamp(self.left, (self.left + self.width - self.mini_w).max(self.left));
|
||||||
|
let y = y.clamp(self.top, (self.top + self.height - self.mini_h).max(self.top));
|
||||||
|
(x, y)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
struct Drag {
|
||||||
|
/// Where the window's visible area was when the drag began.
|
||||||
|
start: (i32, i32),
|
||||||
|
bounds: Bounds,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct MiniState {
|
||||||
|
corner: Mutex<Corner>,
|
||||||
|
/// From the window's outer position to its visible area: Windows keeps an
|
||||||
|
/// invisible resize border around shadowed windows. Positions here are of
|
||||||
|
/// the visible area; `place` converts.
|
||||||
|
frame: Mutex<(i32, i32)>,
|
||||||
|
drag: Mutex<Option<Drag>>,
|
||||||
|
visible: AtomicBool,
|
||||||
|
/// Dragged or gliding: the main window's moves don't re-place it meanwhile.
|
||||||
|
busy: AtomicBool,
|
||||||
|
/// Bumped to stop a glide that's under way.
|
||||||
|
glide: AtomicU64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for MiniState {
|
||||||
|
fn default() -> Self {
|
||||||
|
MiniState { corner: Mutex::new(Corner::BottomRight), frame: Mutex::new((0, 0)), drag: Mutex::new(None), visible: AtomicBool::new(false), busy: AtomicBool::new(false), glide: AtomicU64::new(0) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Moves the window so its visible area's top left is at `(x, y)`.
|
||||||
|
fn place<R: Runtime>(app: &AppHandle<R>, mini: &WebviewWindow<R>, (x, y): (i32, i32)) {
|
||||||
|
let (fx, fy) = *app.state::<MiniState>().frame.lock();
|
||||||
|
let _ = mini.set_position(PhysicalPosition::new(x - fx, y - fy));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Where the visible area is now (outer position plus the frame).
|
||||||
|
fn visible_position<R: Runtime>(app: &AppHandle<R>, mini: &WebviewWindow<R>) -> Result<(i32, i32), String> {
|
||||||
|
let pos = mini.outer_position().map_err(|e| e.to_string())?;
|
||||||
|
let (fx, fy) = *app.state::<MiniState>().frame.lock();
|
||||||
|
Ok((pos.x + fx, pos.y + fy))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main_window<R: Runtime>(app: &AppHandle<R>) -> Result<WebviewWindow<R>, String> {
|
||||||
|
app.get_webview_window("main").ok_or_else(|| "The main window is gone.".to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The miniplayer window, created hidden the first time (its page is small).
|
||||||
|
fn window<R: Runtime>(app: &AppHandle<R>) -> Result<WebviewWindow<R>, String> {
|
||||||
|
if let Some(w) = app.get_webview_window(LABEL) {
|
||||||
|
return Ok(w);
|
||||||
|
}
|
||||||
|
let main = main_window(app)?;
|
||||||
|
let w = WebviewWindowBuilder::new(app, LABEL, WebviewUrl::App("mini.html".into()))
|
||||||
|
.title("Kaleido")
|
||||||
|
.decorations(false)
|
||||||
|
.transparent(true)
|
||||||
|
.shadow(true)
|
||||||
|
.resizable(false)
|
||||||
|
.skip_taskbar(true)
|
||||||
|
.focused(false)
|
||||||
|
.visible(false)
|
||||||
|
.inner_size(440.0, 247.5)
|
||||||
|
// Owned by the main window: kept just above it, hidden when it's minimized.
|
||||||
|
.parent(&main)
|
||||||
|
.map_err(|e| e.to_string())?
|
||||||
|
.build()
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
if let Some(hwnd) = crate::platform::host_handle(&w) {
|
||||||
|
crate::platform::style_mini_window(hwnd);
|
||||||
|
}
|
||||||
|
// mpv draws at the window's size; resizing happens off the UI thread (player.rs).
|
||||||
|
let handle = app.clone();
|
||||||
|
w.on_window_event(move |event| {
|
||||||
|
if let WindowEvent::Resized(_) | WindowEvent::ScaleFactorChanged { .. } = event {
|
||||||
|
let handle = handle.clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
if let Some(main) = handle.get_webview_window("main") {
|
||||||
|
crate::player::on_resize(&main);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
Ok(w)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Creates the window ahead of its first use, so going to the miniplayer is instant.
|
||||||
|
pub fn prepare<R: Runtime>(app: &AppHandle<R>) {
|
||||||
|
if crate::platform::SEPARATE_MINI {
|
||||||
|
let _ = window(app);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn unsupported() -> Result<(), String> {
|
||||||
|
Err("The miniplayer window isn't used on this platform.".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Moves the video into the miniplayer window and shows it in `corner`.
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn mini_show<R: Runtime>(app: AppHandle<R>, corner: String) -> Result<(), String> {
|
||||||
|
if !crate::platform::SEPARATE_MINI {
|
||||||
|
return unsupported();
|
||||||
|
}
|
||||||
|
let state = app.state::<MiniState>();
|
||||||
|
let corner = Corner::parse(&corner);
|
||||||
|
*state.corner.lock() = corner;
|
||||||
|
state.glide.fetch_add(1, Ordering::SeqCst);
|
||||||
|
state.busy.store(false, Ordering::SeqCst);
|
||||||
|
let mini = window(&app)?;
|
||||||
|
let bounds = Bounds::of(&main_window(&app)?).ok_or("The main window has no size.")?;
|
||||||
|
let _ = mini.set_size(PhysicalSize::new(bounds.mini_w as u32, bounds.mini_h as u32));
|
||||||
|
if let (Ok(outer), Ok(inner)) = (mini.outer_position(), mini.inner_position()) {
|
||||||
|
*state.frame.lock() = (inner.x - outer.x, inner.y - outer.y);
|
||||||
|
}
|
||||||
|
place(&app, &mini, bounds.corner(corner));
|
||||||
|
let hwnd = crate::platform::host_handle(&mini).ok_or("The miniplayer window has no handle.")?;
|
||||||
|
crate::player::set_video_host(&app, Some(hwnd))?;
|
||||||
|
crate::platform::show_inactive(hwnd);
|
||||||
|
state.visible.store(true, Ordering::SeqCst);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Moves the video back to the main window and hides the miniplayer window.
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn mini_hide<R: Runtime>(app: AppHandle<R>) -> Result<(), String> {
|
||||||
|
if !crate::platform::SEPARATE_MINI {
|
||||||
|
return unsupported();
|
||||||
|
}
|
||||||
|
let state = app.state::<MiniState>();
|
||||||
|
state.visible.store(false, Ordering::SeqCst);
|
||||||
|
state.glide.fetch_add(1, Ordering::SeqCst);
|
||||||
|
*state.drag.lock() = None;
|
||||||
|
crate::player::set_video_host(&app, None)?;
|
||||||
|
if let Some(mini) = app.get_webview_window(LABEL) {
|
||||||
|
// Shown natively (without activation), so hidden natively too.
|
||||||
|
if let Some(hwnd) = crate::platform::host_handle(&mini) {
|
||||||
|
crate::platform::hide_window(hwnd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn mini_drag_start<R: Runtime>(app: AppHandle<R>) -> Result<(), String> {
|
||||||
|
let state = app.state::<MiniState>();
|
||||||
|
state.busy.store(true, Ordering::SeqCst);
|
||||||
|
state.glide.fetch_add(1, Ordering::SeqCst);
|
||||||
|
let mini = window(&app)?;
|
||||||
|
let bounds = Bounds::of(&main_window(&app)?).ok_or("The main window has no size.")?;
|
||||||
|
let start = visible_position(&app, &mini)?;
|
||||||
|
*state.drag.lock() = Some(Drag { start, bounds });
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Follows the pointer: `dx`/`dy` are logical pixels moved since the drag began.
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn mini_drag<R: Runtime>(app: AppHandle<R>, dx: f64, dy: f64) -> Result<(), String> {
|
||||||
|
let Some(drag) = *app.state::<MiniState>().drag.lock() else { return Ok(()) };
|
||||||
|
let b = drag.bounds;
|
||||||
|
let to = b.clamp(drag.start.0 + (dx * b.scale).round() as i32, drag.start.1 + (dy * b.scale).round() as i32);
|
||||||
|
if let Some(mini) = app.get_webview_window(LABEL) {
|
||||||
|
place(&app, &mini, to);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Ends a drag: glides to the corner nearest where the box is heading (a flick,
|
||||||
|
/// `vx`/`vy` in logical pixels per millisecond, carries it on) and returns it.
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn mini_snap<R: Runtime>(app: AppHandle<R>, vx: f64, vy: f64) -> Result<String, String> {
|
||||||
|
let state = app.state::<MiniState>();
|
||||||
|
let drag = state.drag.lock().take();
|
||||||
|
let mini = window(&app)?;
|
||||||
|
let b = match drag {
|
||||||
|
Some(d) => d.bounds,
|
||||||
|
None => Bounds::of(&main_window(&app)?).ok_or("The main window has no size.")?,
|
||||||
|
};
|
||||||
|
let from = visible_position(&app, &mini)?;
|
||||||
|
let cx = from.0 as f64 + b.mini_w as f64 / 2.0 + vx * FLICK_MS * b.scale;
|
||||||
|
let cy = from.1 as f64 + b.mini_h as f64 / 2.0 + vy * FLICK_MS * b.scale;
|
||||||
|
let left = cx < b.left as f64 + b.width as f64 / 2.0;
|
||||||
|
let top = cy < b.top as f64 + b.height as f64 / 2.0;
|
||||||
|
let corner = match (top, left) {
|
||||||
|
(true, true) => Corner::TopLeft,
|
||||||
|
(true, false) => Corner::TopRight,
|
||||||
|
(false, true) => Corner::BottomLeft,
|
||||||
|
(false, false) => Corner::BottomRight,
|
||||||
|
};
|
||||||
|
*state.corner.lock() = corner;
|
||||||
|
let to = b.corner(corner);
|
||||||
|
let generation = state.glide.fetch_add(1, Ordering::SeqCst) + 1;
|
||||||
|
|
||||||
|
// Ease out over SNAP, a step per display frame; stops if another drag starts.
|
||||||
|
let handle = app.clone();
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
let state = handle.state::<MiniState>();
|
||||||
|
let steps = (SNAP.as_millis() / 8) as i32;
|
||||||
|
let start = std::time::Instant::now();
|
||||||
|
for i in 1..=steps {
|
||||||
|
if state.glide.load(Ordering::SeqCst) != generation {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let t = (start.elapsed().as_secs_f64() / SNAP.as_secs_f64()).min(1.0);
|
||||||
|
let e = 1.0 - (1.0 - t).powi(3);
|
||||||
|
let x = from.0 + ((to.0 - from.0) as f64 * e).round() as i32;
|
||||||
|
let y = from.1 + ((to.1 - from.1) as f64 * e).round() as i32;
|
||||||
|
place(&handle, &mini, (x, y));
|
||||||
|
if t >= 1.0 || i == steps {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
std::thread::sleep(Duration::from_millis(8));
|
||||||
|
}
|
||||||
|
place(&handle, &mini, to);
|
||||||
|
if state.glide.load(Ordering::SeqCst) == generation {
|
||||||
|
state.busy.store(false, Ordering::SeqCst);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
Ok(corner.name().into())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keeps the miniplayer in its corner as the main window moves or resizes.
|
||||||
|
/// Runs on the UI thread (window events), where window getters answer directly.
|
||||||
|
pub fn follow_main<R: Runtime>(main: &WebviewWindow<R>) {
|
||||||
|
let app = main.app_handle();
|
||||||
|
let Some(state) = app.try_state::<MiniState>() else { return };
|
||||||
|
if !state.visible.load(Ordering::SeqCst) || state.busy.load(Ordering::SeqCst) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let Some(mini) = app.get_webview_window(LABEL) else { return };
|
||||||
|
let Some(bounds) = Bounds::of(main) else { return };
|
||||||
|
let corner = *state.corner.lock();
|
||||||
|
let _ = mini.set_size(PhysicalSize::new(bounds.mini_w as u32, bounds.mini_h as u32));
|
||||||
|
place(&app, &mini, bounds.corner(corner));
|
||||||
|
}
|
||||||
|
|
@ -192,6 +192,21 @@ impl Mpv {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The raw client handle, for platform code using parts of libmpv this
|
||||||
|
/// binding doesn't wrap (the render API).
|
||||||
|
pub fn raw_handle(&self) -> *mut c_void {
|
||||||
|
self.handle
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Looks up another libmpv function by name.
|
||||||
|
///
|
||||||
|
/// # Safety
|
||||||
|
/// `T` must be the function's exact pointer type.
|
||||||
|
pub unsafe fn symbol<T: Copy>(&self, name: &str) -> Option<T> {
|
||||||
|
let name = CString::new(name).ok()?;
|
||||||
|
self.api._lib.get::<T>(name.as_bytes_with_nul()).ok().map(|s| *s)
|
||||||
|
}
|
||||||
|
|
||||||
fn error(&self, code: c_int) -> String {
|
fn error(&self, code: c_int) -> String {
|
||||||
unsafe { CStr::from_ptr((self.api.error_string)(code)).to_string_lossy().into_owned() }
|
unsafe { CStr::from_ptr((self.api.error_string)(code)).to_string_lossy().into_owned() }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
//! Linux: render mpv through its render API (OpenGL) beneath the WebKitGTK
|
//! Linux: render mpv through its render API (OpenGL) beneath the WebKitGTK
|
||||||
//! view, then implement `VideoSurface` here.
|
//! view, then implement `VideoSurface` here (see macos.rs for the same idea).
|
||||||
//!
|
//!
|
||||||
//! Browsing, downloads, settings and updates already work here; only native
|
//! Browsing, downloads, settings and updates already work here; only native
|
||||||
//! video composition remains to be written.
|
//! video composition remains to be written.
|
||||||
|
|
@ -20,10 +20,18 @@ impl VideoSurface {
|
||||||
pub fn mpv_options(&self) -> Vec<(&'static str, String)> {
|
pub fn mpv_options(&self) -> Vec<(&'static str, String)> {
|
||||||
Vec::new()
|
Vec::new()
|
||||||
}
|
}
|
||||||
|
pub fn start(&mut self, _: &std::sync::Arc<Mpv>) -> Result<(), String> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
pub fn on_property(&mut self, _: &str, _: &serde_json::Value) {}
|
pub fn on_property(&mut self, _: &str, _: &serde_json::Value) {}
|
||||||
pub fn show(&mut self, _: bool) {}
|
pub fn show<R: Runtime>(&mut self, _: &WebviewWindow<R>, _: bool) {}
|
||||||
pub fn fit<R: Runtime>(&mut self, _: &WebviewWindow<R>, _: Option<&Mpv>) {}
|
pub fn fit<R: Runtime>(&mut self, _: &WebviewWindow<R>, _: Option<&Mpv>) {}
|
||||||
pub fn set_rect<R: Runtime>(&mut self, _: &WebviewWindow<R>, _: Option<&Mpv>, _: Option<(i32, i32, i32, i32)>) {}
|
pub fn set_rect<R: Runtime>(&mut self, _: &WebviewWindow<R>, _: Option<&Mpv>, _: Option<(i32, i32, i32, i32)>) {}
|
||||||
|
|
||||||
|
/// The video stays in the main window here (`SEPARATE_MINI` is false).
|
||||||
|
pub fn set_host(&mut self, _: Option<isize>, _: Option<&Mpv>) -> Result<(), String> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Not needed yet: the only GPU-specific tier (RTX Video) is Windows-only.
|
/// Not needed yet: the only GPU-specific tier (RTX Video) is Windows-only.
|
||||||
|
|
@ -31,7 +39,42 @@ pub fn gpu_names() -> Vec<String> {
|
||||||
Vec::new()
|
Vec::new()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn device_name() -> String {
|
||||||
|
std::fs::read_to_string("/etc/hostname").map(|h| h.trim().to_string()).ok().filter(|h| !h.is_empty()).unwrap_or_else(|| "Linux PC".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn os_version() -> String {
|
||||||
|
String::new()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_window_buttons<R: Runtime>(_: &WebviewWindow<R>, _: bool) {}
|
||||||
|
|
||||||
pub fn hold_awake(rx: std::sync::mpsc::Receiver<()>) {
|
pub fn hold_awake(rx: std::sync::mpsc::Receiver<()>) {
|
||||||
// TODO(Linux): org.freedesktop.ScreenSaver.Inhibit over D-Bus.
|
// TODO(Linux): org.freedesktop.ScreenSaver.Inhibit over D-Bus.
|
||||||
let _ = rx.recv();
|
let _ = rx.recv();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// —— Diagnostics (see diagnostics.rs) ————————————————————————————————————
|
||||||
|
|
||||||
|
/// Hang dumps are Windows-only for now; the watchdog still logs the stall.
|
||||||
|
pub fn write_dump(_: &std::path::Path) -> Result<(), String> {
|
||||||
|
Err("dumps are not written on this platform".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Crashes are left to the system's crash reporter here.
|
||||||
|
pub fn install_crash_handler() {}
|
||||||
|
|
||||||
|
// —— Miniplayer window (see mini.rs) ——————————————————————————————————————
|
||||||
|
|
||||||
|
/// The miniplayer stays inside the main window's page here (PlayerOverlay).
|
||||||
|
pub const SEPARATE_MINI: bool = false;
|
||||||
|
|
||||||
|
pub fn host_handle<R: Runtime>(_: &WebviewWindow<R>) -> Option<isize> {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn style_mini_window(_: isize) {}
|
||||||
|
|
||||||
|
pub fn show_inactive(_: isize) {}
|
||||||
|
|
||||||
|
pub fn hide_window(_: isize) {}
|
||||||
|
|
|
||||||
|
|
@ -1,37 +1,568 @@
|
||||||
//! macOS: render mpv through its render API (libplacebo) into a CAMetalLayer
|
//! macOS: libmpv's render API (OpenGL) draws into a CAOpenGLLayer hosted by a
|
||||||
//! placed beneath the WKWebView, then implement `VideoSurface` here.
|
//! view placed beneath the WKWebView; libmpv names, power assertions, window
|
||||||
|
//! buttons and host details.
|
||||||
//!
|
//!
|
||||||
//! Browsing, downloads, settings and updates already work here; only native
|
//! OpenGL is deprecated on macOS but still supported (on Metal); it is the
|
||||||
//! video composition remains to be written.
|
//! render API libmpv offers, and what IINA and other mpv front ends use.
|
||||||
|
#![allow(deprecated)]
|
||||||
|
|
||||||
|
use std::ffi::{c_char, c_int, c_void, CStr};
|
||||||
|
use std::ptr::{self, NonNull};
|
||||||
|
use std::sync::mpsc::{sync_channel, Receiver, SyncSender};
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use objc2::rc::Retained;
|
||||||
|
use objc2::{define_class, msg_send, AllocAnyThread, DefinedClass, MainThreadMarker};
|
||||||
|
use objc2_app_kit::{NSAutoresizingMaskOptions, NSView, NSWindow, NSWindowButton, NSWindowOrderingMode};
|
||||||
|
use objc2_core_foundation::{CFRetained, CFTimeInterval};
|
||||||
|
use objc2_core_graphics::{kCGColorSpaceITUR_2100_PQ, kCGColorSpaceSRGB, CGColorSpace};
|
||||||
|
use objc2_core_video::CVTimeStamp;
|
||||||
|
use objc2_foundation::{NSNumber, NSPoint, NSRect, NSSize, NSString};
|
||||||
|
use objc2_open_gl::*;
|
||||||
|
use objc2_quartz_core::{CALayer, CAOpenGLLayer, CATransaction};
|
||||||
|
use parking_lot::Mutex;
|
||||||
use tauri::{Runtime, WebviewWindow};
|
use tauri::{Runtime, WebviewWindow};
|
||||||
|
|
||||||
use crate::mpv::Mpv;
|
use crate::mpv::Mpv;
|
||||||
|
|
||||||
pub const SURFACE_PROPERTIES: &[&str] = &[];
|
// —— OpenGL ————————————————————————————————————————————————————————————
|
||||||
pub const MPV_LIBRARIES: &[&str] = &["libmpv.2.dylib", "libmpv.dylib"];
|
|
||||||
|
|
||||||
pub struct VideoSurface;
|
const GL_COLOR_BUFFER_BIT: u32 = 0x4000;
|
||||||
|
const GL_VIEWPORT: u32 = 0x0BA2;
|
||||||
|
const GL_DRAW_FRAMEBUFFER_BINDING: u32 = 0x8CA6;
|
||||||
|
const GL_RGBA16F: c_int = 0x881A;
|
||||||
|
const RTLD_LAZY: c_int = 0x1;
|
||||||
|
|
||||||
impl VideoSurface {
|
#[link(name = "OpenGL", kind = "framework")]
|
||||||
pub fn create<R: Runtime>(_: &WebviewWindow<R>) -> Result<VideoSurface, String> {
|
extern "C" {
|
||||||
Err("Video playback is not available on this platform yet.".into())
|
fn glGetIntegerv(pname: u32, data: *mut i32);
|
||||||
}
|
fn glClearColor(r: f32, g: f32, b: f32, a: f32);
|
||||||
pub fn mpv_options(&self) -> Vec<(&'static str, String)> {
|
fn glClear(mask: u32);
|
||||||
Vec::new()
|
fn glFlush();
|
||||||
}
|
|
||||||
pub fn on_property(&mut self, _: &str, _: &serde_json::Value) {}
|
|
||||||
pub fn show(&mut self, _: bool) {}
|
|
||||||
pub fn fit<R: Runtime>(&mut self, _: &WebviewWindow<R>, _: Option<&Mpv>) {}
|
|
||||||
pub fn set_rect<R: Runtime>(&mut self, _: &WebviewWindow<R>, _: Option<&Mpv>, _: Option<(i32, i32, i32, i32)>) {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Not needed yet: the only GPU-specific tier (RTX Video) is Windows-only.
|
extern "C" {
|
||||||
|
fn dlopen(path: *const c_char, mode: c_int) -> *mut c_void;
|
||||||
|
fn dlsym(handle: *mut c_void, symbol: *const c_char) -> *mut c_void;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// mpv resolves OpenGL functions through this (`ctx` is OpenGL.framework's handle).
|
||||||
|
extern "C" fn get_proc_address(ctx: *mut c_void, name: *const c_char) -> *mut c_void {
|
||||||
|
unsafe { dlsym(ctx, name) }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A 3.2 core context; 16-bit float colour (needed for HDR) when the renderer
|
||||||
|
/// offers it. Returns whether it got float colour.
|
||||||
|
unsafe fn create_gl_context() -> Result<(CGLContextObj, CGLPixelFormatObj, bool), String> {
|
||||||
|
let base = [
|
||||||
|
CGLPixelFormatAttribute::CGLPFAOpenGLProfile.0,
|
||||||
|
CGLOpenGLProfile::CGLOGLPVersion_3_2_Core.0,
|
||||||
|
CGLPixelFormatAttribute::CGLPFAAccelerated.0,
|
||||||
|
CGLPixelFormatAttribute::CGLPFADoubleBuffer.0,
|
||||||
|
CGLPixelFormatAttribute::CGLPFAAllowOfflineRenderers.0,
|
||||||
|
CGLPixelFormatAttribute::CGLPFASupportsAutomaticGraphicsSwitching.0,
|
||||||
|
];
|
||||||
|
let deep = [CGLPixelFormatAttribute::CGLPFAColorSize.0, 64, CGLPixelFormatAttribute::CGLPFAColorFloat.0];
|
||||||
|
for extra in [&deep[..], &[]] {
|
||||||
|
let mut attrs: Vec<CGLPixelFormatAttribute> = base.iter().chain(extra).map(|&a| CGLPixelFormatAttribute(a)).collect();
|
||||||
|
attrs.push(CGLPixelFormatAttribute(0));
|
||||||
|
let mut pf: CGLPixelFormatObj = ptr::null_mut();
|
||||||
|
let mut count = 0;
|
||||||
|
CGLChoosePixelFormat(NonNull::new_unchecked(attrs.as_mut_ptr()), NonNull::from(&mut pf), NonNull::from(&mut count));
|
||||||
|
if pf.is_null() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let mut ctx: CGLContextObj = ptr::null_mut();
|
||||||
|
CGLCreateContext(pf, ptr::null_mut(), NonNull::from(&mut ctx));
|
||||||
|
if !ctx.is_null() {
|
||||||
|
return Ok((ctx, pf, !extra.is_empty()));
|
||||||
|
}
|
||||||
|
CGLReleasePixelFormat(pf);
|
||||||
|
}
|
||||||
|
Err("OpenGL is unavailable, so video can't be shown.".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
// —— mpv render API ————————————————————————————————————————————————————
|
||||||
|
|
||||||
|
const RENDER_PARAM_API_TYPE: c_int = 1;
|
||||||
|
const RENDER_PARAM_OPENGL_INIT_PARAMS: c_int = 2;
|
||||||
|
const RENDER_PARAM_OPENGL_FBO: c_int = 3;
|
||||||
|
const RENDER_PARAM_FLIP_Y: c_int = 4;
|
||||||
|
const RENDER_UPDATE_FRAME: u64 = 1;
|
||||||
|
|
||||||
|
#[repr(C)]
|
||||||
|
struct RenderParam {
|
||||||
|
kind: c_int,
|
||||||
|
data: *mut c_void,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[repr(C)]
|
||||||
|
struct OpenGlInitParams {
|
||||||
|
get_proc_address: extern "C" fn(*mut c_void, *const c_char) -> *mut c_void,
|
||||||
|
get_proc_address_ctx: *mut c_void,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[repr(C)]
|
||||||
|
struct OpenGlFbo {
|
||||||
|
fbo: c_int,
|
||||||
|
w: c_int,
|
||||||
|
h: c_int,
|
||||||
|
internal_format: c_int,
|
||||||
|
}
|
||||||
|
|
||||||
|
type RenderCtx = *mut c_void;
|
||||||
|
|
||||||
|
/// An mpv render context and the functions that drive it. Every call happens
|
||||||
|
/// with the layer's OpenGL context locked and current, as libmpv requires.
|
||||||
|
struct Render {
|
||||||
|
ctx: RenderCtx,
|
||||||
|
render: unsafe extern "C" fn(RenderCtx, *mut RenderParam) -> c_int,
|
||||||
|
update: unsafe extern "C" fn(RenderCtx) -> u64,
|
||||||
|
report_swap: unsafe extern "C" fn(RenderCtx),
|
||||||
|
}
|
||||||
|
|
||||||
|
unsafe impl Send for Render {}
|
||||||
|
unsafe impl Sync for Render {}
|
||||||
|
|
||||||
|
/// libmpv calls this from its own threads when a frame is ready; it may not
|
||||||
|
/// call back into libmpv, so it only wakes the render thread.
|
||||||
|
extern "C" fn on_update(wake: *mut c_void) {
|
||||||
|
let wake = unsafe { &*(wake as *const SyncSender<()>) };
|
||||||
|
let _ = wake.try_send(());
|
||||||
|
}
|
||||||
|
|
||||||
|
fn srgb() -> Option<CFRetained<CGColorSpace>> {
|
||||||
|
CGColorSpace::with_name(Some(unsafe { kCGColorSpaceSRGB }))
|
||||||
|
}
|
||||||
|
|
||||||
|
// —— The video layer ———————————————————————————————————————————————————
|
||||||
|
|
||||||
|
struct LayerIvars {
|
||||||
|
cgl: CGLContextObj,
|
||||||
|
pixel_format: CGLPixelFormatObj,
|
||||||
|
/// The framebuffer holds 16-bit floats (so mpv needn't dither to 8 bits).
|
||||||
|
float: bool,
|
||||||
|
render: Mutex<Option<Arc<Render>>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
define_class!(
|
||||||
|
#[unsafe(super(CAOpenGLLayer, CALayer))]
|
||||||
|
#[name = "KaleidoVideoLayer"]
|
||||||
|
#[ivars = LayerIvars]
|
||||||
|
struct VideoLayer;
|
||||||
|
|
||||||
|
impl VideoLayer {
|
||||||
|
#[unsafe(method(copyCGLPixelFormatForDisplayMask:))]
|
||||||
|
fn copy_pixel_format(&self, _mask: u32) -> CGLPixelFormatObj {
|
||||||
|
unsafe { CGLRetainPixelFormat(self.ivars().pixel_format) }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[unsafe(method(copyCGLContextForPixelFormat:))]
|
||||||
|
fn copy_context(&self, _pf: CGLPixelFormatObj) -> CGLContextObj {
|
||||||
|
unsafe { CGLRetainContext(self.ivars().cgl) }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[unsafe(method(releaseCGLContext:))]
|
||||||
|
fn release_context(&self, ctx: CGLContextObj) {
|
||||||
|
unsafe { CGLReleaseContext(ctx) }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[unsafe(method(canDrawInCGLContext:pixelFormat:forLayerTime:displayTime:))]
|
||||||
|
fn can_draw(&self, _ctx: CGLContextObj, _pf: CGLPixelFormatObj, _t: CFTimeInterval, _ts: *const CVTimeStamp) -> bool {
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
#[unsafe(method(drawInCGLContext:pixelFormat:forLayerTime:displayTime:))]
|
||||||
|
fn draw(&self, ctx: CGLContextObj, _pf: CGLPixelFormatObj, _t: CFTimeInterval, _ts: *const CVTimeStamp) {
|
||||||
|
let render = self.ivars().render.lock().clone();
|
||||||
|
unsafe {
|
||||||
|
CGLLockContext(ctx);
|
||||||
|
CGLSetCurrentContext(ctx);
|
||||||
|
match render {
|
||||||
|
Some(r) => {
|
||||||
|
let mut fbo = 0;
|
||||||
|
let mut viewport = [0i32; 4];
|
||||||
|
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &mut fbo);
|
||||||
|
glGetIntegerv(GL_VIEWPORT, viewport.as_mut_ptr());
|
||||||
|
let mut target = OpenGlFbo { fbo, w: viewport[2], h: viewport[3], internal_format: if self.ivars().float { GL_RGBA16F } else { 0 } };
|
||||||
|
let mut flip: c_int = 1;
|
||||||
|
let mut params = [
|
||||||
|
RenderParam { kind: RENDER_PARAM_OPENGL_FBO, data: &mut target as *mut _ as *mut c_void },
|
||||||
|
RenderParam { kind: RENDER_PARAM_FLIP_Y, data: &mut flip as *mut _ as *mut c_void },
|
||||||
|
RenderParam { kind: 0, data: ptr::null_mut() },
|
||||||
|
];
|
||||||
|
(r.render)(r.ctx, params.as_mut_ptr());
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
glClearColor(0.0, 0.0, 0.0, 1.0);
|
||||||
|
glClear(GL_COLOR_BUFFER_BIT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
glFlush();
|
||||||
|
CGLUnlockContext(ctx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
// The layer is drawn from the render thread as well as by Core Animation;
|
||||||
|
// its mutable state is behind a mutex and the CGL context lock.
|
||||||
|
unsafe impl Send for VideoLayer {}
|
||||||
|
unsafe impl Sync for VideoLayer {}
|
||||||
|
|
||||||
|
impl VideoLayer {
|
||||||
|
fn new(cgl: CGLContextObj, pixel_format: CGLPixelFormatObj, float: bool) -> Retained<VideoLayer> {
|
||||||
|
let this = VideoLayer::alloc().set_ivars(LayerIvars { cgl, pixel_format, float, render: Mutex::new(None) });
|
||||||
|
let layer: Retained<VideoLayer> = unsafe { msg_send![super(this), init] };
|
||||||
|
layer.setAsynchronous(false);
|
||||||
|
// A float framebuffer without a colour space would be read as linear
|
||||||
|
// light, washing SDR out; mpv writes gamma-encoded SDR, as for Windows.
|
||||||
|
layer.setColorspace(srgb().as_deref());
|
||||||
|
layer.setNeedsDisplayOnBoundsChange(true);
|
||||||
|
layer.setOpaque(true);
|
||||||
|
layer
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Redraws whenever mpv has a new frame. Drawing off the main thread needs an
|
||||||
|
/// explicit flush for Core Animation to pick the frame up.
|
||||||
|
fn render_loop(layer: Retained<VideoLayer>, wake: Receiver<()>) {
|
||||||
|
let cgl = layer.ivars().cgl;
|
||||||
|
while wake.recv().is_ok() {
|
||||||
|
let Some(render) = layer.ivars().render.lock().clone() else { continue };
|
||||||
|
let flags = unsafe {
|
||||||
|
CGLLockContext(cgl);
|
||||||
|
CGLSetCurrentContext(cgl);
|
||||||
|
let flags = (render.update)(render.ctx);
|
||||||
|
CGLUnlockContext(cgl);
|
||||||
|
flags
|
||||||
|
};
|
||||||
|
if flags & RENDER_UPDATE_FRAME != 0 {
|
||||||
|
layer.display();
|
||||||
|
CATransaction::flush();
|
||||||
|
unsafe {
|
||||||
|
CGLLockContext(cgl);
|
||||||
|
CGLSetCurrentContext(cgl);
|
||||||
|
(render.report_swap)(render.ctx);
|
||||||
|
CGLUnlockContext(cgl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// —— VideoSurface ——————————————————————————————————————————————————————
|
||||||
|
|
||||||
|
/// The view is only touched on the main thread; the layer is also drawn by the
|
||||||
|
/// render thread and reconfigured for HDR inside explicit transactions.
|
||||||
|
struct Ui {
|
||||||
|
view: Retained<NSView>,
|
||||||
|
layer: Retained<VideoLayer>,
|
||||||
|
}
|
||||||
|
|
||||||
|
unsafe impl Send for Ui {}
|
||||||
|
unsafe impl Sync for Ui {}
|
||||||
|
|
||||||
|
pub struct VideoSurface {
|
||||||
|
ui: Arc<Ui>,
|
||||||
|
wake: &'static SyncSender<()>,
|
||||||
|
wake_rx: Option<Receiver<()>>,
|
||||||
|
/// Where the video is drawn, in physical pixels; `None` fills the window.
|
||||||
|
rect: Option<(i32, i32, i32, i32)>,
|
||||||
|
mpv: Option<Arc<Mpv>>,
|
||||||
|
/// HDR passthrough is on (the `target-colorspace-hint` option, as on Windows).
|
||||||
|
passthrough: bool,
|
||||||
|
/// The layer is showing HDR in extended dynamic range.
|
||||||
|
edr: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Runs `f` on the main thread with the window's web view and waits for it.
|
||||||
|
fn on_main<R: Runtime, T: Send + 'static>(
|
||||||
|
window: &WebviewWindow<R>,
|
||||||
|
f: impl FnOnce(&NSView, &NSWindow) -> T + Send + 'static,
|
||||||
|
) -> Result<T, String> {
|
||||||
|
let (tx, rx) = std::sync::mpsc::channel();
|
||||||
|
window
|
||||||
|
.with_webview(move |webview| unsafe {
|
||||||
|
let view = &*(webview.inner() as *const NSView);
|
||||||
|
let window = &*(webview.ns_window() as *const NSWindow);
|
||||||
|
let _ = tx.send(f(view, window));
|
||||||
|
})
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
rx.recv().map_err(|e| e.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Places the video view: the whole web view, or a rectangle of it given in
|
||||||
|
/// physical pixels from the top left (the web page's coordinates).
|
||||||
|
fn place(ui: &Ui, webview: &NSView, window: &NSWindow, rect: Option<(i32, i32, i32, i32)>) {
|
||||||
|
let bounds = webview.frame();
|
||||||
|
let scale = window.backingScaleFactor();
|
||||||
|
let frame = match rect {
|
||||||
|
None => bounds,
|
||||||
|
Some((x, y, w, h)) => {
|
||||||
|
let (x, y, w, h) = (x as f64 / scale, y as f64 / scale, (w.max(16)) as f64 / scale, (h.max(16)) as f64 / scale);
|
||||||
|
let flipped = unsafe { webview.superview() }.is_some_and(|s| s.isFlipped());
|
||||||
|
let top = if flipped { bounds.origin.y + y } else { bounds.origin.y + bounds.size.height - y - h };
|
||||||
|
NSRect::new(NSPoint::new(bounds.origin.x + x, top), NSSize::new(w, h))
|
||||||
|
}
|
||||||
|
};
|
||||||
|
ui.view.setFrame(frame);
|
||||||
|
ui.view.setAutoresizingMask(if rect.is_none() {
|
||||||
|
NSAutoresizingMaskOptions::ViewWidthSizable | NSAutoresizingMaskOptions::ViewHeightSizable
|
||||||
|
} else {
|
||||||
|
NSAutoresizingMaskOptions::ViewNotSizable
|
||||||
|
});
|
||||||
|
if ui.layer.contentsScale() != scale {
|
||||||
|
ui.layer.setContentsScale(scale);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl VideoSurface {
|
||||||
|
pub fn create<R: Runtime>(window: &WebviewWindow<R>) -> Result<VideoSurface, String> {
|
||||||
|
let (cgl, pixel_format, float) = unsafe { create_gl_context()? };
|
||||||
|
let layer = VideoLayer::new(cgl, pixel_format, float);
|
||||||
|
let ui = on_main(window, move |webview, window| unsafe {
|
||||||
|
let view = NSView::initWithFrame(MainThreadMarker::new_unchecked().alloc(), webview.frame());
|
||||||
|
// Layer-hosting: set the layer before asking for one.
|
||||||
|
view.setLayer(Some(&layer));
|
||||||
|
view.setWantsLayer(true);
|
||||||
|
view.setHidden(true);
|
||||||
|
// Let the video show through wherever the page is transparent.
|
||||||
|
let no = NSNumber::new_bool(false);
|
||||||
|
let _: () = msg_send![webview, setValue: &*no, forKey: &*NSString::from_str("drawsBackground")];
|
||||||
|
if let Some(parent) = webview.superview() {
|
||||||
|
parent.addSubview_positioned_relativeTo(&view, NSWindowOrderingMode::Below, Some(webview));
|
||||||
|
}
|
||||||
|
let ui = Ui { view, layer };
|
||||||
|
place(&ui, webview, window, None);
|
||||||
|
ui
|
||||||
|
})?;
|
||||||
|
let (wake, wake_rx) = sync_channel::<()>(1);
|
||||||
|
Ok(VideoSurface {
|
||||||
|
ui: Arc::new(ui),
|
||||||
|
wake: Box::leak(Box::new(wake)),
|
||||||
|
wake_rx: Some(wake_rx),
|
||||||
|
rect: None,
|
||||||
|
mpv: None,
|
||||||
|
passthrough: false,
|
||||||
|
edr: false,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// mpv renders through the render API (`vo=libmpv`). Its window is forced
|
||||||
|
/// open only once the render context exists (`start`).
|
||||||
|
pub fn mpv_options(&self) -> Vec<(&'static str, String)> {
|
||||||
|
vec![("vo", "libmpv".into()), ("force-window", "no".into())]
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Creates mpv's render context on the layer's OpenGL context and starts
|
||||||
|
/// the render thread. Runs once, after `mpv_initialize`.
|
||||||
|
pub fn start(&mut self, mpv: &Arc<Mpv>) -> Result<(), String> {
|
||||||
|
let Some(wake_rx) = self.wake_rx.take() else { return Ok(()) };
|
||||||
|
let hint = mpv.get_property("target-colorspace-hint").unwrap_or_default();
|
||||||
|
self.passthrough = (hint == serde_json::Value::Bool(true) || hint == "yes") && self.ui.layer.ivars().float;
|
||||||
|
self.mpv = Some(mpv.clone());
|
||||||
|
type Create = unsafe extern "C" fn(*mut RenderCtx, *mut c_void, *mut RenderParam) -> c_int;
|
||||||
|
type SetCallback = unsafe extern "C" fn(RenderCtx, extern "C" fn(*mut c_void), *mut c_void);
|
||||||
|
unsafe {
|
||||||
|
let missing = |name: &str| format!("libmpv is missing {name}");
|
||||||
|
let create: Create = mpv.symbol("mpv_render_context_create").ok_or_else(|| missing("mpv_render_context_create"))?;
|
||||||
|
let set_callback: SetCallback = mpv.symbol("mpv_render_context_set_update_callback").ok_or_else(|| missing("the render API"))?;
|
||||||
|
let render = mpv.symbol("mpv_render_context_render").ok_or_else(|| missing("the render API"))?;
|
||||||
|
let update = mpv.symbol("mpv_render_context_update").ok_or_else(|| missing("the render API"))?;
|
||||||
|
let report_swap = mpv.symbol("mpv_render_context_report_swap").ok_or_else(|| missing("the render API"))?;
|
||||||
|
|
||||||
|
let gl = dlopen(c"/System/Library/Frameworks/OpenGL.framework/OpenGL".as_ptr(), RTLD_LAZY);
|
||||||
|
let mut init = OpenGlInitParams { get_proc_address, get_proc_address_ctx: gl };
|
||||||
|
let mut params = [
|
||||||
|
RenderParam { kind: RENDER_PARAM_API_TYPE, data: c"opengl".as_ptr() as *mut c_void },
|
||||||
|
RenderParam { kind: RENDER_PARAM_OPENGL_INIT_PARAMS, data: &mut init as *mut _ as *mut c_void },
|
||||||
|
RenderParam { kind: 0, data: ptr::null_mut() },
|
||||||
|
];
|
||||||
|
let cgl = self.ui.layer.ivars().cgl;
|
||||||
|
let mut ctx: RenderCtx = ptr::null_mut();
|
||||||
|
CGLLockContext(cgl);
|
||||||
|
CGLSetCurrentContext(cgl);
|
||||||
|
let code = create(&mut ctx, mpv.raw_handle(), params.as_mut_ptr());
|
||||||
|
CGLUnlockContext(cgl);
|
||||||
|
if code < 0 || ctx.is_null() {
|
||||||
|
return Err(format!("The video renderer couldn't start ({code})."));
|
||||||
|
}
|
||||||
|
set_callback(ctx, on_update, self.wake as *const SyncSender<()> as *mut c_void);
|
||||||
|
*self.ui.layer.ivars().render.lock() = Some(Arc::new(Render { ctx, render, update, report_swap }));
|
||||||
|
}
|
||||||
|
let layer = self.ui.layer.clone();
|
||||||
|
std::thread::Builder::new()
|
||||||
|
.name("mpv-render".into())
|
||||||
|
.spawn(move || render_loop(layer, wake_rx))
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
mpv.set_property("force-window", &serde_json::Value::Bool(true))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// HDR passthrough: for PQ or HLG video, mpv outputs PQ (BT.2020) instead of
|
||||||
|
/// tone-mapping to SDR, and the layer shows it in extended dynamic range, so
|
||||||
|
/// macOS maps it to the display's HDR headroom. SDR video is shown as sRGB.
|
||||||
|
pub fn on_property(&mut self, name: &str, value: &serde_json::Value) {
|
||||||
|
if name != "video-params/gamma" {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let edr = self.passthrough && matches!(value.as_str(), Some("pq" | "hlg"));
|
||||||
|
if edr == self.edr {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
self.edr = edr;
|
||||||
|
if let Some(mpv) = &self.mpv {
|
||||||
|
let target = |v: &str| serde_json::Value::String(v.into());
|
||||||
|
let (trc, prim) = if edr { ("pq", "bt.2020") } else { ("auto", "auto") };
|
||||||
|
let _ = mpv.set_property("target-trc", &target(trc));
|
||||||
|
let _ = mpv.set_property("target-prim", &target(prim));
|
||||||
|
}
|
||||||
|
// Layer properties may change off the main thread inside a transaction.
|
||||||
|
let layer = &self.ui.layer;
|
||||||
|
CATransaction::begin();
|
||||||
|
layer.setWantsExtendedDynamicRangeContent(edr);
|
||||||
|
let space = if edr { CGColorSpace::with_name(Some(unsafe { kCGColorSpaceITUR_2100_PQ })) } else { srgb() };
|
||||||
|
layer.setColorspace(space.as_deref());
|
||||||
|
CATransaction::commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn show<R: Runtime>(&mut self, window: &WebviewWindow<R>, visible: bool) {
|
||||||
|
let ui = self.ui.clone();
|
||||||
|
let _ = window.run_on_main_thread(move || {
|
||||||
|
ui.view.setHidden(!visible);
|
||||||
|
if visible {
|
||||||
|
ui.layer.setNeedsDisplay();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keeps the video view matched to the web view, or to the miniplayer
|
||||||
|
/// rectangle when one is set.
|
||||||
|
pub fn fit<R: Runtime>(&mut self, window: &WebviewWindow<R>, _: Option<&Mpv>) {
|
||||||
|
let ui = self.ui.clone();
|
||||||
|
let rect = self.rect;
|
||||||
|
let _ = window.with_webview(move |webview| unsafe {
|
||||||
|
let view = &*(webview.inner() as *const NSView);
|
||||||
|
let window = &*(webview.ns_window() as *const NSWindow);
|
||||||
|
place(&ui, view, window, rect);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_rect<R: Runtime>(&mut self, window: &WebviewWindow<R>, mpv: Option<&Mpv>, rect: Option<(i32, i32, i32, i32)>) {
|
||||||
|
self.rect = rect;
|
||||||
|
self.fit(window, mpv);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The video stays in the main window here (`SEPARATE_MINI` is false).
|
||||||
|
pub fn set_host(&mut self, _: Option<isize>, _: Option<&Mpv>) -> Result<(), String> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// mpv properties the surface needs to observe.
|
||||||
|
pub const SURFACE_PROPERTIES: &[&str] = &["video-params/gamma"];
|
||||||
|
|
||||||
|
/// File names libmpv may have on this platform.
|
||||||
|
pub const MPV_LIBRARIES: &[&str] = &["libmpv.2.dylib", "libmpv.dylib"];
|
||||||
|
|
||||||
|
/// Not needed: the only GPU-specific tier (RTX Video) is Windows-only.
|
||||||
pub fn gpu_names() -> Vec<String> {
|
pub fn gpu_names() -> Vec<String> {
|
||||||
Vec::new()
|
Vec::new()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn hold_awake(rx: std::sync::mpsc::Receiver<()>) {
|
/// The Mac's name as set in System Settings → General → Sharing.
|
||||||
// TODO(macOS): IOPMAssertionCreateWithName(PreventUserIdleDisplaySleep).
|
pub fn device_name() -> String {
|
||||||
let _ = rx.recv();
|
objc2_foundation::NSHost::currentHost()
|
||||||
|
.localizedName()
|
||||||
|
.map(|n| n.to_string())
|
||||||
|
.filter(|n| !n.is_empty())
|
||||||
|
.unwrap_or_else(|| "Mac".into())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// macOS version, e.g. "15.4".
|
||||||
|
pub fn os_version() -> String {
|
||||||
|
let v = objc2_foundation::NSProcessInfo::processInfo().operatingSystemVersion();
|
||||||
|
if v.patchVersion > 0 {
|
||||||
|
format!("{}.{}.{}", v.majorVersion, v.minorVersion, v.patchVersion)
|
||||||
|
} else {
|
||||||
|
format!("{}.{}", v.majorVersion, v.minorVersion)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Shows or hides the traffic lights (they fade with the player's controls).
|
||||||
|
pub fn set_window_buttons<R: Runtime>(window: &WebviewWindow<R>, visible: bool) {
|
||||||
|
let Ok(ns_window) = window.ns_window() else { return };
|
||||||
|
let ns_window = ns_window as usize;
|
||||||
|
let _ = window.run_on_main_thread(move || unsafe {
|
||||||
|
let window = &*(ns_window as *const NSWindow);
|
||||||
|
for kind in [NSWindowButton::CloseButton, NSWindowButton::MiniaturizeButton, NSWindowButton::ZoomButton] {
|
||||||
|
if let Some(button) = window.standardWindowButton(kind) {
|
||||||
|
button.setHidden(!visible);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// AppKit lays the buttons out again at their default place; the window's
|
||||||
|
// view restores the configured position (trafficLightPosition) when drawn.
|
||||||
|
if let Some(view) = window.contentView() {
|
||||||
|
view.setNeedsDisplay(true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// —— Power —————————————————————————————————————————————————————————————
|
||||||
|
|
||||||
|
type CFStringRef = *const c_void;
|
||||||
|
const CF_STRING_ENCODING_UTF8: u32 = 0x0800_0100;
|
||||||
|
const IOPM_ASSERTION_LEVEL_ON: u32 = 255;
|
||||||
|
|
||||||
|
#[link(name = "CoreFoundation", kind = "framework")]
|
||||||
|
extern "C" {
|
||||||
|
fn CFStringCreateWithCString(alloc: *const c_void, s: *const c_char, encoding: u32) -> CFStringRef;
|
||||||
|
fn CFRelease(cf: *const c_void);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[link(name = "IOKit", kind = "framework")]
|
||||||
|
extern "C" {
|
||||||
|
fn IOPMAssertionCreateWithName(kind: CFStringRef, level: u32, name: CFStringRef, id: *mut u32) -> i32;
|
||||||
|
fn IOPMAssertionRelease(id: u32) -> i32;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keeps the display awake until `rx` closes or receives.
|
||||||
|
pub fn hold_awake(rx: Receiver<()>) {
|
||||||
|
let cf = |s: &CStr| unsafe { CFStringCreateWithCString(ptr::null(), s.as_ptr(), CF_STRING_ENCODING_UTF8) };
|
||||||
|
let kind = cf(c"PreventUserIdleDisplaySleep");
|
||||||
|
let name = cf(c"Kaleido is playing video");
|
||||||
|
let mut id = 0u32;
|
||||||
|
let held = unsafe { IOPMAssertionCreateWithName(kind, IOPM_ASSERTION_LEVEL_ON, name, &mut id) } == 0;
|
||||||
|
let _ = rx.recv();
|
||||||
|
unsafe {
|
||||||
|
if held {
|
||||||
|
IOPMAssertionRelease(id);
|
||||||
|
}
|
||||||
|
CFRelease(kind);
|
||||||
|
CFRelease(name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// —— Diagnostics (see diagnostics.rs) ————————————————————————————————————
|
||||||
|
|
||||||
|
/// Hang dumps are Windows-only for now; the watchdog still logs the stall.
|
||||||
|
pub fn write_dump(_: &std::path::Path) -> Result<(), String> {
|
||||||
|
Err("dumps are not written on this platform".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Crashes are left to the system's crash reporter here.
|
||||||
|
pub fn install_crash_handler() {}
|
||||||
|
|
||||||
|
// —— Miniplayer window (see mini.rs) ——————————————————————————————————————
|
||||||
|
|
||||||
|
/// The miniplayer stays inside the main window's page here (PlayerOverlay).
|
||||||
|
pub const SEPARATE_MINI: bool = false;
|
||||||
|
|
||||||
|
pub fn host_handle<R: Runtime>(_: &WebviewWindow<R>) -> Option<isize> {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn style_mini_window(_: isize) {}
|
||||||
|
|
||||||
|
pub fn show_inactive(_: isize) {}
|
||||||
|
|
||||||
|
pub fn hide_window(_: isize) {}
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,14 @@
|
||||||
//! Each platform file exposes the same items:
|
//! Each platform file exposes the same items:
|
||||||
//!
|
//!
|
||||||
//! - `VideoSurface`: composes mpv's output beneath the web view
|
//! - `VideoSurface`: composes mpv's output beneath the web view
|
||||||
//! (`create`, `mpv_options`, `on_property`, `show`, `fit`, `set_rect`).
|
//! (`create`, `mpv_options`, `start`, `on_property`, `show`, `fit`, `set_rect`).
|
||||||
//! - `SURFACE_PROPERTIES`: mpv properties the surface observes.
|
//! - `SURFACE_PROPERTIES`: mpv properties the surface observes.
|
||||||
//! - `MPV_LIBRARIES`: libmpv file names to look for.
|
//! - `MPV_LIBRARIES`: libmpv file names to look for.
|
||||||
//! - `hold_awake`: prevents display sleep until the receiver closes.
|
//! - `hold_awake`: prevents display sleep until the receiver closes.
|
||||||
//! - `gpu_names`: the graphics adapters, by name.
|
//! - `gpu_names`: the graphics adapters, by name.
|
||||||
|
//! - `device_name`, `os_version`: how the computer identifies itself to Plex.
|
||||||
|
//! - `set_window_buttons`: shows or hides native window buttons (macOS).
|
||||||
|
//! - `write_dump`, `install_crash_handler`: hang and crash dumps (Windows).
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
mod windows;
|
mod windows;
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,15 @@ use ::windows::Win32::UI::WindowsAndMessaging::GetClientRect;
|
||||||
use crate::mpv::Mpv;
|
use crate::mpv::Mpv;
|
||||||
|
|
||||||
pub struct VideoSurface {
|
pub struct VideoSurface {
|
||||||
|
/// The window showing the video now: the main window, or the miniplayer's
|
||||||
|
/// (`set_host`). Window handles are kept so fitting needn't ask the UI
|
||||||
|
/// thread for them (Tauri's `hwnd()` waits on the UI thread elsewhere).
|
||||||
|
hwnd: HWND,
|
||||||
|
main: HWND,
|
||||||
attached: usize,
|
attached: usize,
|
||||||
device: IDCompositionDevice,
|
device: IDCompositionDevice,
|
||||||
_target: IDCompositionTarget,
|
/// One composition target per window the video has been shown in.
|
||||||
|
targets: Vec<(isize, IDCompositionTarget)>,
|
||||||
root: IDCompositionVisual,
|
root: IDCompositionVisual,
|
||||||
visible: bool,
|
visible: bool,
|
||||||
/// Where the video is drawn, in client pixels; `None` fills the window.
|
/// Where the video is drawn, in client pixels; `None` fills the window.
|
||||||
|
|
@ -44,11 +50,12 @@ impl VideoSurface {
|
||||||
let root = device.CreateVisual().map_err(|e| e.to_string())?;
|
let root = device.CreateVisual().map_err(|e| e.to_string())?;
|
||||||
let (width, height) = client_size(hwnd);
|
let (width, height) = client_size(hwnd);
|
||||||
device.Commit().map_err(|e| e.to_string())?;
|
device.Commit().map_err(|e| e.to_string())?;
|
||||||
let _ = ⌖
|
|
||||||
Ok(VideoSurface {
|
Ok(VideoSurface {
|
||||||
|
hwnd,
|
||||||
|
main: hwnd,
|
||||||
attached: 0,
|
attached: 0,
|
||||||
device,
|
device,
|
||||||
_target: target,
|
targets: vec![(hwnd.0 as isize, target)],
|
||||||
root,
|
root,
|
||||||
visible: false,
|
visible: false,
|
||||||
rect: None,
|
rect: None,
|
||||||
|
|
@ -69,6 +76,11 @@ impl VideoSurface {
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Nothing to set up once mpv is initialized: it creates its swapchain itself.
|
||||||
|
pub fn start(&mut self, _: &std::sync::Arc<Mpv>) -> Result<(), String> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn on_property(&mut self, name: &str, value: &serde_json::Value) {
|
pub fn on_property(&mut self, name: &str, value: &serde_json::Value) {
|
||||||
if name == "display-swapchain" {
|
if name == "display-swapchain" {
|
||||||
self.attach(value.as_i64().unwrap_or(0) as usize);
|
self.attach(value.as_i64().unwrap_or(0) as usize);
|
||||||
|
|
@ -94,22 +106,60 @@ impl VideoSurface {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn show(&mut self, visible: bool) {
|
fn target(&self, hwnd: HWND) -> Option<&IDCompositionTarget> {
|
||||||
|
self.targets.iter().find(|(h, _)| *h == hwnd.0 as isize).map(|(_, t)| t)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn show<R: Runtime>(&mut self, _: &WebviewWindow<R>, visible: bool) {
|
||||||
if self.visible == visible {
|
if self.visible == visible {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
self.visible = visible;
|
self.visible = visible;
|
||||||
unsafe {
|
if let Some(target) = self.target(self.hwnd) {
|
||||||
let _ = if visible { self._target.SetRoot(&self.root) } else { self._target.SetRoot(None::<&IDCompositionVisual>) };
|
unsafe {
|
||||||
let _ = self.device.Commit();
|
let _ = if visible { target.SetRoot(&self.root) } else { target.SetRoot(None::<&IDCompositionVisual>) };
|
||||||
|
let _ = self.device.Commit();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Moves the video to another window (the miniplayer's, a raw `HWND`), or
|
||||||
|
/// back to the main window with `None`, filling its client area. Both
|
||||||
|
/// changes go out in one commit, so the video is never shown twice.
|
||||||
|
pub fn set_host(&mut self, host: Option<isize>, mpv: Option<&Mpv>) -> Result<(), String> {
|
||||||
|
let next = host.map(|h| HWND(h as _)).unwrap_or(self.main);
|
||||||
|
if next == self.hwnd {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
unsafe {
|
||||||
|
if self.target(next).is_none() {
|
||||||
|
// Behind the window's children (its web view), as in the main window.
|
||||||
|
let target = self.device.CreateTargetForHwnd(next, false).map_err(|e| e.to_string())?;
|
||||||
|
self.targets.push((next.0 as isize, target));
|
||||||
|
}
|
||||||
|
if self.visible {
|
||||||
|
if let Some(old) = self.target(self.hwnd) {
|
||||||
|
let _ = old.SetRoot(None::<&IDCompositionVisual>);
|
||||||
|
}
|
||||||
|
if let Some(new) = self.target(next) {
|
||||||
|
let _ = new.SetRoot(&self.root);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.hwnd = next;
|
||||||
|
self.rect = None;
|
||||||
|
self.fit_host(mpv);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// Matches mpv's composition size and the visual's position to the
|
/// Matches mpv's composition size and the visual's position to the
|
||||||
/// window's client area, or to the miniplayer rectangle when one is set.
|
/// window's client area, or to the miniplayer rectangle when one is set.
|
||||||
pub fn fit<R: Runtime>(&mut self, window: &WebviewWindow<R>, mpv: Option<&Mpv>) {
|
pub fn fit<R: Runtime>(&mut self, _: &WebviewWindow<R>, mpv: Option<&Mpv>) {
|
||||||
let Ok(h) = window.hwnd() else { return };
|
self.fit_host(mpv);
|
||||||
let (cw, ch) = client_size(HWND(h.0 as _));
|
}
|
||||||
|
|
||||||
|
fn fit_host(&mut self, mpv: Option<&Mpv>) {
|
||||||
|
let (cw, ch) = client_size(self.hwnd);
|
||||||
let (x, y, w, h) = match self.rect {
|
let (x, y, w, h) = match self.rect {
|
||||||
Some((x, y, w, h)) => (x, y, w.max(16), h.max(16)),
|
Some((x, y, w, h)) => (x, y, w.max(16), h.max(16)),
|
||||||
None => (0, 0, cw, ch),
|
None => (0, 0, cw, ch),
|
||||||
|
|
@ -141,7 +191,6 @@ pub const SURFACE_PROPERTIES: &[&str] = &["display-swapchain"];
|
||||||
/// File names libmpv may have on this platform.
|
/// File names libmpv may have on this platform.
|
||||||
pub const MPV_LIBRARIES: &[&str] = &["libmpv-2.dll", "mpv-2.dll"];
|
pub const MPV_LIBRARIES: &[&str] = &["libmpv-2.dll", "mpv-2.dll"];
|
||||||
|
|
||||||
/// Keeps the display awake until `rx` closes or receives.
|
|
||||||
/// Hardware graphics adapters as DXGI names them (e.g. "NVIDIA GeForce RTX 4080").
|
/// Hardware graphics adapters as DXGI names them (e.g. "NVIDIA GeForce RTX 4080").
|
||||||
pub fn gpu_names() -> Vec<String> {
|
pub fn gpu_names() -> Vec<String> {
|
||||||
use ::windows::Win32::Graphics::Dxgi::*;
|
use ::windows::Win32::Graphics::Dxgi::*;
|
||||||
|
|
@ -165,6 +214,166 @@ pub fn gpu_names() -> Vec<String> {
|
||||||
names
|
names
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The computer's name, as Plex shows it.
|
||||||
|
pub fn device_name() -> String {
|
||||||
|
std::env::var("COMPUTERNAME").unwrap_or_else(|_| "Windows PC".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn os_version() -> String {
|
||||||
|
"11".into()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Windows draws its own caption buttons in the page.
|
||||||
|
pub fn set_window_buttons<R: Runtime>(_: &WebviewWindow<R>, _: bool) {}
|
||||||
|
|
||||||
|
// —— Miniplayer window (see mini.rs) ——————————————————————————————————————
|
||||||
|
|
||||||
|
/// The miniplayer is a window of its own here: the video moves into it, so
|
||||||
|
/// dragging moves video and controls together.
|
||||||
|
pub const SEPARATE_MINI: bool = true;
|
||||||
|
|
||||||
|
/// The window's handle, for `VideoSurface::set_host`. Asks the UI thread, so
|
||||||
|
/// never call it while holding a lock the UI thread may wait on.
|
||||||
|
pub fn host_handle<R: Runtime>(window: &WebviewWindow<R>) -> Option<isize> {
|
||||||
|
window.hwnd().ok().map(|h| h.0 as isize)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Rounded corners (Windows 11) and no activation on click, so the main
|
||||||
|
/// window keeps focus and its keyboard shortcuts while the miniplayer is used.
|
||||||
|
pub fn style_mini_window(hwnd: isize) {
|
||||||
|
use ::windows::Win32::Graphics::Dwm::{DwmSetWindowAttribute, DWMWA_WINDOW_CORNER_PREFERENCE, DWMWCP_ROUND};
|
||||||
|
use ::windows::Win32::UI::WindowsAndMessaging::{GetWindowLongPtrW, SetWindowLongPtrW, GWL_EXSTYLE, WS_EX_NOACTIVATE};
|
||||||
|
let hwnd = HWND(hwnd as _);
|
||||||
|
unsafe {
|
||||||
|
let preference = DWMWCP_ROUND;
|
||||||
|
let _ = DwmSetWindowAttribute(hwnd, DWMWA_WINDOW_CORNER_PREFERENCE, &preference as *const _ as *const c_void, std::mem::size_of_val(&preference) as u32);
|
||||||
|
let style = GetWindowLongPtrW(hwnd, GWL_EXSTYLE);
|
||||||
|
SetWindowLongPtrW(hwnd, GWL_EXSTYLE, style | WS_EX_NOACTIVATE.0 as isize);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Shows a window without activating it (Tauri's `show` activates).
|
||||||
|
pub fn show_inactive(hwnd: isize) {
|
||||||
|
use ::windows::Win32::UI::WindowsAndMessaging::{ShowWindow, SW_SHOWNOACTIVATE};
|
||||||
|
unsafe {
|
||||||
|
let _ = ShowWindow(HWND(hwnd as _), SW_SHOWNOACTIVATE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Hides a window shown by `show_inactive`. Tauri's `hide` would skip it: it
|
||||||
|
/// never saw the window shown, so believes it hidden already.
|
||||||
|
pub fn hide_window(hwnd: isize) {
|
||||||
|
use ::windows::Win32::UI::WindowsAndMessaging::{ShowWindow, SW_HIDE};
|
||||||
|
unsafe {
|
||||||
|
let _ = ShowWindow(HWND(hwnd as _), SW_HIDE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// —— Diagnostics (see diagnostics.rs) ————————————————————————————————————
|
||||||
|
|
||||||
|
use ::windows::Win32::System::Diagnostics::Debug::{
|
||||||
|
MiniDumpWithHandleData, MiniDumpWithThreadInfo, MiniDumpWithUnloadedModules, MiniDumpWriteDump, SetUnhandledExceptionFilter,
|
||||||
|
EXCEPTION_CONTINUE_SEARCH, EXCEPTION_POINTERS, MINIDUMP_EXCEPTION_INFORMATION, MINIDUMP_TYPE,
|
||||||
|
};
|
||||||
|
use ::windows::Win32::System::Threading::{GetCurrentProcess, GetCurrentProcessId, GetCurrentThreadId};
|
||||||
|
use std::os::windows::io::AsRawHandle;
|
||||||
|
use std::path::Path;
|
||||||
|
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
|
||||||
|
|
||||||
|
/// Every thread's stack and state, the loaded and unloaded modules and the
|
||||||
|
/// open handles: what a hang or crash needs, in a few megabytes.
|
||||||
|
const DUMP_TYPE: MINIDUMP_TYPE = MINIDUMP_TYPE(MiniDumpWithThreadInfo.0 | MiniDumpWithHandleData.0 | MiniDumpWithUnloadedModules.0);
|
||||||
|
|
||||||
|
fn write_dump_with(path: &Path, exception: Option<*const EXCEPTION_POINTERS>) -> Result<(), String> {
|
||||||
|
let file = std::fs::File::create(path).map_err(|e| e.to_string())?;
|
||||||
|
let info = exception.map(|pointers| MINIDUMP_EXCEPTION_INFORMATION {
|
||||||
|
ThreadId: unsafe { GetCurrentThreadId() },
|
||||||
|
ExceptionPointers: pointers as *mut _,
|
||||||
|
ClientPointers: false.into(),
|
||||||
|
});
|
||||||
|
let file_handle = ::windows::Win32::Foundation::HANDLE(file.as_raw_handle());
|
||||||
|
unsafe {
|
||||||
|
MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), file_handle, DUMP_TYPE, info.as_ref().map(|i| i as *const _), None, None)
|
||||||
|
.map_err(|e| e.to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Dumps this process as it is now (the hang watchdog's snapshot).
|
||||||
|
pub fn write_dump(path: &Path) -> Result<(), String> {
|
||||||
|
write_dump_with(path, None)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "access violation at libmpv-2.dll+0x1234 (0xC0000005)", for the log.
|
||||||
|
unsafe fn describe(pointers: *const EXCEPTION_POINTERS) -> String {
|
||||||
|
use ::windows::Win32::Foundation::HMODULE;
|
||||||
|
use ::windows::Win32::System::LibraryLoader::*;
|
||||||
|
let Some(record) = (*pointers).ExceptionRecord.as_ref() else { return "unknown exception".into() };
|
||||||
|
let code = record.ExceptionCode.0 as u32;
|
||||||
|
let address = record.ExceptionAddress as usize;
|
||||||
|
let mut module = HMODULE::default();
|
||||||
|
let place = if GetModuleHandleExW(
|
||||||
|
GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
|
||||||
|
::windows::core::PCWSTR(address as *const u16),
|
||||||
|
&mut module,
|
||||||
|
)
|
||||||
|
.is_ok()
|
||||||
|
{
|
||||||
|
let mut name = [0u16; 260];
|
||||||
|
let len = GetModuleFileNameW(Some(module), &mut name) as usize;
|
||||||
|
let path = String::from_utf16_lossy(&name[..len]);
|
||||||
|
let file = path.rsplit('\\').next().unwrap_or(&path).to_string();
|
||||||
|
format!("{file}+{:#x}", address - module.0 as usize)
|
||||||
|
} else {
|
||||||
|
format!("{address:#x}")
|
||||||
|
};
|
||||||
|
let what = match code {
|
||||||
|
0xC000_0005 => "access violation",
|
||||||
|
0xC000_00FD => "stack overflow",
|
||||||
|
0xC000_0409 => "fail-fast (security check)",
|
||||||
|
0xC000_001D => "illegal instruction",
|
||||||
|
0xC000_0094 => "integer division by zero",
|
||||||
|
_ => "exception",
|
||||||
|
};
|
||||||
|
format!("{what} at {place} ({code:#010X})")
|
||||||
|
}
|
||||||
|
|
||||||
|
static PREVIOUS_FILTER: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
static CRASHED: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
unsafe extern "system" fn on_crash(pointers: *const EXCEPTION_POINTERS) -> i32 {
|
||||||
|
if !CRASHED.swap(true, Ordering::SeqCst) {
|
||||||
|
let what = describe(pointers);
|
||||||
|
match crate::diagnostics::dump_path("crash") {
|
||||||
|
Some(path) => match write_dump_with(&path, Some(pointers)) {
|
||||||
|
Ok(()) => crate::diagnostics::log(&format!("crash: {what}; wrote {}", path.display())),
|
||||||
|
Err(e) => crate::diagnostics::log(&format!("crash: {what}; no dump: {e}")),
|
||||||
|
},
|
||||||
|
None => crate::diagnostics::log(&format!("crash: {what}")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Then whatever handled it before (Windows Error Reporting by default).
|
||||||
|
match PREVIOUS_FILTER.load(Ordering::SeqCst) {
|
||||||
|
0 => EXCEPTION_CONTINUE_SEARCH,
|
||||||
|
previous => {
|
||||||
|
let previous: unsafe extern "system" fn(*const EXCEPTION_POINTERS) -> i32 = std::mem::transmute(previous);
|
||||||
|
previous(pointers)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Writes a dump when the process is about to die of an unhandled exception.
|
||||||
|
/// Called again once libmpv is loaded, in case its runtime replaced it.
|
||||||
|
pub fn install_crash_handler() {
|
||||||
|
unsafe {
|
||||||
|
if let Some(previous) = SetUnhandledExceptionFilter(Some(on_crash)) {
|
||||||
|
if previous as usize != on_crash as *const () as usize {
|
||||||
|
PREVIOUS_FILTER.store(previous as usize, Ordering::SeqCst);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keeps the display awake until `rx` closes or receives.
|
||||||
pub fn hold_awake(rx: std::sync::mpsc::Receiver<()>) {
|
pub fn hold_awake(rx: std::sync::mpsc::Receiver<()>) {
|
||||||
use ::windows::Win32::System::Power::*;
|
use ::windows::Win32::System::Power::*;
|
||||||
unsafe {
|
unsafe {
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,10 @@ use tauri::{AppHandle, Emitter, Manager, Runtime, WebviewWindow};
|
||||||
use crate::mpv::{self, Event, Mpv};
|
use crate::mpv::{self, Event, Mpv};
|
||||||
use crate::platform::VideoSurface;
|
use crate::platform::VideoSurface;
|
||||||
|
|
||||||
|
/// Both locks are taken by commands on background threads, and some window
|
||||||
|
/// calls made while holding them (Tauri's getters, such as `hwnd()`) wait for
|
||||||
|
/// the UI thread to answer. So the UI thread must never wait on these locks:
|
||||||
|
/// window events hand their work to a background thread (lib.rs).
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct PlayerState {
|
pub struct PlayerState {
|
||||||
mpv: Mutex<Option<Arc<Mpv>>>,
|
mpv: Mutex<Option<Arc<Mpv>>>,
|
||||||
|
|
@ -60,6 +64,8 @@ fn emit<R: Runtime>(app: &AppHandle<R>, payload: Value) {
|
||||||
fn create_player<R: Runtime>(app: &AppHandle<R>, window: &WebviewWindow<R>, opts: &InitOptions) -> Result<Arc<Mpv>, String> {
|
fn create_player<R: Runtime>(app: &AppHandle<R>, window: &WebviewWindow<R>, opts: &InitOptions) -> Result<Arc<Mpv>, String> {
|
||||||
let resource_dir = app.path().resource_dir().ok();
|
let resource_dir = app.path().resource_dir().ok();
|
||||||
let mpv = Mpv::load(&mpv::library_candidates(resource_dir))?;
|
let mpv = Mpv::load(&mpv::library_candidates(resource_dir))?;
|
||||||
|
// libmpv's runtime may install its own crash filter as it loads; ours goes back on top.
|
||||||
|
crate::platform::install_crash_handler();
|
||||||
let surface = VideoSurface::create(window)?;
|
let surface = VideoSurface::create(window)?;
|
||||||
let render_options = surface.mpv_options();
|
let render_options = surface.mpv_options();
|
||||||
*app.state::<PlayerState>().surface.lock() = Some(surface);
|
*app.state::<PlayerState>().surface.lock() = Some(surface);
|
||||||
|
|
@ -71,7 +77,9 @@ fn create_player<R: Runtime>(app: &AppHandle<R>, window: &WebviewWindow<R>, opts
|
||||||
set("hwdec", opts.hwdec.as_deref().unwrap_or("auto-safe"))?;
|
set("hwdec", opts.hwdec.as_deref().unwrap_or("auto-safe"))?;
|
||||||
set("keep-open", "yes")?;
|
set("keep-open", "yes")?;
|
||||||
set("idle", "yes")?;
|
set("idle", "yes")?;
|
||||||
set("force-window", "yes")?;
|
if !render_options.iter().any(|(k, _)| *k == "force-window") {
|
||||||
|
set("force-window", "yes")?;
|
||||||
|
}
|
||||||
set("osc", "no")?;
|
set("osc", "no")?;
|
||||||
set("osd-level", "0")?;
|
set("osd-level", "0")?;
|
||||||
set("input-default-bindings", "no")?;
|
set("input-default-bindings", "no")?;
|
||||||
|
|
@ -107,6 +115,9 @@ fn create_player<R: Runtime>(app: &AppHandle<R>, window: &WebviewWindow<R>, opts
|
||||||
}
|
}
|
||||||
mpv.request_log_messages("warn");
|
mpv.request_log_messages("warn");
|
||||||
mpv.initialize()?;
|
mpv.initialize()?;
|
||||||
|
if let Some(surface) = app.state::<PlayerState>().surface.lock().as_mut() {
|
||||||
|
surface.start(&mpv)?;
|
||||||
|
}
|
||||||
for (i, name) in OBSERVED.iter().chain(crate::platform::SURFACE_PROPERTIES).enumerate() {
|
for (i, name) in OBSERVED.iter().chain(crate::platform::SURFACE_PROPERTIES).enumerate() {
|
||||||
mpv.observe(i as u64 + 1, name);
|
mpv.observe(i as u64 + 1, name);
|
||||||
}
|
}
|
||||||
|
|
@ -169,13 +180,29 @@ fn player<R: Runtime>(app: &AppHandle<R>) -> Result<Arc<Mpv>, String> {
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn player_init<R: Runtime>(app: AppHandle<R>, window: WebviewWindow<R>, options: Option<InitOptions>) -> Result<(), String> {
|
pub async fn player_init<R: Runtime>(app: AppHandle<R>, window: WebviewWindow<R>, options: Option<InitOptions>) -> Result<(), String> {
|
||||||
let state = app.state::<PlayerState>();
|
let state = app.state::<PlayerState>();
|
||||||
let mut guard = state.mpv.lock();
|
{
|
||||||
if guard.is_none() {
|
let mut guard = state.mpv.lock();
|
||||||
*guard = Some(create_player(&app, &window, &options.unwrap_or_default())?);
|
if guard.is_none() {
|
||||||
|
*guard = Some(create_player(&app, &window, &options.unwrap_or_default())?);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
// Outside the lock: creating a window waits on the UI thread.
|
||||||
|
crate::mini::prepare(&app);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Moves the video into another window (the miniplayer's, mini.rs) or back to
|
||||||
|
/// the main one. Off the UI thread only (it takes the player's locks).
|
||||||
|
pub fn set_video_host<R: Runtime>(app: &AppHandle<R>, host: Option<isize>) -> Result<(), String> {
|
||||||
|
let state = app.state::<PlayerState>();
|
||||||
|
let mpv = state.mpv.lock().clone();
|
||||||
|
let mut surface = state.surface.lock();
|
||||||
|
match surface.as_mut() {
|
||||||
|
Some(surface) => surface.set_host(host, mpv.as_deref()),
|
||||||
|
None => Ok(()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn player_show<R: Runtime>(app: AppHandle<R>, window: WebviewWindow<R>, visible: bool) -> Result<(), String> {
|
pub async fn player_show<R: Runtime>(app: AppHandle<R>, window: WebviewWindow<R>, visible: bool) -> Result<(), String> {
|
||||||
let state = app.state::<PlayerState>();
|
let state = app.state::<PlayerState>();
|
||||||
|
|
@ -183,7 +210,7 @@ pub async fn player_show<R: Runtime>(app: AppHandle<R>, window: WebviewWindow<R>
|
||||||
let mut surface = state.surface.lock();
|
let mut surface = state.surface.lock();
|
||||||
if let Some(surface) = surface.as_mut() {
|
if let Some(surface) = surface.as_mut() {
|
||||||
surface.fit(&window, mpv.as_deref());
|
surface.fit(&window, mpv.as_deref());
|
||||||
surface.show(visible);
|
surface.show(&window, visible);
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
@ -225,6 +252,13 @@ pub async fn player_get<R: Runtime>(app: AppHandle<R>, name: String) -> Result<V
|
||||||
player(&app)?.get_property(&name)
|
player(&app)?.get_property(&name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Shows or hides the native window buttons where the OS draws them (the
|
||||||
|
/// macOS traffic lights fade with the player's controls).
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn window_buttons<R: Runtime>(window: WebviewWindow<R>, visible: bool) {
|
||||||
|
crate::platform::set_window_buttons(&window, visible);
|
||||||
|
}
|
||||||
|
|
||||||
/// Keeps the video surface matched to the window's client area.
|
/// Keeps the video surface matched to the window's client area.
|
||||||
pub fn on_resize<R: Runtime>(window: &WebviewWindow<R>) {
|
pub fn on_resize<R: Runtime>(window: &WebviewWindow<R>) {
|
||||||
let app = window.app_handle();
|
let app = window.app_handle();
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,14 @@ fn entry(key: &str) -> Result<keyring::Entry, String> {
|
||||||
keyring::Entry::new(SERVICE, key).map_err(|e| e.to_string())
|
keyring::Entry::new(SERVICE, key).map_err(|e| e.to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Secrets (Plex tokens) live in Windows Credential Manager, never in plain files.
|
/// Secrets (Plex tokens) live in the OS's credential store (Windows Credential
|
||||||
|
/// Manager, the macOS Keychain), never in plain files; except in macOS debug
|
||||||
|
/// builds, see `dev_secrets`.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn secret_get(key: String) -> Result<Option<String>, String> {
|
pub fn secret_get<R: Runtime>(app: AppHandle<R>, key: String) -> Result<Option<String>, String> {
|
||||||
|
if let Some(path) = dev_secrets(&app) {
|
||||||
|
return Ok(read_dev_secrets(&path).get(&key).and_then(|v| v.as_str()).map(String::from));
|
||||||
|
}
|
||||||
match entry(&key)?.get_password() {
|
match entry(&key)?.get_password() {
|
||||||
Ok(v) => Ok(Some(v)),
|
Ok(v) => Ok(Some(v)),
|
||||||
Err(keyring::Error::NoEntry) => Ok(None),
|
Err(keyring::Error::NoEntry) => Ok(None),
|
||||||
|
|
@ -24,18 +29,66 @@ pub fn secret_get(key: String) -> Result<Option<String>, String> {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn secret_set(key: String, value: String) -> Result<(), String> {
|
pub fn secret_set<R: Runtime>(app: AppHandle<R>, key: String, value: String) -> Result<(), String> {
|
||||||
entry(&key)?.set_password(&value).map_err(|e| e.to_string())
|
if let Some(path) = dev_secrets(&app) {
|
||||||
|
let mut all = read_dev_secrets(&path);
|
||||||
|
all.insert(key, Value::String(value));
|
||||||
|
return write_dev_secrets(&path, &all);
|
||||||
|
}
|
||||||
|
let entry = entry(&key)?;
|
||||||
|
match entry.set_password(&value) {
|
||||||
|
Ok(()) => Ok(()),
|
||||||
|
// A Keychain item left by a differently signed build can be impossible to
|
||||||
|
// update yet still block adding; replacing it recovers.
|
||||||
|
Err(keyring::Error::PlatformFailure(_)) if cfg!(target_os = "macos") => {
|
||||||
|
let _ = entry.delete_credential();
|
||||||
|
entry.set_password(&value).map_err(|e| e.to_string())
|
||||||
|
}
|
||||||
|
Err(e) => Err(e.to_string()),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn secret_delete(key: String) -> Result<(), String> {
|
pub fn secret_delete<R: Runtime>(app: AppHandle<R>, key: String) -> Result<(), String> {
|
||||||
|
if let Some(path) = dev_secrets(&app) {
|
||||||
|
let mut all = read_dev_secrets(&path);
|
||||||
|
all.remove(&key);
|
||||||
|
return write_dev_secrets(&path, &all);
|
||||||
|
}
|
||||||
match entry(&key)?.delete_credential() {
|
match entry(&key)?.delete_credential() {
|
||||||
Ok(()) | Err(keyring::Error::NoEntry) => Ok(()),
|
Ok(()) | Err(keyring::Error::NoEntry) => Ok(()),
|
||||||
Err(e) => Err(e.to_string()),
|
Err(e) => Err(e.to_string()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// macOS ties Keychain access to the app's code signature, and every debug
|
||||||
|
/// build is a new unsigned binary, so the Keychain would ask for permission
|
||||||
|
/// after each rebuild. Debug builds there keep secrets in a private file in the
|
||||||
|
/// app data folder instead (development only, like the `.env` sign-in).
|
||||||
|
fn dev_secrets<R: Runtime>(app: &AppHandle<R>) -> Option<std::path::PathBuf> {
|
||||||
|
if !(cfg!(debug_assertions) && cfg!(target_os = "macos")) {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
app.path().app_data_dir().ok().map(|d| d.join("dev-secrets.json"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_dev_secrets(path: &std::path::Path) -> serde_json::Map<String, Value> {
|
||||||
|
std::fs::read_to_string(path).ok().and_then(|t| serde_json::from_str(&t).ok()).unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_dev_secrets(path: &std::path::Path, all: &serde_json::Map<String, Value>) -> Result<(), String> {
|
||||||
|
use std::io::Write;
|
||||||
|
if let Some(dir) = path.parent() {
|
||||||
|
std::fs::create_dir_all(dir).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
let mut options = std::fs::OpenOptions::new();
|
||||||
|
options.write(true).create(true).truncate(true);
|
||||||
|
#[cfg(unix)]
|
||||||
|
std::os::unix::fs::OpenOptionsExt::mode(&mut options, 0o600);
|
||||||
|
let mut file = options.open(path).map_err(|e| e.to_string())?;
|
||||||
|
file.write_all(Value::Object(all.clone()).to_string().as_bytes()).map_err(|e| e.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct AppInfo {
|
pub struct AppInfo {
|
||||||
|
|
@ -43,6 +96,7 @@ pub struct AppInfo {
|
||||||
data_dir: String,
|
data_dir: String,
|
||||||
default_download_dir: String,
|
default_download_dir: String,
|
||||||
platform: String,
|
platform: String,
|
||||||
|
os_version: String,
|
||||||
device_name: String,
|
device_name: String,
|
||||||
/// Graphics adapters by name (decides which upscaling tiers are offered).
|
/// Graphics adapters by name (decides which upscaling tiers are offered).
|
||||||
gpus: Vec<String>,
|
gpus: Vec<String>,
|
||||||
|
|
@ -63,7 +117,8 @@ pub fn app_info<R: Runtime>(app: AppHandle<R>) -> AppInfo {
|
||||||
data_dir: data,
|
data_dir: data,
|
||||||
default_download_dir: downloads,
|
default_download_dir: downloads,
|
||||||
platform: std::env::consts::OS.to_string(),
|
platform: std::env::consts::OS.to_string(),
|
||||||
device_name: std::env::var("COMPUTERNAME").unwrap_or_else(|_| "Windows PC".into()),
|
os_version: crate::platform::os_version(),
|
||||||
|
device_name: crate::platform::device_name(),
|
||||||
gpus: crate::platform::gpu_names(),
|
gpus: crate::platform::gpu_names(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.6",
|
"version": "1.0.1",
|
||||||
"identifier": "tv.kaleido.desktop",
|
"identifier": "tv.kaleido.desktop",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|
@ -31,9 +31,12 @@
|
||||||
"csp": null,
|
"csp": null,
|
||||||
"assetProtocol": {
|
"assetProtocol": {
|
||||||
"enable": true,
|
"enable": true,
|
||||||
"scope": [
|
"scope": {
|
||||||
"**"
|
"allow": [
|
||||||
]
|
"**"
|
||||||
|
],
|
||||||
|
"requireLiteralLeadingDot": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -58,7 +61,7 @@
|
||||||
},
|
},
|
||||||
"plugins": {
|
"plugins": {
|
||||||
"updater": {
|
"updater": {
|
||||||
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU0MTA2RjI0OUFFQzU1QzUKUldURlZleWFKRzhRNUlqTTR3U095STFYS3BsUXd2UnZMYlRrQmt3aUk5YU5WSjdqcUxVcHllU1EK",
|
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEUxQjk1OTExMzBCRTRENEUKUldST1RiNHdFVm01NFFMQ1EvYm9CYlhhNU9jNTZXb254dVZOQW8relJYRlQ4ZjdLQll3cHR3VE4K",
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
"https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/raw/branch/main/updates/latest.json"
|
"https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/raw/branch/main/updates/latest.json"
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,39 @@
|
||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
|
"app": {
|
||||||
|
"windows": [
|
||||||
|
{
|
||||||
|
"label": "main",
|
||||||
|
"title": "Kaleido",
|
||||||
|
"width": 1480,
|
||||||
|
"height": 900,
|
||||||
|
"minWidth": 900,
|
||||||
|
"minHeight": 580,
|
||||||
|
"center": true,
|
||||||
|
"decorations": true,
|
||||||
|
"titleBarStyle": "Overlay",
|
||||||
|
"hiddenTitle": true,
|
||||||
|
"trafficLightPosition": { "x": 22, "y": 35 },
|
||||||
|
"backgroundColor": "#090a0c",
|
||||||
|
"transparent": false,
|
||||||
|
"shadow": true,
|
||||||
|
"visible": false,
|
||||||
|
"dragDropEnabled": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
"targets": [
|
"targets": [
|
||||||
"app",
|
"app",
|
||||||
"dmg"
|
"dmg"
|
||||||
],
|
],
|
||||||
"macOS": {
|
"macOS": {
|
||||||
"minimumSystemVersion": "12.0",
|
"minimumSystemVersion": "26.0",
|
||||||
"frameworks": [
|
"signingIdentity": "-",
|
||||||
"../vendor/mpv/macos/libmpv.2.dylib"
|
"hardenedRuntime": false,
|
||||||
]
|
"files": {
|
||||||
|
"Frameworks": "../vendor/mpv/macos"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ import { PageLoader } from '../ui/primitives';
|
||||||
import { Splash } from '../screens/Splash';
|
import { Splash } from '../screens/Splash';
|
||||||
import { SignIn } from '../screens/SignIn';
|
import { SignIn } from '../screens/SignIn';
|
||||||
import { ServerPicker } from '../screens/ServerPicker';
|
import { ServerPicker } from '../screens/ServerPicker';
|
||||||
import { win } from '../platform/native';
|
import { isMac, isNative, win } from '../platform/native';
|
||||||
import { usePlayer } from '../player/store';
|
import { usePlayer } from '../player/store';
|
||||||
import { PlayerOverlay } from '../player/PlayerOverlay';
|
import { PlayerOverlay } from '../player/PlayerOverlay';
|
||||||
import { DialogHost } from '../screens/dialogs/DialogHost';
|
import { DialogHost } from '../screens/dialogs/DialogHost';
|
||||||
|
|
@ -100,18 +100,20 @@ function useGlobalShortcuts() {
|
||||||
if ((e.ctrlKey || e.metaKey) && (e.key === 'k' || e.key === 'f')) {
|
if ((e.ctrlKey || e.metaKey) && (e.key === 'k' || e.key === 'f')) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
navigate({ name: 'search' });
|
navigate({ name: 'search' });
|
||||||
} else if (e.altKey && e.key === 'ArrowLeft') {
|
} else if ((e.altKey && e.key === 'ArrowLeft') || (isMac && e.metaKey && e.key === '[')) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
useRouter.getState().back();
|
useRouter.getState().back();
|
||||||
} else if (e.altKey && e.key === 'ArrowRight') {
|
} else if ((e.altKey && e.key === 'ArrowRight') || (isMac && e.metaKey && e.key === ']')) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
useRouter.getState().forward();
|
useRouter.getState().forward();
|
||||||
} else if (e.key === 'F11') {
|
} else if (e.key === 'F11' || (isMac && e.metaKey && e.ctrlKey && e.key.toLowerCase() === 'f')) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
win.isFullscreen().then((fs) => win.setFullscreen(!fs));
|
win.isFullscreen().then((fs) => win.setFullscreen(!fs));
|
||||||
} else if ((e.key === 'Escape' || e.key === 'Backspace') && !isTyping(e.target) && !document.querySelector('.menu-layer, .dialog-layer')) {
|
} else if ((e.key === 'Escape' || e.key === 'Backspace') && !isTyping(e.target) && !document.querySelector('.menu-layer, .dialog-layer')) {
|
||||||
if (e.key === 'Escape' && document.fullscreenElement) return;
|
if (e.key === 'Escape' && document.fullscreenElement) return;
|
||||||
useRouter.getState().back();
|
// Esc leaves full screen first (kept from the player when it went to the corner).
|
||||||
|
if (e.key === 'Escape' && isNative) win.isFullscreen().then((fs) => (fs ? win.setFullscreen(false) : useRouter.getState().back()));
|
||||||
|
else useRouter.getState().back();
|
||||||
} else if ((e.ctrlKey || e.metaKey) && e.key === ',') {
|
} else if ((e.ctrlKey || e.metaKey) && e.key === ',') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
navigate({ name: 'settings', mode: 'app', tab: 'general' });
|
navigate({ name: 'settings', mode: 'app', tab: 'general' });
|
||||||
|
|
@ -225,7 +227,16 @@ export function App() {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
useSession.getState().init();
|
useSession.getState().init();
|
||||||
// The window appears once the first frame is painted (no white flash).
|
// The window appears once the first frame is painted (no white flash).
|
||||||
requestAnimationFrame(() => win.show());
|
// WKWebView runs no animation frames until its window is shown, so a
|
||||||
|
// timeout stands in there.
|
||||||
|
let shown = false;
|
||||||
|
const show = () => {
|
||||||
|
if (!shown) win.show();
|
||||||
|
shown = true;
|
||||||
|
};
|
||||||
|
requestAnimationFrame(show);
|
||||||
|
const fallback = setTimeout(show, 150);
|
||||||
|
return () => clearTimeout(fallback);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import { useSettings } from './settings';
|
||||||
import { Icon } from '../ui/Icon';
|
import { Icon } from '../ui/Icon';
|
||||||
import { KaleidoMark } from '../ui/primitives';
|
import { KaleidoMark } from '../ui/primitives';
|
||||||
import { openMenu, type MenuItem } from '../ui/overlays';
|
import { openMenu, type MenuItem } from '../ui/overlays';
|
||||||
import { isNative, win } from '../platform/native';
|
import { isMac, isNative, shortcut, win } from '../platform/native';
|
||||||
import { useDownloads } from '../downloads/store';
|
import { useDownloads } from '../downloads/store';
|
||||||
import { useHomeUsers } from './useHomeUsers';
|
import { useHomeUsers } from './useHomeUsers';
|
||||||
|
|
||||||
|
|
@ -16,25 +16,40 @@ const NAV = [
|
||||||
{ id: 'downloads', label: 'Downloads', route: { name: 'downloads' } as const },
|
{ id: 'downloads', label: 'Downloads', route: { name: 'downloads' } as const },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
/** Caption buttons drawn by the page; macOS shows its own traffic lights instead. */
|
||||||
export function WindowControls() {
|
export function WindowControls() {
|
||||||
const [maximized, setMaximized] = useState(false);
|
const [maximized, setMaximized] = useState(false);
|
||||||
|
const [fullscreen, setFullscreen] = useState(false);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isNative) return;
|
if (!isNative || isMac) return;
|
||||||
let off: (() => void) | undefined;
|
let off: (() => void) | undefined;
|
||||||
const sync = () => win.isMaximized().then(setMaximized);
|
let gone = false;
|
||||||
|
const sync = () => {
|
||||||
|
win.isMaximized().then((m) => !gone && setMaximized(m));
|
||||||
|
win.isFullscreen().then((f) => !gone && setFullscreen(f));
|
||||||
|
};
|
||||||
sync();
|
sync();
|
||||||
win.onResized(sync).then((u) => (off = u));
|
win.onResized(sync).then((u) => (gone ? u() : (off = u)));
|
||||||
return () => off?.();
|
return () => {
|
||||||
|
gone = true;
|
||||||
|
off?.();
|
||||||
|
};
|
||||||
}, []);
|
}, []);
|
||||||
if (!isNative) return null;
|
if (!isNative || isMac) return null;
|
||||||
return (
|
return (
|
||||||
<div className="window-controls">
|
<div className="window-controls">
|
||||||
<button aria-label="Minimize" onClick={() => win.minimize()}>
|
<button aria-label="Minimize" onClick={() => win.minimize()}>
|
||||||
<Icon name="minimize" size={15} strokeWidth={1.4} />
|
<Icon name="minimize" size={15} strokeWidth={1.4} />
|
||||||
</button>
|
</button>
|
||||||
<button aria-label={maximized ? 'Restore' : 'Maximize'} onClick={() => win.toggleMaximize()}>
|
{fullscreen ? (
|
||||||
<Icon name={maximized ? 'restore' : 'maximize'} size={13} strokeWidth={1.4} />
|
<button aria-label="Exit full screen" title="Exit full screen (Esc)" onClick={() => win.setFullscreen(false)}>
|
||||||
</button>
|
<Icon name="collapse" size={14} strokeWidth={1.4} />
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
|
<button aria-label={maximized ? 'Restore' : 'Maximize'} onClick={() => win.toggleMaximize()}>
|
||||||
|
<Icon name={maximized ? 'restore' : 'maximize'} size={13} strokeWidth={1.4} />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
<button aria-label="Close" className="close" onClick={() => win.close()}>
|
<button aria-label="Close" className="close" onClick={() => win.close()}>
|
||||||
<Icon name="x" size={15} strokeWidth={1.4} />
|
<Icon name="x" size={15} strokeWidth={1.4} />
|
||||||
</button>
|
</button>
|
||||||
|
|
@ -109,7 +124,7 @@ export function TopBar({ solid }: { solid: boolean }) {
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
<div className="topbar-right" data-tauri-drag-region>
|
<div className="topbar-right" data-tauri-drag-region>
|
||||||
<button className={`icon-btn${active === 'search' ? ' on' : ''}`} aria-label="Search" title="Search (Ctrl+K)" onClick={() => navigate({ name: 'search' })}>
|
<button className={`icon-btn${active === 'search' ? ' on' : ''}`} aria-label="Search" title={`Search (${shortcut('K')})`} onClick={() => navigate({ name: 'search' })}>
|
||||||
<Icon name="search" size={19} />
|
<Icon name="search" size={19} />
|
||||||
</button>
|
</button>
|
||||||
<button className={`icon-btn${active === 'settings' ? ' on' : ''}`} aria-label="Settings" title="Settings" onClick={() => navigate({ name: 'settings', mode: 'app', tab: 'general' })}>
|
<button className={`icon-btn${active === 'settings' ? ' on' : ''}`} aria-label="Settings" title="Settings" onClick={() => navigate({ name: 'settings', mode: 'app', tab: 'general' })}>
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
||||||
|
|
@ -174,17 +183,24 @@ export function plural(n: number, word: string, pluralWord = `${word}s`) {
|
||||||
return `${n.toLocaleString()} ${n === 1 ? word : pluralWord}`;
|
return `${n.toLocaleString()} ${n === 1 ? word : pluralWord}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Hex UltraBlur colors → CSS gradient layers for the artwork colour wash. */
|
/** Hex UltraBlur colors → the wash's four corner colours, each at its own strength. */
|
||||||
export function washGradient(u: Item['ultraBlur'], strength = 1): string {
|
export function washColors(u: Item['ultraBlur'], strength = 1) {
|
||||||
if (!u) return '';
|
if (!u) return null;
|
||||||
const c = (hex: string, a: number) => {
|
const c = (hex: string, a: number) => {
|
||||||
const n = parseInt(hex, 16);
|
const n = parseInt(hex, 16);
|
||||||
return `rgba(${(n >> 16) & 255}, ${(n >> 8) & 255}, ${n & 255}, ${(a * strength).toFixed(3)})`;
|
return `rgba(${(n >> 16) & 255}, ${(n >> 8) & 255}, ${n & 255}, ${(a * strength).toFixed(3)})`;
|
||||||
};
|
};
|
||||||
|
return { topRight: c(u.topRight, 0.95), topLeft: c(u.topLeft, 0.7), bottomRight: c(u.bottomRight, 0.55), bottomLeft: c(u.bottomLeft, 0.45) };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Hex UltraBlur colors → CSS gradient layers for the artwork colour wash. */
|
||||||
|
export function washGradient(u: Item['ultraBlur'], strength = 1): string {
|
||||||
|
const c = washColors(u, strength);
|
||||||
|
if (!c) return '';
|
||||||
return [
|
return [
|
||||||
`radial-gradient(ellipse at 100% 0%, ${c(u.topRight, 0.95)} 0%, transparent 62%)`,
|
`radial-gradient(ellipse at 100% 0%, ${c.topRight} 0%, transparent 62%)`,
|
||||||
`radial-gradient(ellipse at 0% 0%, ${c(u.topLeft, 0.7)} 0%, transparent 55%)`,
|
`radial-gradient(ellipse at 0% 0%, ${c.topLeft} 0%, transparent 55%)`,
|
||||||
`radial-gradient(ellipse at 100% 100%, ${c(u.bottomRight, 0.55)} 0%, transparent 60%)`,
|
`radial-gradient(ellipse at 100% 100%, ${c.bottomRight} 0%, transparent 60%)`,
|
||||||
`radial-gradient(ellipse at 0% 100%, ${c(u.bottomLeft, 0.45)} 0%, transparent 60%)`,
|
`radial-gradient(ellipse at 0% 100%, ${c.bottomLeft} 0%, transparent 60%)`,
|
||||||
].join(', ');
|
].join(', ');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 };
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { QueryClient, useQuery, type UseQueryOptions } from '@tanstack/react-query';
|
import { QueryClient, useQuery, type UseQueryOptions } from '@tanstack/react-query';
|
||||||
import * as api from '../plex/api';
|
import * as api from '../plex/api';
|
||||||
import type { Item, Section } from '../plex/types';
|
import type { Item, Section } from '../plex/types';
|
||||||
import { useServer } from './session';
|
import { useServer, useSession } from './session';
|
||||||
import { useSettings } from './settings';
|
import { useSettings } from './settings';
|
||||||
|
|
||||||
export const queryClient = new QueryClient({
|
export const queryClient = new QueryClient({
|
||||||
|
|
@ -15,6 +15,25 @@ export const queryClient = new QueryClient({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Watch state changes from other Plex apps too (a TV, a phone), so the queries that show
|
||||||
|
* it refresh when Kaleido comes back into view and, for the progress rows, every minute
|
||||||
|
* while it is on screen. Polling pauses while the window is hidden or minimised.
|
||||||
|
*/
|
||||||
|
export const WATCH_STATE = { refetchOnWindowFocus: true } as const;
|
||||||
|
export const PROGRESS = { ...WATCH_STATE, staleTime: 15_000, refetchInterval: 60_000 } as const;
|
||||||
|
|
||||||
|
// React Query treats a visibility change as focus. Switching back to Kaleido from another
|
||||||
|
// app doesn't change visibility, so a window focus counts as well.
|
||||||
|
window.addEventListener('focus', () => queryClient.getQueryCache().onFocus());
|
||||||
|
|
||||||
|
// Keys carry the server but not the account, and another account (or a Home profile) on
|
||||||
|
// the same server sees different watch state and libraries. Whenever the credentials
|
||||||
|
// behind the connection change, nothing cached under the old ones may be shown.
|
||||||
|
useSession.subscribe((st, prev) => {
|
||||||
|
if (prev.server && st.server !== prev.server && st.server?.token !== prev.server.token) queryClient.clear();
|
||||||
|
});
|
||||||
|
|
||||||
/** Every key starts with the server so switching servers never mixes caches. */
|
/** Every key starts with the server so switching servers never mixes caches. */
|
||||||
export function useKey(...parts: unknown[]) {
|
export function useKey(...parts: unknown[]) {
|
||||||
const server = useServer();
|
const server = useServer();
|
||||||
|
|
@ -37,9 +56,9 @@ export function useSectionFor(kind: 'movie' | 'show'): { section: Section | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export const useItem = (id: string | undefined, opts: Partial<UseQueryOptions<Item>> = {}) =>
|
export const useItem = (id: string | undefined, opts: Partial<UseQueryOptions<Item>> = {}) =>
|
||||||
useServerQuery(['item', id], (s) => api.metadata(s, id!), { enabled: !!id, staleTime: 30_000, ...opts });
|
useServerQuery(['item', id], (s) => api.metadata(s, id!), { enabled: !!id, staleTime: 30_000, ...WATCH_STATE, ...opts });
|
||||||
|
|
||||||
export const useChildren = (id: string | undefined) => useServerQuery(['children', id], (s) => api.children(s, id!), { enabled: !!id, staleTime: 30_000 });
|
export const useChildren = (id: string | undefined) => useServerQuery(['children', id], (s) => api.children(s, id!), { enabled: !!id, staleTime: 30_000, ...WATCH_STATE });
|
||||||
|
|
||||||
export const useRelated = (id: string | undefined) => useServerQuery(['related', id], (s) => api.related(s, id!), { enabled: !!id, staleTime: 10 * 60_000 });
|
export const useRelated = (id: string | undefined) => useServerQuery(['related', id], (s) => api.related(s, id!), { enabled: !!id, staleTime: 10 * 60_000 });
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ export const useSession = create<SessionState>((set, get) => ({
|
||||||
|
|
||||||
async init() {
|
async init() {
|
||||||
const info = await appInfo();
|
const info = await appInfo();
|
||||||
configureClient({ version: info.version, deviceName: info.deviceName });
|
configureClient({ version: info.version, deviceName: info.deviceName, platformVersion: info.osVersion });
|
||||||
let token = await secrets.get('account-token');
|
let token = await secrets.get('account-token');
|
||||||
const stored = loadStoredServer();
|
const stored = loadStoredServer();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,8 @@ export interface Preferences {
|
||||||
countdownSeconds: number;
|
countdownSeconds: number;
|
||||||
skipIntro: SkipMode;
|
skipIntro: SkipMode;
|
||||||
skipCredits: SkipMode;
|
skipCredits: SkipMode;
|
||||||
|
/** Seconds a "Skip automatically" marker waits, so it can be cancelled; 0 skips at once. */
|
||||||
|
autoSkipDelay: number;
|
||||||
watchedPercent: number;
|
watchedPercent: number;
|
||||||
audioLanguage: string;
|
audioLanguage: string;
|
||||||
subtitleMode: SubtitleMode;
|
subtitleMode: SubtitleMode;
|
||||||
|
|
@ -62,6 +64,7 @@ export const defaults: Preferences = {
|
||||||
countdownSeconds: 8,
|
countdownSeconds: 8,
|
||||||
skipIntro: 'button',
|
skipIntro: 'button',
|
||||||
skipCredits: 'button',
|
skipCredits: 'button',
|
||||||
|
autoSkipDelay: 5,
|
||||||
watchedPercent: 90,
|
watchedPercent: 90,
|
||||||
audioLanguage: '',
|
audioLanguage: '',
|
||||||
subtitleMode: 'auto',
|
subtitleMode: 'auto',
|
||||||
|
|
|
||||||
|
|
@ -52,12 +52,16 @@ function sanitize(s: string) {
|
||||||
return s.replace(/[<>:"/\\|?*\u0000-\u001f]/g, '_').trim() || 'Untitled';
|
return s.replace(/[<>:"/\\|?*\u0000-\u001f]/g, '_').trim() || 'Untitled';
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Trims metadata kept for offline display: no extras, related hubs or raw blobs. */
|
/**
|
||||||
function slim(raw: any) {
|
* Trims metadata kept for offline display: no extras, related hubs or raw blobs, and
|
||||||
|
* only the version downloaded, so its streams describe the file that plays.
|
||||||
|
*/
|
||||||
|
function slim(raw: any, mediaIndex: number) {
|
||||||
const { Extras, Related, OnDeck, ...rest } = raw ?? {};
|
const { Extras, Related, OnDeck, ...rest } = raw ?? {};
|
||||||
void Extras;
|
void Extras;
|
||||||
void Related;
|
void Related;
|
||||||
void OnDeck;
|
void OnDeck;
|
||||||
|
if (Array.isArray(rest.Media) && rest.Media[mediaIndex]) rest.Media = [rest.Media[mediaIndex]];
|
||||||
return rest;
|
return rest;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -102,9 +106,12 @@ export const useDownloads = create<DownloadsState>((set, get) => ({
|
||||||
try {
|
try {
|
||||||
await get().init();
|
await get().init();
|
||||||
const item = await api.metadata(server, input.id);
|
const item = await api.metadata(server, input.id);
|
||||||
const media = item.media[0];
|
// A download is one file. A version split across several (CD1, CD2) would be
|
||||||
|
// kept as its first part only, so prefer a version in one piece.
|
||||||
|
const media = item.media.find((m) => m.parts.length === 1) ?? item.media[0];
|
||||||
const part = media?.parts[0];
|
const part = media?.parts[0];
|
||||||
if (!part) throw new Error('This title has no downloadable file.');
|
if (!part) throw new Error('This title has no downloadable file.');
|
||||||
|
if (media.parts.length > 1) throw new Error('This title is split across several files, which Kaleido can’t download yet.');
|
||||||
const id = get().idFor(item.id);
|
const id = get().idFor(item.id);
|
||||||
if (get().items.some((d) => d.id === id && d.status !== 'failed')) {
|
if (get().items.some((d) => d.id === id && d.status !== 'failed')) {
|
||||||
toast('This title is already in Downloads.');
|
toast('This title is already in Downloads.');
|
||||||
|
|
@ -129,7 +136,7 @@ export const useDownloads = create<DownloadsState>((set, get) => ({
|
||||||
url: server.signed(part.key, { download: 1 }),
|
url: server.signed(part.key, { download: 1 }),
|
||||||
folder,
|
folder,
|
||||||
fileName: sanitize(baseName),
|
fileName: sanitize(baseName),
|
||||||
meta: { serverId: server.machineId, serverName: server.name, ratingKey: item.id, partKey: part.key, raw: slim(item.raw) } satisfies DownloadMeta,
|
meta: { serverId: server.machineId, serverName: server.name, ratingKey: item.id, partKey: part.key, raw: slim(item.raw, item.media.indexOf(media)) } satisfies DownloadMeta,
|
||||||
assets,
|
assets,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
10
src/main.tsx
|
|
@ -13,6 +13,7 @@ import { useRouter } from './app/router';
|
||||||
import { usePlayer } from './player/store';
|
import { usePlayer } from './player/store';
|
||||||
import { useSettings } from './app/settings';
|
import { useSettings } from './app/settings';
|
||||||
import { useDownloads } from './downloads/store';
|
import { useDownloads } from './downloads/store';
|
||||||
|
import { hostOS, isMac, isNative, win } from './platform/native';
|
||||||
|
|
||||||
if (import.meta.env.DEV) (window as any).__kaleido = { useSession, useRouter, usePlayer, useSettings, useDownloads };
|
if (import.meta.env.DEV) (window as any).__kaleido = { useSession, useRouter, usePlayer, useSettings, useDownloads };
|
||||||
|
|
||||||
|
|
@ -24,6 +25,15 @@ window.addEventListener('contextmenu', (e) => {
|
||||||
|
|
||||||
installKeyboardNav();
|
installKeyboardNav();
|
||||||
|
|
||||||
|
// Platform styling: macOS keeps its traffic lights at the top left, except in
|
||||||
|
// full screen, where the system hides them.
|
||||||
|
document.documentElement.classList.add(`os-${hostOS}`);
|
||||||
|
if (isNative && isMac) {
|
||||||
|
const syncFullscreen = () => win.isFullscreen().then((fs) => document.documentElement.classList.toggle('window-fullscreen', fs));
|
||||||
|
syncFullscreen();
|
||||||
|
win.onResized(syncFullscreen);
|
||||||
|
}
|
||||||
|
|
||||||
createRoot(document.getElementById('root')!).render(
|
createRoot(document.getElementById('root')!).render(
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
<App />
|
<App />
|
||||||
|
|
|
||||||
153
src/mini/main.tsx
Normal file
|
|
@ -0,0 +1,153 @@
|
||||||
|
/**
|
||||||
|
* The miniplayer window's page (mini.html; src-tauri/src/mini.rs). The video
|
||||||
|
* is drawn beneath this transparent page by the native side; this page draws
|
||||||
|
* the controls, mirrors the main window's player (src/player/miniWindow.ts)
|
||||||
|
* and sends its buttons back. Dragging moves the whole window natively.
|
||||||
|
*/
|
||||||
|
import { StrictMode, useEffect, useState, type PointerEvent as ReactPointerEvent } from 'react';
|
||||||
|
import { createRoot } from 'react-dom/client';
|
||||||
|
import { invoke } from '@tauri-apps/api/core';
|
||||||
|
import { emitTo, listen } from '@tauri-apps/api/event';
|
||||||
|
import '@fontsource-variable/inter';
|
||||||
|
import '../styles/base.css';
|
||||||
|
import '../styles/ui.css';
|
||||||
|
import '../styles/player.css';
|
||||||
|
import './mini.css';
|
||||||
|
import { Icon } from '../ui/Icon';
|
||||||
|
import { MINI_CORNER_KEY, type MiniAction, type MiniState } from './types';
|
||||||
|
|
||||||
|
const send = (type: MiniAction) => emitTo('main', 'mini:action', { type }).catch(() => {});
|
||||||
|
|
||||||
|
window.addEventListener('contextmenu', (e) => e.preventDefault());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Drags the window: moves go to the native side one at a time, latest first
|
||||||
|
* (each is relative to where the drag began), and letting go glides it to a
|
||||||
|
* corner. A drag that ends over a button doesn't press it.
|
||||||
|
*/
|
||||||
|
function startDrag(e: ReactPointerEvent<HTMLElement>) {
|
||||||
|
if (e.button !== 0) return;
|
||||||
|
const el = e.currentTarget;
|
||||||
|
const pointer = e.pointerId;
|
||||||
|
const origin = { x: e.screenX, y: e.screenY };
|
||||||
|
const trail: { t: number; x: number; y: number }[] = [];
|
||||||
|
let dragging = false;
|
||||||
|
let started: Promise<unknown> | null = null;
|
||||||
|
let inFlight: Promise<unknown> | null = null;
|
||||||
|
let latest: { dx: number; dy: number } | null = null;
|
||||||
|
|
||||||
|
const pump = () => {
|
||||||
|
if (inFlight || !latest || !started) return;
|
||||||
|
const next = latest;
|
||||||
|
latest = null;
|
||||||
|
inFlight = started
|
||||||
|
.then(() => invoke('mini_drag', next))
|
||||||
|
.catch(() => {})
|
||||||
|
.finally(() => {
|
||||||
|
inFlight = null;
|
||||||
|
pump();
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const move = (ev: PointerEvent) => {
|
||||||
|
const dx = ev.screenX - origin.x;
|
||||||
|
const dy = ev.screenY - origin.y;
|
||||||
|
trail.push({ t: ev.timeStamp, x: ev.screenX, y: ev.screenY });
|
||||||
|
while (trail.length > 2 && ev.timeStamp - trail[0].t > 100) trail.shift();
|
||||||
|
if (!dragging) {
|
||||||
|
if (Math.hypot(dx, dy) < 4) return;
|
||||||
|
dragging = true;
|
||||||
|
document.documentElement.classList.add('dragging');
|
||||||
|
el.setPointerCapture(pointer);
|
||||||
|
started = invoke('mini_drag_start').catch(() => {});
|
||||||
|
}
|
||||||
|
latest = { dx, dy };
|
||||||
|
pump();
|
||||||
|
};
|
||||||
|
|
||||||
|
const up = async () => {
|
||||||
|
window.removeEventListener('pointermove', move);
|
||||||
|
window.removeEventListener('pointerup', up);
|
||||||
|
window.removeEventListener('pointercancel', up);
|
||||||
|
if (!dragging) return;
|
||||||
|
document.documentElement.classList.remove('dragging');
|
||||||
|
const swallow = (c: MouseEvent) => {
|
||||||
|
c.stopPropagation();
|
||||||
|
c.preventDefault();
|
||||||
|
};
|
||||||
|
window.addEventListener('click', swallow, { capture: true, once: true });
|
||||||
|
setTimeout(() => window.removeEventListener('click', swallow, { capture: true }), 0);
|
||||||
|
|
||||||
|
const first = trail[0];
|
||||||
|
const last = trail[trail.length - 1];
|
||||||
|
const dt = first && last ? Math.max(1, last.t - first.t) : 1;
|
||||||
|
const vx = first && last ? (last.x - first.x) / dt : 0;
|
||||||
|
const vy = first && last ? (last.y - first.y) / dt : 0;
|
||||||
|
// The last move lands before the glide begins.
|
||||||
|
while (inFlight || latest) await (inFlight ?? Promise.resolve(pump()));
|
||||||
|
const corner = await invoke<string>('mini_snap', { vx, vy }).catch(() => '');
|
||||||
|
if (corner) localStorage.setItem(MINI_CORNER_KEY, corner);
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener('pointermove', move);
|
||||||
|
window.addEventListener('pointerup', up);
|
||||||
|
window.addEventListener('pointercancel', up);
|
||||||
|
}
|
||||||
|
|
||||||
|
function Mini() {
|
||||||
|
const [s, setS] = useState<MiniState | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const unlisten = listen<MiniState>('mini:state', (e) => setS(e.payload));
|
||||||
|
unlisten.then(() => send('ready'));
|
||||||
|
return () => void unlisten.then((f) => f());
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
if (!s) return <div className="mini-player loading" />;
|
||||||
|
const pct = s.duration ? Math.min(100, (s.position / s.duration) * 100) : 0;
|
||||||
|
return (
|
||||||
|
<div className={`mini-player${s.loading || s.error ? ' loading' : ''}`} onPointerDown={startDrag} onDoubleClick={() => send('expand')}>
|
||||||
|
<div className="mini-scrim" />
|
||||||
|
<div className="mini-top">
|
||||||
|
<button className="mini-icon" aria-label="Back to full screen player" title="Expand" onClick={() => send('expand')}>
|
||||||
|
<Icon name="expand" size={17} />
|
||||||
|
</button>
|
||||||
|
<button className="mini-icon" aria-label="Stop playback" title="Close" onClick={() => send('close')}>
|
||||||
|
<Icon name="x" size={18} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div className="mini-center">
|
||||||
|
{(s.loading || s.buffering) && !s.error ? (
|
||||||
|
<span className="spinner" style={{ width: 30, height: 30 }} aria-label="Loading" />
|
||||||
|
) : s.error ? (
|
||||||
|
<span className="mini-error">Playback stopped</span>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<button className="mini-icon" aria-label="Back 10 seconds" onClick={() => send('back')}>
|
||||||
|
<Icon name="replay10" size={22} />
|
||||||
|
</button>
|
||||||
|
<button className="mini-icon big" aria-label={s.paused ? 'Play' : 'Pause'} onClick={() => send('toggle')}>
|
||||||
|
<Icon name={s.paused || s.ended ? 'play' : 'pause'} size={26} />
|
||||||
|
</button>
|
||||||
|
<button className="mini-icon" aria-label="Forward 10 seconds" onClick={() => send('forward')}>
|
||||||
|
<Icon name="forward10" size={22} />
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="mini-caption">
|
||||||
|
<b>{s.title}</b>
|
||||||
|
{s.subtitle && <span>{s.subtitle}</span>}
|
||||||
|
</div>
|
||||||
|
<div className="mini-progress">
|
||||||
|
<i style={{ width: `${pct}%` }} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
createRoot(document.getElementById('root')!).render(
|
||||||
|
<StrictMode>
|
||||||
|
<Mini />
|
||||||
|
</StrictMode>,
|
||||||
|
);
|
||||||
32
src/mini/mini.css
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
/* The miniplayer window (mini.html): the page is transparent over the video
|
||||||
|
and the box fills the window, whose corners Windows rounds. */
|
||||||
|
html.mini-window,
|
||||||
|
html.mini-window body,
|
||||||
|
html.mini-window #root {
|
||||||
|
height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
html.mini-window .mini-player {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
width: auto;
|
||||||
|
height: auto;
|
||||||
|
border-radius: 0;
|
||||||
|
box-shadow: none;
|
||||||
|
animation: none;
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
html.mini-window.dragging .mini-player {
|
||||||
|
cursor: grabbing;
|
||||||
|
}
|
||||||
|
/* While dragged, the title stays and the buttons step back. */
|
||||||
|
html.mini-window.dragging .mini-scrim,
|
||||||
|
html.mini-window.dragging .mini-caption {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
html.mini-window.dragging .mini-top,
|
||||||
|
html.mini-window.dragging .mini-center {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
17
src/mini/types.ts
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
/** What the miniplayer window shows, sent from the main window (src/player/miniWindow.ts). */
|
||||||
|
export interface MiniState {
|
||||||
|
title: string;
|
||||||
|
subtitle: string;
|
||||||
|
paused: boolean;
|
||||||
|
ended: boolean;
|
||||||
|
position: number;
|
||||||
|
duration: number;
|
||||||
|
loading: boolean;
|
||||||
|
buffering: boolean;
|
||||||
|
error: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Buttons and gestures in the miniplayer window, carried out by the main window's player. */
|
||||||
|
export type MiniAction = 'ready' | 'toggle' | 'back' | 'forward' | 'expand' | 'close';
|
||||||
|
|
||||||
|
export const MINI_CORNER_KEY = 'kaleido.miniCorner';
|
||||||
|
|
@ -7,6 +7,16 @@ import type { UnlistenFn } from '@tauri-apps/api/event';
|
||||||
|
|
||||||
export const isNative = typeof window !== 'undefined' && '__TAURI_INTERNALS__' in window;
|
export const isNative = typeof window !== 'undefined' && '__TAURI_INTERNALS__' in window;
|
||||||
|
|
||||||
|
/** The host OS, known synchronously from the web view (WebView2, WKWebView, WebKitGTK). */
|
||||||
|
export const hostOS: 'windows' | 'macos' | 'linux' =
|
||||||
|
typeof navigator !== 'undefined' && /Macintosh|Mac OS X/.test(navigator.userAgent) ? 'macos' : typeof navigator !== 'undefined' && /Linux|X11/.test(navigator.userAgent) ? 'linux' : 'windows';
|
||||||
|
export const isMac = hostOS === 'macos';
|
||||||
|
|
||||||
|
/** A shortcut with the platform's command key: "⌘K" on macOS, "Ctrl + K" elsewhere. */
|
||||||
|
export const shortcut = (key: string) => (isMac ? `⌘${key}` : `Ctrl + ${key}`);
|
||||||
|
/** How the window enters full screen from the keyboard. */
|
||||||
|
export const fullscreenShortcut = isMac ? '⌃⌘F' : 'F11';
|
||||||
|
|
||||||
export async function invoke<T>(cmd: string, args?: Record<string, unknown>): Promise<T> {
|
export async function invoke<T>(cmd: string, args?: Record<string, unknown>): Promise<T> {
|
||||||
if (!isNative) throw new Error(`${cmd} is only available in the desktop app.`);
|
if (!isNative) throw new Error(`${cmd} is only available in the desktop app.`);
|
||||||
const { invoke } = await import('@tauri-apps/api/core');
|
const { invoke } = await import('@tauri-apps/api/core');
|
||||||
|
|
@ -47,6 +57,7 @@ export interface AppInfo {
|
||||||
dataDir: string;
|
dataDir: string;
|
||||||
defaultDownloadDir: string;
|
defaultDownloadDir: string;
|
||||||
platform: string;
|
platform: string;
|
||||||
|
osVersion: string;
|
||||||
deviceName: string;
|
deviceName: string;
|
||||||
/** Graphics adapters by name (empty where not reported). */
|
/** Graphics adapters by name (empty where not reported). */
|
||||||
gpus: string[];
|
gpus: string[];
|
||||||
|
|
@ -57,7 +68,7 @@ export async function appInfo(): Promise<AppInfo> {
|
||||||
if (info) return info;
|
if (info) return info;
|
||||||
info = isNative
|
info = isNative
|
||||||
? await invoke<AppInfo>('app_info')
|
? await invoke<AppInfo>('app_info')
|
||||||
: { version: '0.1.0-dev', dataDir: '', defaultDownloadDir: '', platform: 'browser', deviceName: 'Browser preview', gpus: [] };
|
: { version: '0.1.0-dev', dataDir: '', defaultDownloadDir: '', platform: 'browser', osVersion: '', deviceName: 'Browser preview', gpus: [] };
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -107,6 +118,10 @@ export const win = {
|
||||||
await w.setFocus();
|
await w.setFocus();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
/** The OS's own window buttons (the macOS traffic lights); elsewhere the page draws them. */
|
||||||
|
async setButtonsVisible(visible: boolean) {
|
||||||
|
if (isNative && isMac) await invoke('window_buttons', { visible }).catch(() => {});
|
||||||
|
},
|
||||||
async onResized(cb: () => void): Promise<UnlistenFn> {
|
async onResized(cb: () => void): Promise<UnlistenFn> {
|
||||||
if (!isNative) {
|
if (!isNative) {
|
||||||
window.addEventListener('resize', cb);
|
window.addEventListener('resize', cb);
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { useCallback, useEffect, useRef, useState, type ReactNode } from 'react';
|
import { useCallback, useEffect, useRef, useState, type PointerEvent as ReactPointerEvent, type ReactNode } from 'react';
|
||||||
import { usePlayer } from './store';
|
import { usePlayer } from './store';
|
||||||
import { useSession } from '../app/session';
|
import { useSession } from '../app/session';
|
||||||
import { useSettings, QUALITY_LABEL, UPSCALING, type Quality, type SubtitleBox, type Upscaling } from '../app/settings';
|
import { useSettings, QUALITY_LABEL, UPSCALING, type Quality, type SubtitleBox, type Upscaling } from '../app/settings';
|
||||||
|
|
@ -10,9 +10,11 @@ import { win, isNative } from '../platform/native';
|
||||||
import { WindowControls } from '../app/TopBar';
|
import { WindowControls } from '../app/TopBar';
|
||||||
import { navigate } from '../app/router';
|
import { navigate } from '../app/router';
|
||||||
import { mpv } from './engine';
|
import { mpv } from './engine';
|
||||||
|
import { separateMini } from './miniWindow';
|
||||||
import { PREPARING_NOTICE_MS, UPSCALING_ORDER, hasFailed, readDiagnostics, requestEnhancement, tierAvailable, toggleBypass, type Diagnostics } from './enhance';
|
import { PREPARING_NOTICE_MS, UPSCALING_ORDER, hasFailed, readDiagnostics, requestEnhancement, tierAvailable, toggleBypass, type Diagnostics } from './enhance';
|
||||||
import { toast } from '../ui/overlays';
|
import { toast } from '../ui/overlays';
|
||||||
import type { Item } from '../plex/types';
|
import type { Item } from '../plex/types';
|
||||||
|
import { PostPlay } from './PostPlay';
|
||||||
|
|
||||||
const HIDE_AFTER = 3000;
|
const HIDE_AFTER = 3000;
|
||||||
|
|
||||||
|
|
@ -491,69 +493,103 @@ function Volume() {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** A seek that lands inside a marker this recently means the viewer chose to be there. */
|
||||||
|
const SEEK_GRACE_MS = 1500;
|
||||||
|
const MODIFIER_KEYS = new Set(['Shift', 'Control', 'Alt', 'Meta', 'AltGraph', 'CapsLock']);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Skip intro / Skip credits. With "Skip automatically" the button counts down for the
|
||||||
|
* chosen delay, filling as it goes, then skips. Pausing, seeking or pressing a key
|
||||||
|
* before then keeps watching: the button stays as a plain skip for the rest of the marker.
|
||||||
|
*/
|
||||||
function SkipButton() {
|
function SkipButton() {
|
||||||
const item = usePlayer((s) => s.item);
|
const item = usePlayer((s) => s.item);
|
||||||
const position = usePlayer((s) => s.position);
|
const position = usePlayer((s) => s.position);
|
||||||
const seek = usePlayer((s) => s.seek);
|
const seek = usePlayer((s) => s.seek);
|
||||||
const nextUp = usePlayer((s) => s.nextUp);
|
|
||||||
const countdown = usePlayer((s) => s.countdown);
|
const countdown = usePlayer((s) => s.countdown);
|
||||||
|
const postPlayDismissed = usePlayer((s) => s.postPlayDismissed);
|
||||||
|
const paused = usePlayer((s) => s.paused);
|
||||||
|
const ready = usePlayer((s) => s.firstFrame);
|
||||||
|
const lastSeek = usePlayer((s) => s.lastSeek);
|
||||||
const skipIntro = useSettings((s) => s.skipIntro);
|
const skipIntro = useSettings((s) => s.skipIntro);
|
||||||
const skipCredits = useSettings((s) => s.skipCredits);
|
const skipCredits = useSettings((s) => s.skipCredits);
|
||||||
const autoSkipped = useRef(new Set<string>());
|
const delay = useSettings((s) => s.autoSkipDelay);
|
||||||
|
// Markers already skipped, or whose automatic skip was cancelled, don't count down again.
|
||||||
|
const settled = useRef(new Set<string>());
|
||||||
|
const [pending, setPending] = useState<{ key: string; from: number } | null>(null);
|
||||||
const ms = position * 1000;
|
const ms = position * 1000;
|
||||||
const marker = item?.markers.find((m) => (m.type === 'intro' || m.type === 'credits') && ms >= m.start && ms < m.end - 1000);
|
const marker = item?.markers.find((m) => (m.type === 'intro' || m.type === 'credits') && ms >= m.start && ms < m.end - 1000);
|
||||||
const mode = marker?.type === 'intro' ? skipIntro : skipCredits;
|
const key = item && marker ? `${item.id}:${marker.type}:${marker.start}` : '';
|
||||||
|
const episodeCredits = marker?.type === 'credits' && item?.type === 'episode';
|
||||||
|
const mode = marker?.type === 'intro' ? skipIntro : episodeCredits ? 'button' : skipCredits;
|
||||||
|
const auto = !!marker && !episodeCredits && mode === 'auto';
|
||||||
|
const counting = pending && pending.key === key ? pending : null;
|
||||||
|
|
||||||
|
const skip = () => {
|
||||||
|
if (!marker) return;
|
||||||
|
settled.current.add(key);
|
||||||
|
setPending(null);
|
||||||
|
if (marker.type === 'credits' && item?.type === 'episode') usePlayer.getState().showPostPlay();
|
||||||
|
else seek(marker.end / 1000);
|
||||||
|
};
|
||||||
|
const cancel = () => {
|
||||||
|
if (!pending) return;
|
||||||
|
settled.current.add(pending.key);
|
||||||
|
setPending(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Start counting once an automatic marker is playing.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (marker && mode === 'auto' && !autoSkipped.current.has(marker.id + marker.start) && !(marker.type === 'credits' && nextUp)) {
|
if (!auto || !ready || paused || settled.current.has(key) || pending?.key === key) return;
|
||||||
autoSkipped.current.add(marker.id + marker.start);
|
if (Date.now() - usePlayer.getState().lastSeek < SEEK_GRACE_MS) {
|
||||||
seek(marker.end / 1000);
|
settled.current.add(key);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}, [marker?.id, marker?.start, mode]);
|
if (delay <= 0) return skip();
|
||||||
if (!marker || mode === 'off' || countdown !== null) return null;
|
setPending({ key, from: usePlayer.getState().position });
|
||||||
if (marker.type === 'credits' && nextUp) return null;
|
}, [key, auto, ready, paused, delay]);
|
||||||
|
|
||||||
|
// Count playback time, so buffering doesn't eat into the delay.
|
||||||
|
useEffect(() => {
|
||||||
|
if (counting && position - counting.from >= delay) skip();
|
||||||
|
else if (pending && !counting) setPending(null);
|
||||||
|
}, [position, key]);
|
||||||
|
|
||||||
|
// Pausing or seeking means the viewer is watching.
|
||||||
|
useEffect(() => {
|
||||||
|
if (paused) cancel();
|
||||||
|
}, [paused]);
|
||||||
|
useEffect(cancel, [lastSeek]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!counting) return;
|
||||||
|
const onKey = (e: KeyboardEvent) => {
|
||||||
|
if (!MODIFIER_KEYS.has(e.key)) cancel();
|
||||||
|
};
|
||||||
|
window.addEventListener('keydown', onKey, true);
|
||||||
|
return () => window.removeEventListener('keydown', onKey, true);
|
||||||
|
}, [counting]);
|
||||||
|
|
||||||
|
if (!marker || (episodeCredits && !postPlayDismissed) || mode === 'off' || countdown !== null) return null;
|
||||||
|
const what = marker.type === 'intro' ? 'intro' : 'credits';
|
||||||
|
const elapsed = counting ? Math.max(0, position - counting.from) : 0;
|
||||||
return (
|
return (
|
||||||
<button className="skip-button" onClick={() => seek(marker.end / 1000)}>
|
<button
|
||||||
{marker.type === 'intro' ? 'Skip intro' : 'Skip credits'}
|
className={`skip-button${counting ? ' counting' : ''}`}
|
||||||
|
style={counting ? { ['--p' as string]: `${Math.min(1, elapsed / delay) * 100}%` } : undefined}
|
||||||
|
title={counting ? 'Click to skip now. Pause, seek or press any key to keep watching.' : undefined}
|
||||||
|
onClick={(e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
skip();
|
||||||
|
}}
|
||||||
|
onDoubleClick={(e) => e.stopPropagation()}
|
||||||
|
>
|
||||||
|
<span>{counting ? `Skipping ${what}` : `Skip ${what}`}</span>
|
||||||
<Icon name="skipNext" size={16} />
|
<Icon name="skipNext" size={16} />
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function PostPlay() {
|
|
||||||
const server = useSession((s) => s.server);
|
|
||||||
const nextUp = usePlayer((s) => s.nextUp);
|
|
||||||
const countdown = usePlayer((s) => s.countdown);
|
|
||||||
const playNext = usePlayer((s) => s.playNext);
|
|
||||||
const cancel = usePlayer((s) => s.cancelCountdown);
|
|
||||||
if (!nextUp || countdown === null || !server) return null;
|
|
||||||
return (
|
|
||||||
<div className="post-play" onClick={(e) => e.stopPropagation()} onDoubleClick={(e) => e.stopPropagation()}>
|
|
||||||
<div className="post-play-art">
|
|
||||||
<img src={server.image(nextUp.thumb, 360, 202)} alt="" draggable={false} />
|
|
||||||
{countdown > 0 && (
|
|
||||||
<svg className="post-play-ring" viewBox="0 0 40 40">
|
|
||||||
<circle cx="20" cy="20" r="17" />
|
|
||||||
</svg>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="post-play-text">
|
|
||||||
<span className="micro">Next episode{countdown > 0 ? ` in ${countdown}` : ''}</span>
|
|
||||||
<b>
|
|
||||||
{episodeLabel(nextUp)} · {nextUp.title}
|
|
||||||
</b>
|
|
||||||
<div className="actions">
|
|
||||||
<Button variant="primary" size="sm" icon="play" onClick={playNext}>
|
|
||||||
Play now
|
|
||||||
</Button>
|
|
||||||
<Button variant="ghost" size="sm" onClick={cancel}>
|
|
||||||
{countdown > 0 ? 'Cancel' : 'Dismiss'}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The title opens its show or movie page, with playback moving to the miniplayer. */
|
/** The title opens its show or movie page, with playback moving to the miniplayer. */
|
||||||
function openFromPlayer(id: string | undefined) {
|
function openFromPlayer(id: string | undefined) {
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
|
|
@ -583,18 +619,62 @@ function TitleBlock({ item }: { item: Item }) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Where the miniplayer was dragged to: its distance from the window's right and bottom edges. */
|
||||||
|
type MiniPos = { x: number; y: number };
|
||||||
|
const MINI_POS_KEY = 'kaleido.miniPosition';
|
||||||
|
const MINI_MARGIN = 8;
|
||||||
|
let miniPos: MiniPos | null | undefined;
|
||||||
|
|
||||||
|
function savedMiniPos(): MiniPos | null {
|
||||||
|
if (miniPos === undefined) {
|
||||||
|
try {
|
||||||
|
const p = JSON.parse(localStorage.getItem(MINI_POS_KEY) ?? 'null');
|
||||||
|
miniPos = p && Number.isFinite(p.x) && Number.isFinite(p.y) ? p : null;
|
||||||
|
} catch {
|
||||||
|
miniPos = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return miniPos ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Keeps the whole box inside the window. */
|
||||||
|
function clampMini(el: HTMLElement, pos: MiniPos): MiniPos {
|
||||||
|
const cs = getComputedStyle(el);
|
||||||
|
const maxX = window.innerWidth - parseFloat(cs.width) - MINI_MARGIN;
|
||||||
|
const maxY = window.innerHeight - parseFloat(cs.height) - MINI_MARGIN;
|
||||||
|
return { x: Math.round(Math.max(MINI_MARGIN, Math.min(maxX, pos.x))), y: Math.round(Math.max(MINI_MARGIN, Math.min(maxY, pos.y))) };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The box and the page's hole for the video (base.css) both follow these. */
|
||||||
|
function applyMiniPos(pos: MiniPos | null) {
|
||||||
|
const root = document.documentElement.style;
|
||||||
|
if (!pos) {
|
||||||
|
root.removeProperty('--mini-x');
|
||||||
|
root.removeProperty('--mini-y');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
root.setProperty('--mini-x', `${pos.x}px`);
|
||||||
|
root.setProperty('--mini-y', `${pos.y}px`);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Playing in the corner while browsing. The native video is drawn into this
|
* Playing in the corner while browsing, and draggable anywhere in the window.
|
||||||
* box's rectangle and the page has a matching hole (see `html.player-mini`).
|
* The native video is drawn into this box's rectangle and the page has a
|
||||||
|
* matching hole (see `html.player-mini`).
|
||||||
*/
|
*/
|
||||||
function MiniPlayer() {
|
function MiniPlayer() {
|
||||||
const st = usePlayer();
|
const st = usePlayer();
|
||||||
const box = useRef<HTMLDivElement>(null);
|
const box = useRef<HTMLDivElement>(null);
|
||||||
|
const placeVideo = useRef(() => {});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const el = box.current;
|
const el = box.current;
|
||||||
if (!el) return;
|
if (!el) return;
|
||||||
let frame = 0;
|
let frame = 0;
|
||||||
|
const fit = () => {
|
||||||
|
const saved = savedMiniPos();
|
||||||
|
applyMiniPos(saved && clampMini(el, saved));
|
||||||
|
};
|
||||||
const place = () => {
|
const place = () => {
|
||||||
cancelAnimationFrame(frame);
|
cancelAnimationFrame(frame);
|
||||||
frame = requestAnimationFrame(() => {
|
frame = requestAnimationFrame(() => {
|
||||||
|
|
@ -610,23 +690,64 @@ function MiniPlayer() {
|
||||||
if (isNative) mpv.rect({ x: x * dpr - 1, y: y * dpr - 1, width: width * dpr + 2, height: height * dpr + 2 }).catch(() => {});
|
if (isNative) mpv.rect({ x: x * dpr - 1, y: y * dpr - 1, width: width * dpr + 2, height: height * dpr + 2 }).catch(() => {});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
place();
|
placeVideo.current = place;
|
||||||
|
const onResize = () => {
|
||||||
|
fit();
|
||||||
|
place();
|
||||||
|
};
|
||||||
|
onResize();
|
||||||
const ro = new ResizeObserver(place);
|
const ro = new ResizeObserver(place);
|
||||||
ro.observe(el);
|
ro.observe(el);
|
||||||
window.addEventListener('resize', place);
|
window.addEventListener('resize', onResize);
|
||||||
return () => {
|
return () => {
|
||||||
cancelAnimationFrame(frame);
|
cancelAnimationFrame(frame);
|
||||||
ro.disconnect();
|
ro.disconnect();
|
||||||
window.removeEventListener('resize', place);
|
window.removeEventListener('resize', onResize);
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
const startDrag = (e: ReactPointerEvent) => {
|
||||||
|
const el = box.current;
|
||||||
|
if (e.button !== 0 || !el) return;
|
||||||
|
const cs = getComputedStyle(el);
|
||||||
|
const start = { px: e.clientX, py: e.clientY, x: parseFloat(cs.right), y: parseFloat(cs.bottom) };
|
||||||
|
let dragging = false;
|
||||||
|
const move = (ev: PointerEvent) => {
|
||||||
|
const dx = ev.clientX - start.px;
|
||||||
|
const dy = ev.clientY - start.py;
|
||||||
|
if (!dragging && Math.hypot(dx, dy) < 5) return;
|
||||||
|
dragging = true;
|
||||||
|
el.classList.add('dragging');
|
||||||
|
miniPos = clampMini(el, { x: start.x - dx, y: start.y - dy });
|
||||||
|
applyMiniPos(miniPos);
|
||||||
|
placeVideo.current();
|
||||||
|
};
|
||||||
|
const up = () => {
|
||||||
|
window.removeEventListener('pointermove', move);
|
||||||
|
window.removeEventListener('pointerup', up);
|
||||||
|
window.removeEventListener('pointercancel', up);
|
||||||
|
if (!dragging) return;
|
||||||
|
el.classList.remove('dragging');
|
||||||
|
localStorage.setItem(MINI_POS_KEY, JSON.stringify(miniPos));
|
||||||
|
// Letting go after a drag isn't a click on the button under the pointer.
|
||||||
|
const swallow = (c: MouseEvent) => {
|
||||||
|
c.stopPropagation();
|
||||||
|
c.preventDefault();
|
||||||
|
};
|
||||||
|
window.addEventListener('click', swallow, { capture: true, once: true });
|
||||||
|
setTimeout(() => window.removeEventListener('click', swallow, { capture: true }), 0);
|
||||||
|
};
|
||||||
|
window.addEventListener('pointermove', move);
|
||||||
|
window.addEventListener('pointerup', up);
|
||||||
|
window.addEventListener('pointercancel', up);
|
||||||
|
};
|
||||||
|
|
||||||
if (!st.item) return null;
|
if (!st.item) return null;
|
||||||
const item = st.item;
|
const item = st.item;
|
||||||
const loading = !st.firstFrame && !st.error;
|
const loading = !st.firstFrame && !st.error;
|
||||||
const pct = st.duration ? Math.min(100, (st.position / st.duration) * 100) : 0;
|
const pct = st.duration ? Math.min(100, (st.position / st.duration) * 100) : 0;
|
||||||
return (
|
return (
|
||||||
<div ref={box} className={`mini-player${loading || st.error ? ' loading' : ''}`} onDoubleClick={() => st.expand()}>
|
<div ref={box} className={`mini-player${loading || st.error ? ' loading' : ''}`} onPointerDown={startDrag} onDoubleClick={() => st.expand()}>
|
||||||
<div className="mini-scrim" />
|
<div className="mini-scrim" />
|
||||||
<div className="mini-top">
|
<div className="mini-top">
|
||||||
<button className="mini-icon" aria-label="Back to full screen player" title="Expand" onClick={() => st.expand()}>
|
<button className="mini-icon" aria-label="Back to full screen player" title="Expand" onClick={() => st.expand()}>
|
||||||
|
|
@ -637,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>
|
||||||
|
|
@ -690,6 +811,9 @@ export function PlayerOverlay() {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!st.open || st.mini) return;
|
if (!st.open || st.mini) return;
|
||||||
const onKey = async (e: KeyboardEvent) => {
|
const onKey = async (e: KeyboardEvent) => {
|
||||||
|
// Up Next owns Tab, Space/Enter and Escape; player shortcuts must not
|
||||||
|
// seek or change volume while a viewer is browsing its episode rows.
|
||||||
|
if (usePlayer.getState().postPlay) return;
|
||||||
if ((e.target as HTMLElement)?.tagName === 'INPUT' && (e.target as HTMLInputElement).type !== 'range') return;
|
if ((e.target as HTMLElement)?.tagName === 'INPUT' && (e.target as HTMLInputElement).type !== 'range') return;
|
||||||
const p = usePlayer.getState();
|
const p = usePlayer.getState();
|
||||||
let handled = true;
|
let handled = true;
|
||||||
|
|
@ -732,6 +856,11 @@ export function PlayerOverlay() {
|
||||||
if (e.shiftKey && p.nextUp) p.playNext();
|
if (e.shiftKey && p.nextUp) p.playNext();
|
||||||
else handled = false;
|
else handled = false;
|
||||||
break;
|
break;
|
||||||
|
case 'p':
|
||||||
|
case 'P':
|
||||||
|
if (e.shiftKey && p.prevUp) p.playPrevious();
|
||||||
|
else handled = false;
|
||||||
|
break;
|
||||||
case 'u':
|
case 'u':
|
||||||
case 'U': {
|
case 'U': {
|
||||||
const prefs = useSettings.getState();
|
const prefs = useSettings.getState();
|
||||||
|
|
@ -781,8 +910,18 @@ export function PlayerOverlay() {
|
||||||
return () => window.removeEventListener('keydown', onKey);
|
return () => window.removeEventListener('keydown', onKey);
|
||||||
}, [st.open, st.mini, seekStep, poke]);
|
}, [st.open, st.mini, seekStep, poke]);
|
||||||
|
|
||||||
|
// The macOS traffic lights fade with the rest of the player's chrome.
|
||||||
|
const chromeHidden = st.open && !st.mini && !st.postPlay && !visible && st.firstFrame && !st.error;
|
||||||
|
useEffect(() => {
|
||||||
|
if (!chromeHidden) return;
|
||||||
|
win.setButtonsVisible(false);
|
||||||
|
return () => void win.setButtonsVisible(true);
|
||||||
|
}, [chromeHidden]);
|
||||||
|
|
||||||
if (!st.open || !st.item) return null;
|
if (!st.open || !st.item) return null;
|
||||||
if (st.mini) return <MiniPlayer />;
|
// On Windows the miniplayer is a window of its own (miniWindow.ts).
|
||||||
|
if (st.mini) return separateMini ? null : <MiniPlayer />;
|
||||||
|
if (st.postPlay && !st.error) return <PostPlay key={st.item.id} />;
|
||||||
const item = st.item;
|
const item = st.item;
|
||||||
const loading = !st.firstFrame && !st.error;
|
const loading = !st.firstFrame && !st.error;
|
||||||
const art = item.type === 'episode' ? item.grandparentArt || item.art : item.art;
|
const art = item.type === 'episode' ? item.grandparentArt || item.art : item.art;
|
||||||
|
|
@ -826,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>
|
||||||
|
|
@ -868,7 +1009,6 @@ export function PlayerOverlay() {
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<SkipButton />
|
<SkipButton />
|
||||||
<PostPlay />
|
|
||||||
|
|
||||||
{!st.error && (
|
{!st.error && (
|
||||||
<div className="player-bottom" onClick={(e) => e.stopPropagation()} onDoubleClick={(e) => e.stopPropagation()}>
|
<div className="player-bottom" onClick={(e) => e.stopPropagation()} onDoubleClick={(e) => e.stopPropagation()}>
|
||||||
|
|
@ -879,25 +1019,50 @@ export function PlayerOverlay() {
|
||||||
<Timeline onScrub={setScrubbing} />
|
<Timeline onScrub={setScrubbing} />
|
||||||
<div className="player-controls">
|
<div className="player-controls">
|
||||||
<div className="player-controls-left">
|
<div className="player-controls-left">
|
||||||
<button className="player-icon big" aria-label={st.paused ? 'Play' : 'Pause'} onClick={() => st.togglePause()}>
|
|
||||||
<Icon name={st.paused || st.ended ? 'play' : 'pause'} size={26} />
|
|
||||||
</button>
|
|
||||||
<button className="player-icon" aria-label="Back 10 seconds" onClick={() => st.seekBy(-10)}>
|
|
||||||
<Icon name="replay10" size={24} />
|
|
||||||
</button>
|
|
||||||
<button className="player-icon" aria-label="Forward 10 seconds" onClick={() => st.seekBy(10)}>
|
|
||||||
<Icon name="forward10" size={24} />
|
|
||||||
</button>
|
|
||||||
{st.nextUp && (
|
|
||||||
<button className="player-icon" aria-label="Next episode" title={`Next: ${episodeLabel(st.nextUp)} ${st.nextUp.title}`} onClick={() => st.playNext()}>
|
|
||||||
<Icon name="skipNext" size={22} />
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
<Volume />
|
<Volume />
|
||||||
<span className="player-time">
|
<span className="player-time">
|
||||||
{clock(st.position, st.duration >= 3600)} <span className="dim">/ {clock(st.duration, st.duration >= 3600)}</span>
|
{clock(st.position, st.duration >= 3600)} <span className="dim">/ {clock(st.duration, st.duration >= 3600)}</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
<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. */}
|
||||||
|
{item.type === 'episode' && (
|
||||||
|
<button
|
||||||
|
className="player-icon"
|
||||||
|
aria-label="Previous episode"
|
||||||
|
title={st.prevUp ? `Previous: ${episodeLabel(st.prevUp)} ${st.prevUp.title}` : undefined}
|
||||||
|
disabled={!st.prevUp}
|
||||||
|
onClick={() => st.playPrevious()}
|
||||||
|
>
|
||||||
|
<Icon name="skipPrev" size={22} />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
<button className="player-icon" aria-label="Back 10 seconds" onClick={() => st.seekBy(-10)}>
|
||||||
|
<Icon name="replay10" size={24} />
|
||||||
|
</button>
|
||||||
|
<button className="player-icon big" aria-label={st.paused ? 'Play' : 'Pause'} onClick={() => st.togglePause()}>
|
||||||
|
<Icon name={st.paused || st.ended ? 'play' : 'pause'} size={28} />
|
||||||
|
</button>
|
||||||
|
<button className="player-icon" aria-label="Forward 10 seconds" onClick={() => st.seekBy(10)}>
|
||||||
|
<Icon name="forward10" size={24} />
|
||||||
|
</button>
|
||||||
|
{item.type === 'episode' && (
|
||||||
|
<button
|
||||||
|
className="player-icon"
|
||||||
|
aria-label="Next episode"
|
||||||
|
title={st.nextUp ? `Next: ${episodeLabel(st.nextUp)} ${st.nextUp.title}` : undefined}
|
||||||
|
disabled={!st.nextUp}
|
||||||
|
onClick={() => st.playNext()}
|
||||||
|
>
|
||||||
|
<Icon name="skipNext" size={22} />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
<button className="player-icon" aria-label="Stop playback" title="Stop" onClick={() => st.close()}>
|
||||||
|
<Icon name="stop" size={19} />
|
||||||
|
</button>
|
||||||
|
</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')}>
|
||||||
<Icon name="captions" size={23} />
|
<Icon name="captions" size={23} />
|
||||||
|
|
|
||||||
334
src/player/PostPlay.tsx
Normal file
|
|
@ -0,0 +1,334 @@
|
||||||
|
import { useEffect, useLayoutEffect, useMemo, useRef } from 'react';
|
||||||
|
import { useQuery } from '@tanstack/react-query';
|
||||||
|
import { usePlayer } from './store';
|
||||||
|
import { mpv } from './engine';
|
||||||
|
import { isNative } from '../platform/native';
|
||||||
|
import { useSession } from '../app/session';
|
||||||
|
import { navigate } from '../app/router';
|
||||||
|
import { art, clock, duration, episodeLabel } from '../app/format';
|
||||||
|
import * as api from '../plex/api';
|
||||||
|
import type { Item } from '../plex/types';
|
||||||
|
import { Backdrop } from '../ui/Backdrop';
|
||||||
|
import { Facts, Shelf, TitleArt } from '../ui/media';
|
||||||
|
import { Artwork } from '../ui/primitives';
|
||||||
|
import { Icon } from '../ui/Icon';
|
||||||
|
import { WindowControls } from '../app/TopBar';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Up Next, adapted from Kaleido for Android TV: the credits keep playing in the
|
||||||
|
* top-left corner (the native video is drawn into that rectangle, with a matching
|
||||||
|
* hole in the page) beside the next episode, with the season and related shows
|
||||||
|
* below. Play next episode carries the one countdown; moving the mouse, clicking,
|
||||||
|
* scrolling or pressing a key stops it. Clicking the video, or Esc, returns to it.
|
||||||
|
*/
|
||||||
|
export function PostPlay() {
|
||||||
|
const item = usePlayer((s) => s.item)!;
|
||||||
|
const nextUp = usePlayer((s) => s.nextUp);
|
||||||
|
const contextReady = usePlayer((s) => s.episodeContextReady);
|
||||||
|
const fullscreen = usePlayer((s) => s.fullscreen);
|
||||||
|
const server = useSession((s) => s.server);
|
||||||
|
const root = useRef<HTMLDivElement>(null);
|
||||||
|
const video = useRef<HTMLButtonElement>(null);
|
||||||
|
const play = useRef<HTMLButtonElement>(null);
|
||||||
|
|
||||||
|
// The listed episode lacks the rating and full synopsis.
|
||||||
|
const details = useQuery({
|
||||||
|
queryKey: [server?.machineId, 'item', nextUp?.id],
|
||||||
|
queryFn: () => api.metadata(server!, nextUp!.id),
|
||||||
|
enabled: !!server && !!nextUp,
|
||||||
|
staleTime: 30_000,
|
||||||
|
});
|
||||||
|
const upcoming = nextUp && details.data?.id === nextUp.id ? details.data : nextUp;
|
||||||
|
|
||||||
|
useVideoRect(root, video);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
(play.current ?? video.current)?.focus({ preventScroll: true });
|
||||||
|
const stop = () => {
|
||||||
|
if (usePlayer.getState().countdown !== null) usePlayer.getState().cancelCountdown();
|
||||||
|
};
|
||||||
|
// Layout changes can send a mousemove without the mouse moving.
|
||||||
|
const move = (e: MouseEvent) => (e.movementX || e.movementY) && stop();
|
||||||
|
const key = (e: KeyboardEvent) => {
|
||||||
|
stop();
|
||||||
|
if (e.key === 'Escape' || e.key === 'Backspace') {
|
||||||
|
e.preventDefault();
|
||||||
|
usePlayer.getState().dismissPostPlay();
|
||||||
|
} else if (e.key === 'F11' || ((e.key === 'f' || e.key === 'F') && !e.ctrlKey && !e.metaKey && !e.altKey)) {
|
||||||
|
e.preventDefault();
|
||||||
|
usePlayer.getState().toggleFullscreen();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const opts = { capture: true, passive: true };
|
||||||
|
window.addEventListener('keydown', key, true);
|
||||||
|
window.addEventListener('pointerdown', stop, opts);
|
||||||
|
window.addEventListener('mousemove', move, opts);
|
||||||
|
window.addEventListener('wheel', stop, opts);
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener('keydown', key, true);
|
||||||
|
window.removeEventListener('pointerdown', stop, opts);
|
||||||
|
window.removeEventListener('mousemove', move, opts);
|
||||||
|
window.removeEventListener('wheel', stop, opts);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const backToVideo = () => usePlayer.getState().dismissPostPlay();
|
||||||
|
// As in the player: the show page opens with playback moving to the miniplayer.
|
||||||
|
const openShow = () => {
|
||||||
|
usePlayer.getState().minimize();
|
||||||
|
navigate({ name: 'item', id: item.grandparentId });
|
||||||
|
};
|
||||||
|
// The next episode's own still, as on Android TV: darker than most show art, so the copy reads.
|
||||||
|
const scene = upcoming ?? item;
|
||||||
|
const sceneArt = useMemo(() => ({ ...scene, grandparentArt: scene.thumb || scene.grandparentArt }), [scene]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="player up-next" ref={root} role="dialog" aria-modal="true" aria-labelledby="up-next-label">
|
||||||
|
<div className="up-next-scene">{server && <Backdrop item={sceneArt} className="up-next-backdrop" />}</div>
|
||||||
|
<div className="player-top up-next-top" data-tauri-drag-region={isNative ? true : undefined}>
|
||||||
|
<button className="player-back" onClick={() => usePlayer.getState().minimize()} aria-label="Back to browsing" title="Keep playing in the corner">
|
||||||
|
<Icon name="arrowLeft" size={22} />
|
||||||
|
</button>
|
||||||
|
<button className="player-icon up-next-fullscreen" aria-label={fullscreen ? 'Exit full screen' : 'Full screen'} title={fullscreen ? 'Exit full screen' : 'Full screen'} onClick={() => usePlayer.getState().toggleFullscreen()}>
|
||||||
|
<Icon name={fullscreen ? 'collapse' : 'expand'} size={21} />
|
||||||
|
</button>
|
||||||
|
{!fullscreen && <WindowControls />}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="up-next-head">
|
||||||
|
<div className="up-next-now">
|
||||||
|
<button ref={video} className="up-next-video" onClick={backToVideo} aria-label={`Return to ${item.title}`} />
|
||||||
|
<NowPlaying item={item} />
|
||||||
|
</div>
|
||||||
|
<div className="up-next-info">
|
||||||
|
<span className="micro" id="up-next-label">
|
||||||
|
{upcoming || !contextReady ? 'Up next' : 'More to watch'}
|
||||||
|
</span>
|
||||||
|
{item.grandparentId ? (
|
||||||
|
<button className="player-title-link up-next-logo" title={`Go to ${item.grandparentTitle}`} onClick={openShow}>
|
||||||
|
<TitleArt item={item} maxWidth={300} maxHeight={64} as="h2" />
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
|
<TitleArt item={item} maxWidth={300} maxHeight={64} as="h2" className="up-next-logo" />
|
||||||
|
)}
|
||||||
|
{upcoming ? (
|
||||||
|
<>
|
||||||
|
<h1>{upcoming.title}</h1>
|
||||||
|
<Facts item={{ ...upcoming, viewOffset: 0, originallyAvailableAt: '' }} withFormats={false} />
|
||||||
|
{upcoming.summary && <p className="up-next-summary">{upcoming.summary}</p>}
|
||||||
|
<PlayNext ref={play} />
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
contextReady && <p className="up-next-summary">You’ve reached the end of this series.</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{server && <UpNextRows item={item} nextUp={nextUp} />}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Draws the native video into the frame's rectangle and cuts the same hole in
|
||||||
|
* the page, following window resizes and display scale changes.
|
||||||
|
*/
|
||||||
|
function useVideoRect(root: React.RefObject<HTMLDivElement | null>, frame: React.RefObject<HTMLElement | null>) {
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
const el = frame.current;
|
||||||
|
const page = root.current;
|
||||||
|
if (!el || !page) return;
|
||||||
|
let raf = 0;
|
||||||
|
const place = () => {
|
||||||
|
cancelAnimationFrame(raf);
|
||||||
|
raf = requestAnimationFrame(() => {
|
||||||
|
const r = el.getBoundingClientRect();
|
||||||
|
page.style.setProperty('--up-x', `${r.x}px`);
|
||||||
|
page.style.setProperty('--up-y', `${r.y}px`);
|
||||||
|
page.style.setProperty('--up-w', `${r.width}px`);
|
||||||
|
page.style.setProperty('--up-h', `${r.height}px`);
|
||||||
|
page.classList.add('placed');
|
||||||
|
const dpr = window.devicePixelRatio || 1;
|
||||||
|
// A pixel of overdraw on each side keeps the hole covered at any scale.
|
||||||
|
if (isNative) mpv.rect({ x: r.x * dpr - 1, y: r.y * dpr - 1, width: r.width * dpr + 2, height: r.height * dpr + 2 }).catch(() => {});
|
||||||
|
});
|
||||||
|
};
|
||||||
|
const ro = new ResizeObserver(place);
|
||||||
|
ro.observe(el);
|
||||||
|
window.addEventListener('resize', place);
|
||||||
|
place();
|
||||||
|
return () => {
|
||||||
|
cancelAnimationFrame(raf);
|
||||||
|
ro.disconnect();
|
||||||
|
window.removeEventListener('resize', place);
|
||||||
|
if (isNative) mpv.rect(null).catch(() => {});
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Where the playing episode is, under the video. Its own subscription: position ticks re-render only this. */
|
||||||
|
function NowPlaying({ item }: { item: Item }) {
|
||||||
|
const position = usePlayer((s) => s.position);
|
||||||
|
const total = usePlayer((s) => s.duration);
|
||||||
|
return (
|
||||||
|
<div className="up-next-progress">
|
||||||
|
<div className="up-next-progress-text">
|
||||||
|
<span>
|
||||||
|
{episodeLabel(item)} · {item.title}
|
||||||
|
</span>
|
||||||
|
<small>−{clock(Math.max(0, total - position))}</small>
|
||||||
|
</div>
|
||||||
|
<div className="up-next-progress-bar">
|
||||||
|
<i style={{ width: `${total ? Math.min(100, (position / total) * 100) : 0}%` }} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Play next episode. While autoplay counts down, a lighter fill sweeps across it.
|
||||||
|
* The store counts in 50 ms steps; the fill is drawn every frame between them.
|
||||||
|
*/
|
||||||
|
function PlayNext({ ref }: { ref: React.Ref<HTMLButtonElement> }) {
|
||||||
|
const counting = usePlayer((s) => s.countdown !== null && s.countdownTotal > 0);
|
||||||
|
const fill = useRef<HTMLSpanElement>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!counting) return;
|
||||||
|
let last = { value: usePlayer.getState().countdown ?? 0, at: performance.now() };
|
||||||
|
const unsubscribe = usePlayer.subscribe((s, prev) => {
|
||||||
|
if (s.countdown !== prev.countdown && s.countdown !== null) last = { value: s.countdown, at: performance.now() };
|
||||||
|
});
|
||||||
|
let raf = 0;
|
||||||
|
const draw = () => {
|
||||||
|
const { countdownTotal: total } = usePlayer.getState();
|
||||||
|
// Run on from the last step, but never more than a couple of steps ahead (a held countdown stays held).
|
||||||
|
const remaining = Math.max(0, last.value - Math.min(performance.now() - last.at, 120) / 1000);
|
||||||
|
if (fill.current && total) fill.current.style.transform = `scaleX(${1 - remaining / total})`;
|
||||||
|
raf = requestAnimationFrame(draw);
|
||||||
|
};
|
||||||
|
draw();
|
||||||
|
return () => {
|
||||||
|
unsubscribe();
|
||||||
|
cancelAnimationFrame(raf);
|
||||||
|
};
|
||||||
|
}, [counting]);
|
||||||
|
return (
|
||||||
|
<button ref={ref} className={`btn primary lg up-next-play${counting ? ' counting' : ''}`} onClick={() => usePlayer.getState().playNext()}>
|
||||||
|
{counting && <span className="up-next-play-fill" ref={fill} aria-hidden="true" />}
|
||||||
|
<Icon name="play" size={17} />
|
||||||
|
<span>Play next episode</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function UpNextRows({ item, nextUp }: { item: Item; nextUp: Item | null }) {
|
||||||
|
const server = useSession((s) => s.server)!;
|
||||||
|
const season = useQuery({
|
||||||
|
queryKey: [server.machineId, 'children', item.parentId],
|
||||||
|
queryFn: () => api.children(server, item.parentId),
|
||||||
|
enabled: !!item.parentId,
|
||||||
|
staleTime: 30_000,
|
||||||
|
});
|
||||||
|
const related = useQuery({
|
||||||
|
queryKey: [server.machineId, 'related', item.grandparentId],
|
||||||
|
queryFn: () => api.related(server, item.grandparentId),
|
||||||
|
enabled: !!item.grandparentId,
|
||||||
|
staleTime: 10 * 60_000,
|
||||||
|
});
|
||||||
|
const episodes = (season.data ?? []).filter((e) => e.type === 'episode');
|
||||||
|
const seen = new Set([item.grandparentId]);
|
||||||
|
const shows = (related.data ?? []).flatMap((h) => h.items).filter((i) => i.type === 'show' && !seen.has(i.id) && !!seen.add(i.id));
|
||||||
|
|
||||||
|
// The season row starts just before the playing episode.
|
||||||
|
const seasonRow = useRef<HTMLDivElement>(null);
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
const row = seasonRow.current?.querySelector<HTMLElement>('.shelf');
|
||||||
|
const current = row?.querySelector<HTMLElement>('[aria-current]');
|
||||||
|
if (!row || !current) return;
|
||||||
|
const start = (current.previousElementSibling as HTMLElement | null) ?? current;
|
||||||
|
const target = row.scrollLeft + start.getBoundingClientRect().left - row.getBoundingClientRect().left - parseFloat(getComputedStyle(row).paddingLeft);
|
||||||
|
row.scrollTo({ left: target, behavior: 'instant' });
|
||||||
|
}, [episodes.length]);
|
||||||
|
|
||||||
|
const choose = (episode: Item) => {
|
||||||
|
const st = usePlayer.getState();
|
||||||
|
if (episode.id === item.id) st.dismissPostPlay();
|
||||||
|
else st.play(episode, { resume: true, quality: st.quality });
|
||||||
|
};
|
||||||
|
const browse = async (show: Item) => {
|
||||||
|
await usePlayer.getState().close();
|
||||||
|
navigate({ name: 'item', id: show.id, title: show.title });
|
||||||
|
};
|
||||||
|
if (!episodes.length && !shows.length) return null;
|
||||||
|
return (
|
||||||
|
<div className="up-next-rows">
|
||||||
|
{episodes.length > 0 && (
|
||||||
|
<div ref={seasonRow}>
|
||||||
|
<Shelf title={item.parentIndex ? `Season ${item.parentIndex}` : 'Episodes'} kind="landscape" className="up-next-shelf">
|
||||||
|
{episodes.map((ep) => (
|
||||||
|
<UpNextCard
|
||||||
|
key={ep.id}
|
||||||
|
item={ep}
|
||||||
|
current={ep.id === item.id}
|
||||||
|
caption={ep.id === item.id ? 'Now playing' : ep.id === nextUp?.id ? 'Up next' : duration(ep.duration)}
|
||||||
|
onChoose={() => choose(ep)}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</Shelf>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{shows.length > 0 && (
|
||||||
|
<Shelf title="Related shows" kind="landscape" className="up-next-shelf">
|
||||||
|
{shows.map((show) => (
|
||||||
|
<UpNextCard key={show.id} item={show} caption={show.year ? String(show.year) : ''} onChoose={() => void browse(show)} />
|
||||||
|
))}
|
||||||
|
</Shelf>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function UpNextCard({ item, caption, current, onChoose }: { item: Item; caption: string; current?: boolean; onChoose: () => void }) {
|
||||||
|
const server = useSession((s) => s.server)!;
|
||||||
|
const episode = item.type === 'episode';
|
||||||
|
const title = episode ? `${item.index}. ${item.title}` : item.title;
|
||||||
|
const progress = episode && !current && item.viewOffset && item.duration ? item.viewOffset / item.duration : 0;
|
||||||
|
return (
|
||||||
|
<article
|
||||||
|
className="card landscape"
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
aria-label={title}
|
||||||
|
aria-current={current || undefined}
|
||||||
|
onClick={onChoose}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key !== 'Enter' && e.key !== ' ') return;
|
||||||
|
e.preventDefault();
|
||||||
|
onChoose();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div className="card-cover">
|
||||||
|
<Artwork src={server.image(art.landscape(item), 400, 225)} alt="" fallback={<span className="cover-fallback">{title}</span>} />
|
||||||
|
<div className="card-hover" />
|
||||||
|
{episode && !current && (
|
||||||
|
<div className="card-actions">
|
||||||
|
<span className="card-play" aria-hidden="true">
|
||||||
|
<Icon name="play" size={18} />
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{progress > 0 && (
|
||||||
|
<span className="progress-line">
|
||||||
|
<i style={{ width: `${Math.max(3, progress * 100)}%` }} />
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="card-caption">
|
||||||
|
<div className="card-title" title={title}>
|
||||||
|
{title}
|
||||||
|
</div>
|
||||||
|
{caption && <div className="card-meta">{caption}</div>}
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
);
|
||||||
|
}
|
||||||
99
src/player/miniWindow.ts
Normal file
|
|
@ -0,0 +1,99 @@
|
||||||
|
/**
|
||||||
|
* The miniplayer as a window of its own (Windows, src-tauri/src/mini.rs): the
|
||||||
|
* video moves into it, so it drags as one piece. This side keeps its page
|
||||||
|
* (src/mini/) up to date and carries out its buttons; macOS keeps the
|
||||||
|
* in-page miniplayer (PlayerOverlay).
|
||||||
|
*/
|
||||||
|
import { hostOS, invoke, isNative, listen } from '../platform/native';
|
||||||
|
import { episodeLabel } from '../app/format';
|
||||||
|
import { MINI_CORNER_KEY, type MiniAction, type MiniState } from '../mini/types';
|
||||||
|
import type { Item } from '../plex/types';
|
||||||
|
|
||||||
|
export const separateMini = isNative && hostOS === 'windows';
|
||||||
|
|
||||||
|
export async function showMiniWindow() {
|
||||||
|
await invoke('mini_show', { corner: localStorage.getItem(MINI_CORNER_KEY) ?? 'br' });
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Moves the video back to the main window; harmless when already there. */
|
||||||
|
export async function hideMiniWindow() {
|
||||||
|
await invoke('mini_hide').catch(() => {});
|
||||||
|
}
|
||||||
|
|
||||||
|
interface PlayerView {
|
||||||
|
open: boolean;
|
||||||
|
mini: boolean;
|
||||||
|
item: Item | null;
|
||||||
|
paused: boolean;
|
||||||
|
ended: boolean;
|
||||||
|
position: number;
|
||||||
|
duration: number;
|
||||||
|
firstFrame: boolean;
|
||||||
|
buffering: boolean;
|
||||||
|
reconnecting: boolean;
|
||||||
|
error: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface PlayerActions {
|
||||||
|
togglePause(): void;
|
||||||
|
seekBy(delta: number): void;
|
||||||
|
expand(): void;
|
||||||
|
close(): Promise<void>;
|
||||||
|
}
|
||||||
|
|
||||||
|
function view(st: PlayerView): MiniState {
|
||||||
|
const item = st.item;
|
||||||
|
return {
|
||||||
|
title: item ? (item.type === 'episode' ? item.grandparentTitle : item.title) : '',
|
||||||
|
subtitle: item?.type === 'episode' ? `${episodeLabel(item)} · ${item.title}` : '',
|
||||||
|
paused: st.paused,
|
||||||
|
ended: st.ended,
|
||||||
|
position: st.position,
|
||||||
|
duration: st.duration,
|
||||||
|
loading: !st.firstFrame && !st.error,
|
||||||
|
// Waiting for the server to come back shows as buffering.
|
||||||
|
buffering: st.buffering || st.reconnecting,
|
||||||
|
error: !!st.error,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Mirrors the player into the miniplayer window and listens for its buttons. */
|
||||||
|
export function bridgeMiniWindow(store: { getState(): PlayerView & PlayerActions; subscribe(listener: (st: PlayerView, prev: PlayerView) => void): () => void }) {
|
||||||
|
if (!separateMini) return;
|
||||||
|
let lastSent = 0;
|
||||||
|
let pending: ReturnType<typeof setTimeout> | null = null;
|
||||||
|
|
||||||
|
const send = async () => {
|
||||||
|
pending = null;
|
||||||
|
lastSent = Date.now();
|
||||||
|
const st = store.getState();
|
||||||
|
if (!st.open) return;
|
||||||
|
const { emitTo } = await import('@tauri-apps/api/event');
|
||||||
|
emitTo('mini', 'mini:state', view(st)).catch(() => {});
|
||||||
|
};
|
||||||
|
|
||||||
|
store.subscribe((st, prev) => {
|
||||||
|
if (!st.open || !st.mini) return;
|
||||||
|
// Everything but the position goes straight away; the position a few times a second.
|
||||||
|
const a = view(st);
|
||||||
|
const b = view(prev);
|
||||||
|
const only = (Object.keys(a) as (keyof MiniState)[]).every((k) => k === 'position' || a[k] === b[k]);
|
||||||
|
if (!only || st.mini !== prev.mini) {
|
||||||
|
if (pending) clearTimeout(pending);
|
||||||
|
send();
|
||||||
|
} else if (!pending) {
|
||||||
|
pending = setTimeout(send, Math.max(0, 250 - (Date.now() - lastSent)));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
listen<{ type: MiniAction }>('mini:action', ({ type }) => {
|
||||||
|
const st = store.getState();
|
||||||
|
if (type === 'ready') return send();
|
||||||
|
if (!st.open) return;
|
||||||
|
if (type === 'toggle') st.togglePause();
|
||||||
|
else if (type === 'back') st.seekBy(-10);
|
||||||
|
else if (type === 'forward') st.seekBy(10);
|
||||||
|
else if (type === 'expand') st.expand();
|
||||||
|
else if (type === 'close') st.close();
|
||||||
|
});
|
||||||
|
}
|
||||||
280
src/player/store.test.ts
Normal file
|
|
@ -0,0 +1,280 @@
|
||||||
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
import type { MpvEvent } from './engine';
|
||||||
|
|
||||||
|
const harness = vi.hoisted(() => {
|
||||||
|
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('document', Object.assign(new EventTarget(), { hidden: false, hasFocus: () => true, documentElement: { classList: { toggle: vi.fn() } } }));
|
||||||
|
return { event: (_e: MpvEvent) => {}, next: [] as unknown[], focused: true, identity: vi.fn() };
|
||||||
|
});
|
||||||
|
|
||||||
|
vi.mock('../platform/native', () => ({
|
||||||
|
isNative: true, invoke: vi.fn().mockResolvedValue(undefined), keepAwake: vi.fn(),
|
||||||
|
win: { isFullscreen: vi.fn().mockResolvedValue(false), setFullscreen: vi.fn(), onResized: vi.fn() },
|
||||||
|
}));
|
||||||
|
vi.mock('./engine', () => ({ mpv: {
|
||||||
|
init: vi.fn().mockResolvedValue(undefined), set: vi.fn().mockResolvedValue(undefined),
|
||||||
|
command: vi.fn().mockResolvedValue(undefined), show: vi.fn().mockResolvedValue(undefined),
|
||||||
|
rect: vi.fn().mockResolvedValue(undefined),
|
||||||
|
on: vi.fn(async (cb: typeof harness.event) => { harness.event = cb; return () => {}; }),
|
||||||
|
} }));
|
||||||
|
vi.mock('../app/session', async () => {
|
||||||
|
const { create } = await import('zustand');
|
||||||
|
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('../app/queries', () => ({ invalidateLibrary: vi.fn() }));
|
||||||
|
vi.mock('../ui/overlays', () => ({ toast: vi.fn() }));
|
||||||
|
vi.mock('./theme', () => ({ stopThemeMusic: vi.fn() }));
|
||||||
|
vi.mock('./miniWindow', () => ({ bridgeMiniWindow: vi.fn(), hideMiniWindow: vi.fn(), showMiniWindow: vi.fn(), separateMini: false }));
|
||||||
|
vi.mock('./enhance', () => ({ followVideoSize: vi.fn(), noteMpvLog: vi.fn(), requestEnhancement: vi.fn().mockResolvedValue(undefined), watchPerformance: vi.fn() }));
|
||||||
|
vi.mock('../plex/playback', () => ({ directUrl: () => 'test://video', previewUrl: () => '', reportTimeline: vi.fn().mockResolvedValue({}), stopTranscode: vi.fn(), transcodeUrl: () => '' }));
|
||||||
|
vi.mock('../plex/api', () => ({ allLeaves: vi.fn(async () => harness.next), metadata: vi.fn(), setWatched: vi.fn().mockResolvedValue(undefined) }));
|
||||||
|
|
||||||
|
import { usePlayer } from './store';
|
||||||
|
import { useSettings } from '../app/settings';
|
||||||
|
import { parseItem } from '../plex/parse';
|
||||||
|
import { mpv } from './engine';
|
||||||
|
import * as api from '../plex/api';
|
||||||
|
|
||||||
|
const episode = (id = '1') => parseItem({ ratingKey: id, type: 'episode', title: `Episode ${id}`, grandparentRatingKey: 'show', duration: 100000,
|
||||||
|
Marker: [{ id: 'credits', type: 'credits', startTimeOffset: 80000, endTimeOffset: 90000 }],
|
||||||
|
Media: [{ Part: [{ key: '/video', Stream: [{ id: 'audio', streamType: 2 }] }] }],
|
||||||
|
});
|
||||||
|
const time = (position: number) => harness.event({ type: 'property', name: 'time-pos', value: position });
|
||||||
|
/** 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 () => {
|
||||||
|
vi.useFakeTimers();
|
||||||
|
vi.stubGlobal('performance', { now: () => Date.now() });
|
||||||
|
Object.assign(document, { hidden: false, hasFocus: () => harness.focused });
|
||||||
|
harness.focused = true;
|
||||||
|
useSettings.setState({ autoplayNext: true, countdownSeconds: 5, skipCredits: 'auto', watchedPercent: 95 });
|
||||||
|
const current = episode();
|
||||||
|
harness.next = [current, episode('2')];
|
||||||
|
vi.mocked(api.metadata).mockResolvedValue(current);
|
||||||
|
await usePlayer.getState().play(current, { resume: false });
|
||||||
|
await Promise.resolve();
|
||||||
|
usePlayer.setState({ firstFrame: true });
|
||||||
|
});
|
||||||
|
afterEach(async () => {
|
||||||
|
await usePlayer.getState().close();
|
||||||
|
vi.useRealTimers();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Up Next playback lifecycle', () => {
|
||||||
|
it('opens immediately at any episode credits marker with a single countdown', () => {
|
||||||
|
time(81);
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ postPlay: true, countdown: 5, countdownTotal: 5 });
|
||||||
|
});
|
||||||
|
it.each(['button', 'off', 'auto'] as const)('opens at the first credits frame with movie credit skipping set to %s', (skipCredits) => {
|
||||||
|
useSettings.setState({ skipCredits });
|
||||||
|
time(79.9);
|
||||||
|
expect(usePlayer.getState().postPlay).toBe(false);
|
||||||
|
time(80);
|
||||||
|
expect(usePlayer.getState().postPlay).toBe(true);
|
||||||
|
});
|
||||||
|
it('counts while the native video owns focus instead of the webview', () => {
|
||||||
|
harness.focused = false;
|
||||||
|
time(81);
|
||||||
|
vi.advanceTimersByTime(1000);
|
||||||
|
expect(usePlayer.getState().countdown).toBeCloseTo(4);
|
||||||
|
});
|
||||||
|
it('counts elapsed time even when the webview delivers timer callbacks late', () => {
|
||||||
|
time(81);
|
||||||
|
vi.setSystemTime(Date.now() + 2000);
|
||||||
|
vi.advanceTimersByTime(50);
|
||||||
|
expect(usePlayer.getState().countdown).toBeCloseTo(2.95);
|
||||||
|
});
|
||||||
|
it('opens at EOF even when automatic credit skipping is off', () => {
|
||||||
|
useSettings.setState({ skipCredits: 'off' });
|
||||||
|
eof();
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ postPlay: true, ended: true, countdown: 5 });
|
||||||
|
});
|
||||||
|
it('plays the next episode exactly once after the configured delay', () => {
|
||||||
|
const next = vi.fn().mockResolvedValue(undefined);
|
||||||
|
const original = usePlayer.getState().playNext;
|
||||||
|
usePlayer.setState({ playNext: next });
|
||||||
|
time(81);
|
||||||
|
vi.advanceTimersByTime(5100);
|
||||||
|
expect(next).toHaveBeenCalledOnce();
|
||||||
|
vi.advanceTimersByTime(5000);
|
||||||
|
expect(next).toHaveBeenCalledOnce();
|
||||||
|
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', () => {
|
||||||
|
time(81);
|
||||||
|
usePlayer.getState().cancelCountdown();
|
||||||
|
eof();
|
||||||
|
vi.advanceTimersByTime(10000);
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ postPlay: true, countdown: null, postPlayDismissed: true });
|
||||||
|
});
|
||||||
|
it('returns to credits without reopening while they play', () => {
|
||||||
|
time(81);
|
||||||
|
usePlayer.getState().dismissPostPlay();
|
||||||
|
time(82);
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ postPlay: false, countdown: null });
|
||||||
|
});
|
||||||
|
it('reopens at the end after returning to the credits', () => {
|
||||||
|
time(81);
|
||||||
|
usePlayer.getState().dismissPostPlay();
|
||||||
|
eof();
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ postPlay: true, countdown: 5 });
|
||||||
|
});
|
||||||
|
it('reopens when the credits start again after seeking back into the episode', () => {
|
||||||
|
time(81);
|
||||||
|
usePlayer.getState().dismissPostPlay();
|
||||||
|
usePlayer.getState().seek(40);
|
||||||
|
time(40);
|
||||||
|
expect(usePlayer.getState().postPlay).toBe(false);
|
||||||
|
time(80);
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ postPlay: true, countdown: 5 });
|
||||||
|
});
|
||||||
|
it.each(['hidden', 'mini'] as const)('holds the countdown while %s', (reason) => {
|
||||||
|
time(81);
|
||||||
|
if (reason === 'hidden') Object.assign(document, { hidden: true });
|
||||||
|
if (reason === 'mini') usePlayer.setState({ mini: true });
|
||||||
|
vi.advanceTimersByTime(20000);
|
||||||
|
expect(usePlayer.getState().countdown).toBe(5);
|
||||||
|
Object.assign(document, { hidden: false });
|
||||||
|
harness.focused = true;
|
||||||
|
usePlayer.setState({ paused: false, mini: false });
|
||||||
|
vi.advanceTimersByTime(1000);
|
||||||
|
expect(usePlayer.getState().countdown).toBeCloseTo(4);
|
||||||
|
});
|
||||||
|
it('keeps counting at EOF even when mpv reports pause', () => {
|
||||||
|
eof();
|
||||||
|
usePlayer.setState({ paused: true });
|
||||||
|
vi.advanceTimersByTime(1000);
|
||||||
|
expect(usePlayer.getState().countdown).toBeCloseTo(4);
|
||||||
|
});
|
||||||
|
it('keeps counting while credits are paused, like Android Up Next', () => {
|
||||||
|
time(81);
|
||||||
|
usePlayer.setState({ paused: true });
|
||||||
|
vi.advanceTimersByTime(1000);
|
||||||
|
expect(usePlayer.getState().countdown).toBeCloseTo(4);
|
||||||
|
});
|
||||||
|
it('does not spend hidden time when the app returns before another timer tick', () => {
|
||||||
|
time(80);
|
||||||
|
Object.assign(document, { hidden: true });
|
||||||
|
document.dispatchEvent(new Event('visibilitychange'));
|
||||||
|
vi.setSystemTime(Date.now() + 60000);
|
||||||
|
Object.assign(document, { hidden: false });
|
||||||
|
document.dispatchEvent(new Event('visibilitychange'));
|
||||||
|
vi.advanceTimersByTime(50);
|
||||||
|
expect(usePlayer.getState().countdown).toBeCloseTo(4.95);
|
||||||
|
});
|
||||||
|
it('shows a finale without an autoplay target', () => {
|
||||||
|
usePlayer.setState({ nextUp: null });
|
||||||
|
eof();
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ postPlay: true, countdown: null });
|
||||||
|
});
|
||||||
|
it('respects autoplay off', () => {
|
||||||
|
useSettings.setState({ autoplayNext: false });
|
||||||
|
time(81);
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ postPlay: true, countdown: null });
|
||||||
|
});
|
||||||
|
it('opens when seeking into credits instead of suppressing Up Next', () => {
|
||||||
|
usePlayer.getState().seek(81);
|
||||||
|
time(81);
|
||||||
|
vi.advanceTimersByTime(2000);
|
||||||
|
time(83);
|
||||||
|
expect(usePlayer.getState().postPlay).toBe(true);
|
||||||
|
expect(mpv.command).toHaveBeenCalledWith('seek', '81.000', 'absolute+exact');
|
||||||
|
});
|
||||||
|
it.each(['ended', 'credits'] as const)('shows Up Next immediately and loads slow episode context after %s', async (reason) => {
|
||||||
|
let resolve!: (items: ReturnType<typeof episode>[]) => void;
|
||||||
|
vi.mocked(api.allLeaves).mockImplementationOnce(() => new Promise((done) => { resolve = done; }));
|
||||||
|
await usePlayer.getState().play(episode(), { resume: false });
|
||||||
|
usePlayer.setState({ firstFrame: true });
|
||||||
|
useSettings.setState({ skipCredits: 'button' });
|
||||||
|
if (reason === 'ended') eof();
|
||||||
|
else time(80);
|
||||||
|
expect(usePlayer.getState().postPlay).toBe(true);
|
||||||
|
expect(usePlayer.getState().countdown).toBeNull();
|
||||||
|
resolve([episode(), episode('2')]);
|
||||||
|
await vi.waitFor(() => expect(usePlayer.getState().episodeContextReady).toBe(true));
|
||||||
|
expect(usePlayer.getState().nextUp?.id).toBe('2');
|
||||||
|
expect(usePlayer.getState().countdownTotal).toBe(5);
|
||||||
|
expect(usePlayer.getState().countdown).toBeGreaterThan(4.9);
|
||||||
|
expect(usePlayer.getState().countdown).toBeLessThanOrEqual(5);
|
||||||
|
});
|
||||||
|
it('keeps autoplay cancelled when episode context arrives after interaction', async () => {
|
||||||
|
let resolve!: (items: ReturnType<typeof episode>[]) => void;
|
||||||
|
vi.mocked(api.allLeaves).mockImplementationOnce(() => new Promise((done) => { resolve = done; }));
|
||||||
|
await usePlayer.getState().play(episode(), { resume: false });
|
||||||
|
usePlayer.setState({ firstFrame: true });
|
||||||
|
time(80);
|
||||||
|
usePlayer.getState().cancelCountdown();
|
||||||
|
resolve([episode(), episode('2')]);
|
||||||
|
await vi.waitFor(() => expect(usePlayer.getState().episodeContextReady).toBe(true));
|
||||||
|
vi.advanceTimersByTime(10000);
|
||||||
|
expect(usePlayer.getState()).toMatchObject({ postPlay: true, countdown: null, postPlayDismissed: true });
|
||||||
|
});
|
||||||
|
it('clears Up Next and its timer when playback closes', async () => {
|
||||||
|
time(81);
|
||||||
|
await usePlayer.getState().close();
|
||||||
|
vi.advanceTimersByTime(10000);
|
||||||
|
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();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -2,15 +2,18 @@ import { create } from 'zustand';
|
||||||
import * as api from '../plex/api';
|
import * as api from '../plex/api';
|
||||||
import { directUrl, previewUrl, reportTimeline, stopTranscode, transcodeUrl, type Delivery } from '../plex/playback';
|
import { directUrl, previewUrl, reportTimeline, stopTranscode, transcodeUrl, type Delivery } from '../plex/playback';
|
||||||
import type { Item, Stream } from '../plex/types';
|
import type { Item, Stream } from '../plex/types';
|
||||||
|
import type { PlexServer } from '../plex/client';
|
||||||
import { useSession } from '../app/session';
|
import { useSession } from '../app/session';
|
||||||
|
import { useDownloads, type Download } from '../downloads/store';
|
||||||
import { useSettings, SUBTITLE_MARGIN, type Preferences, type Quality, type Upscaling } from '../app/settings';
|
import { useSettings, SUBTITLE_MARGIN, type Preferences, type Quality, type Upscaling } from '../app/settings';
|
||||||
import { followVideoSize, noteMpvLog, requestEnhancement, watchPerformance } from './enhance';
|
import { followVideoSize, noteMpvLog, requestEnhancement, watchPerformance } from './enhance';
|
||||||
import { channelLabel } from '../app/format';
|
import { channelLabel } from '../app/format';
|
||||||
import { invalidateLibrary } from '../app/queries';
|
import { invalidateLibrary } from '../app/queries';
|
||||||
import { keepAwake, isNative, win } from '../platform/native';
|
import { invoke, keepAwake, isNative, win } from '../platform/native';
|
||||||
import { mpv, type MpvEvent, type MpvTrack } from './engine';
|
import { mpv, type MpvEvent, type MpvTrack } from './engine';
|
||||||
import { toast } from '../ui/overlays';
|
import { toast } from '../ui/overlays';
|
||||||
import { stopThemeMusic } from './theme';
|
import { stopThemeMusic } from './theme';
|
||||||
|
import { bridgeMiniWindow, hideMiniWindow, separateMini, showMiniWindow } from './miniWindow';
|
||||||
|
|
||||||
export interface Track {
|
export interface Track {
|
||||||
key: string; // stable UI key
|
key: string; // stable UI key
|
||||||
|
|
@ -31,6 +34,10 @@ export interface PlayOptions {
|
||||||
/** A local file path (offline download). */
|
/** A local file path (offline download). */
|
||||||
localFile?: string;
|
localFile?: string;
|
||||||
quality?: Quality;
|
quality?: Quality;
|
||||||
|
/** Keep these track choices (UI keys) instead of applying the preferences again. */
|
||||||
|
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 {
|
||||||
|
|
@ -43,12 +50,16 @@ 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;
|
||||||
paused: boolean;
|
paused: boolean;
|
||||||
buffering: boolean;
|
buffering: boolean;
|
||||||
seeking: boolean;
|
seeking: boolean;
|
||||||
|
/** When the last seek was asked for (Date.now()), so a pending auto-skip can step aside. */
|
||||||
|
lastSeek: number;
|
||||||
volume: number;
|
volume: number;
|
||||||
muted: boolean;
|
muted: boolean;
|
||||||
speed: number;
|
speed: number;
|
||||||
|
|
@ -61,7 +72,12 @@ interface PlayerState {
|
||||||
video: { width: number; height: number; hwdec: string; codec: string } | null;
|
video: { width: number; height: number; hwdec: string; codec: string } | null;
|
||||||
ended: boolean;
|
ended: boolean;
|
||||||
nextUp: Item | null;
|
nextUp: Item | null;
|
||||||
|
/** The episode before this one, for the previous-episode button. */
|
||||||
|
prevUp: Item | null;
|
||||||
|
episodeContextReady: boolean;
|
||||||
countdown: number | null;
|
countdown: number | null;
|
||||||
|
countdownTotal: number;
|
||||||
|
postPlay: boolean;
|
||||||
postPlayDismissed: boolean;
|
postPlayDismissed: boolean;
|
||||||
fullscreen: boolean;
|
fullscreen: boolean;
|
||||||
/** Playing in the corner while browsing. */
|
/** Playing in the corner while browsing. */
|
||||||
|
|
@ -89,7 +105,10 @@ interface PlayerState {
|
||||||
setQuality(q: Quality): Promise<void>;
|
setQuality(q: Quality): Promise<void>;
|
||||||
selectVersion(index: number): Promise<void>;
|
selectVersion(index: number): Promise<void>;
|
||||||
playNext(): Promise<void>;
|
playNext(): Promise<void>;
|
||||||
|
playPrevious(): Promise<void>;
|
||||||
cancelCountdown(): void;
|
cancelCountdown(): void;
|
||||||
|
showPostPlay(): void;
|
||||||
|
dismissPostPlay(): void;
|
||||||
toggleFullscreen(): Promise<void>;
|
toggleFullscreen(): Promise<void>;
|
||||||
previewAt(seconds: number): string;
|
previewAt(seconds: number): string;
|
||||||
}
|
}
|
||||||
|
|
@ -101,13 +120,23 @@ let lastReport = 0;
|
||||||
let sessionAnswered = false;
|
let sessionAnswered = false;
|
||||||
let reportTimer: ReturnType<typeof setInterval> | null = null;
|
let reportTimer: ReturnType<typeof setInterval> | null = null;
|
||||||
let countdownTimer: ReturnType<typeof setInterval> | null = null;
|
let countdownTimer: ReturnType<typeof setInterval> | null = null;
|
||||||
|
let unwatchCountdown: (() => void) | null = null;
|
||||||
let scrobbled = false;
|
let scrobbled = false;
|
||||||
let unlisten: (() => void) | null = null;
|
let unlisten: (() => void) | null = null;
|
||||||
let loadToken = 0;
|
let loadToken = 0;
|
||||||
let wasFullscreenBeforePlay = false;
|
let wasFullscreenBeforePlay = false;
|
||||||
let pendingExternal: Track | null = null;
|
let pendingExternal: Track | null = null;
|
||||||
|
|
||||||
const server = () => useSession.getState().server;
|
/**
|
||||||
|
* The server this playback belongs to, fixed when it starts. Progress, watched state
|
||||||
|
* and transcodes always go there, never to whichever server is selected later. A
|
||||||
|
* download plays without one unless its own server is the one connected.
|
||||||
|
*/
|
||||||
|
let playServer: PlexServer | null = null;
|
||||||
|
/** The download being played, whose saved metadata keeps the offline resume point. */
|
||||||
|
let playDownload: Download | null = null;
|
||||||
|
|
||||||
|
const server = () => playServer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* mpv applies its volume on a cubic curve, so halfway on a linear slider was
|
* mpv applies its volume on a cubic curve, so halfway on a linear slider was
|
||||||
|
|
@ -212,8 +241,34 @@ async function applySubtitleStyle(prefs: Preferences = useSettings.getState()) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** A download's watch was counted this session; its resume point stays cleared. */
|
||||||
|
let localScrobbled = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Keeps a download's resume point (or, once watched, its watch count) in its saved
|
||||||
|
* metadata, which is all an offline title has to resume from.
|
||||||
|
*/
|
||||||
|
function saveLocalProgress(watched = false) {
|
||||||
|
const d = playDownload;
|
||||||
|
const { item, position, delivery, firstFrame } = usePlayer.getState();
|
||||||
|
// Before the first frame the position is only where it was asked to start.
|
||||||
|
if (!d || !item || delivery?.mode !== 'local' || !firstFrame || (localScrobbled && !watched)) return;
|
||||||
|
const raw = { ...(d.meta.raw ?? {}) };
|
||||||
|
if (watched) {
|
||||||
|
if (localScrobbled) return;
|
||||||
|
localScrobbled = true;
|
||||||
|
raw.viewOffset = 0;
|
||||||
|
raw.viewCount = (Number(raw.viewCount) || 0) + 1;
|
||||||
|
raw.lastViewedAt = Math.floor(Date.now() / 1000);
|
||||||
|
} else raw.viewOffset = Math.max(0, Math.round(position * 1000));
|
||||||
|
const meta = { ...d.meta, raw };
|
||||||
|
playDownload = { ...d, meta };
|
||||||
|
invoke('download_write_meta', { id: d.id, meta }).catch(() => {});
|
||||||
|
}
|
||||||
|
|
||||||
/** Reports progress to Plex; resolves true if the reply says the stream was stopped. */
|
/** Reports progress to Plex; resolves true if the reply says the stream was stopped. */
|
||||||
function report(state: 'playing' | 'paused' | 'buffering' | 'stopped'): Promise<boolean> {
|
function report(state: 'playing' | 'paused' | 'buffering' | 'stopped'): Promise<boolean> {
|
||||||
|
if (state === 'paused' || state === 'stopped') saveLocalProgress();
|
||||||
const s = server();
|
const s = server();
|
||||||
const { item, position, delivery } = usePlayer.getState();
|
const { item, position, delivery } = usePlayer.getState();
|
||||||
if (!s || !item || !session || item.type === 'clip') return Promise.resolve(false);
|
if (!s || !item || !session || item.type === 'clip') return Promise.resolve(false);
|
||||||
|
|
@ -260,9 +315,11 @@ function onTerminated(text: string) {
|
||||||
function checkScrobble() {
|
function checkScrobble() {
|
||||||
const { item, position, duration } = usePlayer.getState();
|
const { item, position, duration } = usePlayer.getState();
|
||||||
const s = server();
|
const s = server();
|
||||||
if (!item || !s || scrobbled || !duration || item.type === 'clip') return;
|
if (!item || scrobbled || !duration || item.type === 'clip') return;
|
||||||
const percent = useSettings.getState().watchedPercent;
|
const percent = useSettings.getState().watchedPercent;
|
||||||
if (position / duration >= percent / 100) {
|
if (position / duration >= percent / 100) {
|
||||||
|
saveLocalProgress(true);
|
||||||
|
if (!s) return;
|
||||||
scrobbled = true;
|
scrobbled = true;
|
||||||
api
|
api
|
||||||
.setWatched(s, item.id, true)
|
.setWatched(s, item.id, true)
|
||||||
|
|
@ -271,42 +328,156 @@ function checkScrobble() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function findNext(item: Item): Promise<Item | null> {
|
/** The episodes either side of this one in the show. */
|
||||||
|
async function findNeighbours(item: Item): Promise<{ prevUp: Item | null; nextUp: Item | null }> {
|
||||||
|
const none = { prevUp: null, nextUp: null };
|
||||||
const s = server();
|
const s = server();
|
||||||
if (!s || item.type !== 'episode' || !item.grandparentId) return null;
|
if (!s || item.type !== 'episode' || !item.grandparentId) return none;
|
||||||
try {
|
try {
|
||||||
const leaves = await api.allLeaves(s, item.grandparentId);
|
const leaves = await api.allLeaves(s, item.grandparentId);
|
||||||
const i = leaves.findIndex((e) => e.id === item.id);
|
const i = leaves.findIndex((e) => e.id === item.id);
|
||||||
return i >= 0 ? (leaves[i + 1] ?? null) : null;
|
return i >= 0 ? { prevUp: leaves[i - 1] ?? null, nextUp: leaves[i + 1] ?? null } : none;
|
||||||
} catch {
|
} catch {
|
||||||
return null;
|
return none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function openPostPlay() {
|
||||||
|
const st = usePlayer.getState();
|
||||||
|
if (!st.open || st.error || st.item?.type !== 'episode' || st.postPlay || st.postPlayDismissed) return;
|
||||||
|
usePlayer.setState({ postPlay: true });
|
||||||
|
startCountdown();
|
||||||
|
}
|
||||||
|
|
||||||
function startCountdown() {
|
function startCountdown() {
|
||||||
const st = usePlayer.getState();
|
const st = usePlayer.getState();
|
||||||
if (!st.nextUp || st.countdown !== null || st.postPlayDismissed) return;
|
if (!st.open || !st.postPlay || st.error || !st.nextUp || st.postPlayDismissed || st.countdown !== null) return;
|
||||||
const settings = useSettings.getState();
|
const settings = useSettings.getState();
|
||||||
if (!settings.autoplayNext) {
|
const total = settings.autoplayNext ? settings.countdownSeconds : 0;
|
||||||
usePlayer.setState({ countdown: -1 });
|
if (total <= 0) return;
|
||||||
return;
|
stopCountdown();
|
||||||
}
|
usePlayer.setState({ countdown: total, countdownTotal: total });
|
||||||
usePlayer.setState({ countdown: settings.countdownSeconds });
|
let lastTick = performance.now();
|
||||||
countdownTimer && clearInterval(countdownTimer);
|
const visibilityChanged = () => { lastTick = performance.now(); };
|
||||||
|
document.addEventListener('visibilitychange', visibilityChanged);
|
||||||
|
unwatchCountdown = () => document.removeEventListener('visibilitychange', visibilityChanged);
|
||||||
countdownTimer = setInterval(() => {
|
countdownTimer = setInterval(() => {
|
||||||
const c = usePlayer.getState().countdown;
|
const now = performance.now();
|
||||||
if (c === null || c < 0) return;
|
const elapsed = Math.max(0, (now - lastTick) / 1000);
|
||||||
if (c <= 1) {
|
lastTick = now;
|
||||||
clearInterval(countdownTimer!);
|
const current = usePlayer.getState();
|
||||||
countdownTimer = null;
|
if (!current.open || !current.postPlay || current.error || current.countdown === null) return stopCountdown();
|
||||||
usePlayer.getState().playNext();
|
// Native video can own keyboard focus while the webview is still on screen.
|
||||||
} else usePlayer.setState({ countdown: c - 1 });
|
if (document.hidden || current.mini) return;
|
||||||
}, 1000);
|
const remaining = Math.max(0, current.countdown - elapsed);
|
||||||
|
usePlayer.setState({ countdown: remaining });
|
||||||
|
if (remaining === 0) {
|
||||||
|
stopCountdown();
|
||||||
|
current.playNext();
|
||||||
|
}
|
||||||
|
}, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
function stopCountdown() {
|
function stopCountdown() {
|
||||||
if (countdownTimer) clearInterval(countdownTimer);
|
if (countdownTimer) clearInterval(countdownTimer);
|
||||||
countdownTimer = null;
|
countdownTimer = null;
|
||||||
|
unwatchCountdown?.();
|
||||||
|
unwatchCountdown = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The tracks to play: a choice already made is kept ('' audio and '__init' subtitles
|
||||||
|
* mean none yet), otherwise the preferred audio language, then Plex's selection, then
|
||||||
|
* the file default; subtitles follow the subtitle mode.
|
||||||
|
*/
|
||||||
|
function preferredTracks(audio: Track[], subs: Track[], prefs: Preferences, audioKey = '', subKey = '__init') {
|
||||||
|
if (!audioKey) {
|
||||||
|
const lang = prefs.audioLanguage;
|
||||||
|
audioKey =
|
||||||
|
(lang && audio.find((t) => t.language === lang)?.key) ||
|
||||||
|
audio.find((t) => t.stream?.selected)?.key ||
|
||||||
|
audio.find((t) => t.stream?.default)?.key ||
|
||||||
|
audio[0]?.key ||
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
if (subKey === '__init') {
|
||||||
|
const lang = prefs.subtitleLanguage || audio.find((t) => t.key === audioKey)?.language || '';
|
||||||
|
const inLang = subs.filter((t) => !lang || t.language === lang);
|
||||||
|
switch (prefs.subtitleMode) {
|
||||||
|
case 'off':
|
||||||
|
subKey = '';
|
||||||
|
break;
|
||||||
|
case 'always':
|
||||||
|
subKey = (inLang.find((t) => !t.forced) ?? inLang[0] ?? subs[0])?.key ?? '';
|
||||||
|
break;
|
||||||
|
case 'forced':
|
||||||
|
subKey = inLang.find((t) => t.forced)?.key ?? '';
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
subKey = subs.find((t) => t.stream?.selected)?.key ?? inLang.find((t) => t.forced)?.key ?? '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { audioKey, subKey };
|
||||||
|
}
|
||||||
|
|
||||||
|
type Selection = { audioStreamID?: string; subtitleStreamID?: string };
|
||||||
|
|
||||||
|
/** The item with Plex's stream selection updated locally to match `sel`. */
|
||||||
|
function withSelection(item: Item, mediaIndex: number, sel: Selection): Item {
|
||||||
|
const media = item.media.map((m, i) =>
|
||||||
|
i !== mediaIndex
|
||||||
|
? m
|
||||||
|
: {
|
||||||
|
...m,
|
||||||
|
parts: m.parts.map((p) => ({
|
||||||
|
...p,
|
||||||
|
streams: p.streams.map((x) =>
|
||||||
|
x.streamType === 2 && sel.audioStreamID !== undefined
|
||||||
|
? { ...x, selected: x.id === sel.audioStreamID }
|
||||||
|
: x.streamType === 3 && sel.subtitleStreamID !== undefined
|
||||||
|
? { ...x, selected: x.id === sel.subtitleStreamID }
|
||||||
|
: x,
|
||||||
|
),
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return { ...item, media };
|
||||||
|
}
|
||||||
|
|
||||||
|
const streamId = (tracks: Track[], key: string) => tracks.find((t) => t.key === key)?.stream?.id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What Plex must be told so its selection on this media matches the given streams
|
||||||
|
* (subtitle '' is none, undefined leaves either as it is). Empty if it already does.
|
||||||
|
*/
|
||||||
|
function selectionFor(item: Item, mediaIndex: number, audioId: string | undefined, subId: string | undefined): Selection {
|
||||||
|
const streams = item.media[mediaIndex]?.parts.flatMap((p) => p.streams) ?? [];
|
||||||
|
const sel: Selection = {};
|
||||||
|
if (audioId && !streams.some((x) => x.streamType === 2 && x.selected && x.id === audioId)) sel.audioStreamID = audioId;
|
||||||
|
if (subId !== undefined && (streams.find((x) => x.streamType === 3 && x.selected)?.id ?? '') !== subId) sel.subtitleStreamID = subId || '0';
|
||||||
|
return sel;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Saves a track choice on the server; resolves to the item with that selection. */
|
||||||
|
async function saveSelection(s: PlexServer, item: Item, mediaIndex: number, sel: Selection): Promise<Item> {
|
||||||
|
const part = item.media[mediaIndex]?.parts[0];
|
||||||
|
if (!part || (sel.audioStreamID === undefined && sel.subtitleStreamID === undefined)) return item;
|
||||||
|
await api.selectStreams(s, part.id, sel);
|
||||||
|
return withSelection(item, mediaIndex, sel);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Saves a choice made during direct play, so other Plex apps (and a later conversion) use it too. */
|
||||||
|
function rememberSelection(st: PlayerState, audioId: string | undefined, subId: string | undefined) {
|
||||||
|
const s = server();
|
||||||
|
const { item, mediaIndex } = st;
|
||||||
|
if (!s || !item) return;
|
||||||
|
const sel = selectionFor(item, mediaIndex, audioId, subId);
|
||||||
|
saveSelection(s, item, mediaIndex, sel)
|
||||||
|
.then(() => {
|
||||||
|
const now = usePlayer.getState();
|
||||||
|
if (now.item?.id === item.id && now.mediaIndex === mediaIndex) usePlayer.setState({ item: withSelection(now.item, mediaIndex, sel) });
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Applies Plex/user track preferences once mpv has loaded the file. */
|
/** Applies Plex/user track preferences once mpv has loaded the file. */
|
||||||
|
|
@ -326,36 +497,7 @@ async function applyInitialTracks(tracks: MpvTrack[]) {
|
||||||
if (!subs.length) subs = tracks.filter((t) => t.type === 'sub').map(mpvTrackLabel);
|
if (!subs.length) subs = tracks.filter((t) => t.type === 'sub').map(mpvTrackLabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Audio: preferred language, else Plex's selection, else the file default.
|
const { audioKey, subKey } = preferredTracks(audio, subs, prefs, st.audioKey, st.subKey);
|
||||||
let audioKey = st.audioKey;
|
|
||||||
if (!audioKey) {
|
|
||||||
const lang = prefs.audioLanguage;
|
|
||||||
audioKey =
|
|
||||||
(lang && audio.find((t) => t.language === lang)?.key) ||
|
|
||||||
audio.find((t) => t.stream?.selected)?.key ||
|
|
||||||
audio.find((t) => t.stream?.default)?.key ||
|
|
||||||
audio[0]?.key ||
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
// Subtitles: follow the subtitle mode.
|
|
||||||
let subKey = st.subKey;
|
|
||||||
if (subKey === '__init') {
|
|
||||||
const lang = prefs.subtitleLanguage || audio.find((t) => t.key === audioKey)?.language || '';
|
|
||||||
const inLang = subs.filter((t) => !lang || t.language === lang);
|
|
||||||
switch (prefs.subtitleMode) {
|
|
||||||
case 'off':
|
|
||||||
subKey = '';
|
|
||||||
break;
|
|
||||||
case 'always':
|
|
||||||
subKey = (inLang.find((t) => !t.forced) ?? inLang[0] ?? subs[0])?.key ?? '';
|
|
||||||
break;
|
|
||||||
case 'forced':
|
|
||||||
subKey = inLang.find((t) => t.forced)?.key ?? '';
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
subKey = subs.find((t) => t.stream?.selected)?.key ?? inLang.find((t) => t.forced)?.key ?? '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
usePlayer.setState({ audioTracks: audio, subTracks: subs, audioKey, subKey });
|
usePlayer.setState({ audioTracks: audio, subTracks: subs, audioKey, subKey });
|
||||||
if (direct) {
|
if (direct) {
|
||||||
const a = audio.find((t) => t.key === audioKey);
|
const a = audio.find((t) => t.key === audioKey);
|
||||||
|
|
@ -459,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;
|
||||||
|
|
@ -480,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);
|
||||||
|
|
@ -493,6 +638,9 @@ function onEvent(e: MpvEvent) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The tracks playing now, to carry over when the same media restarts (a choice not made yet stays open). */
|
||||||
|
const currentTracks = (st: PlayerState) => ({ audioKey: st.audioKey, subKey: st.subKey });
|
||||||
|
|
||||||
/** Direct play failed: retry once through Plex's converter. */
|
/** Direct play failed: retry once through Plex's converter. */
|
||||||
let triedFallback = false;
|
let triedFallback = false;
|
||||||
function fallbackAfterError() {
|
function fallbackAfterError() {
|
||||||
|
|
@ -501,14 +649,74 @@ function fallbackAfterError() {
|
||||||
triedFallback = true;
|
triedFallback = true;
|
||||||
toast('Direct playback failed. Asking Plex to convert this video.');
|
toast('Direct playback failed. Asking Plex to convert this video.');
|
||||||
usePlayer.setState({ error: '' });
|
usePlayer.setState({ error: '' });
|
||||||
st.play(st.item, { offsetMs: st.position * 1000 || startOffsetMs, mediaIndex: st.mediaIndex, quality: '1080' });
|
st.play(st.item, { offsetMs: st.position * 1000 || startOffsetMs, mediaIndex: st.mediaIndex, quality: '1080', tracks: currentTracks(st) });
|
||||||
}
|
}
|
||||||
|
|
||||||
function maybeCredits(pos: number) {
|
function maybeCredits(pos: number) {
|
||||||
const st = usePlayer.getState();
|
const st = usePlayer.getState();
|
||||||
if (st.item?.type !== 'episode' || !st.nextUp || st.countdown !== null) return;
|
if (st.item?.type !== 'episode' || !st.firstFrame) return;
|
||||||
const credits = st.item.markers.find((m) => m.type === 'credits' && (m.final || m.end >= st.item!.duration - 5000));
|
const inCredits = st.item.markers.some((m) => m.type === 'credits' && pos * 1000 >= m.start && pos * 1000 < m.end);
|
||||||
if (credits && pos * 1000 >= credits.start && pos * 1000 < credits.end && useSettings.getState().skipCredits !== 'off') startCountdown();
|
// Leaving the credits (seeking back into the episode) re-arms Up Next for the next time they start.
|
||||||
|
if (!inCredits) {
|
||||||
|
if (st.postPlayDismissed && !st.postPlay && !st.ended) usePlayer.setState({ postPlayDismissed: false });
|
||||||
|
} 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() {
|
||||||
|
|
@ -517,7 +725,11 @@ function onEnded() {
|
||||||
usePlayer.setState({ ended: true });
|
usePlayer.setState({ ended: true });
|
||||||
report('stopped');
|
report('stopped');
|
||||||
checkScrobble();
|
checkScrobble();
|
||||||
if (st.nextUp) startCountdown();
|
// Reaching the end always offers Up Next, as on Android, even after watching the credits.
|
||||||
|
if (st.item?.type === 'episode' && !st.postPlay) {
|
||||||
|
usePlayer.setState({ postPlayDismissed: false });
|
||||||
|
openPostPlay();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const usePlayer = create<PlayerState>((set, get) => ({
|
export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
|
|
@ -529,12 +741,14 @@ 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,
|
||||||
paused: false,
|
paused: false,
|
||||||
buffering: false,
|
buffering: false,
|
||||||
seeking: false,
|
seeking: false,
|
||||||
|
lastSeek: 0,
|
||||||
volume: 100,
|
volume: 100,
|
||||||
muted: false,
|
muted: false,
|
||||||
speed: 1,
|
speed: 1,
|
||||||
|
|
@ -547,7 +761,11 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
video: null,
|
video: null,
|
||||||
ended: false,
|
ended: false,
|
||||||
nextUp: null,
|
nextUp: null,
|
||||||
|
prevUp: null,
|
||||||
|
episodeContextReady: false,
|
||||||
countdown: null,
|
countdown: null,
|
||||||
|
countdownTotal: 0,
|
||||||
|
postPlay: false,
|
||||||
postPlayDismissed: false,
|
postPlayDismissed: false,
|
||||||
fullscreen: false,
|
fullscreen: false,
|
||||||
mini: false,
|
mini: false,
|
||||||
|
|
@ -557,7 +775,8 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
|
|
||||||
async play(input, opts = {}) {
|
async play(input, opts = {}) {
|
||||||
const token = ++loadToken;
|
const token = ++loadToken;
|
||||||
const s = server();
|
// Closing or starting something else while this one is still setting up wins.
|
||||||
|
const stale = () => token !== loadToken;
|
||||||
const prefs = useSettings.getState();
|
const prefs = useSettings.getState();
|
||||||
stopThemeMusic();
|
stopThemeMusic();
|
||||||
stopCountdown();
|
stopCountdown();
|
||||||
|
|
@ -566,13 +785,29 @@ 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.
|
||||||
|
if (reportTimer) clearInterval(reportTimer);
|
||||||
|
reportTimer = null;
|
||||||
if (previous.open && previous.item) {
|
if (previous.open && previous.item) {
|
||||||
report('stopped');
|
report('stopped');
|
||||||
if (previous.delivery?.session && s) stopTranscode(s, previous.delivery.session);
|
const ps = server();
|
||||||
|
if (previous.delivery?.session && ps) stopTranscode(ps, previous.delivery.session);
|
||||||
}
|
}
|
||||||
|
session = '';
|
||||||
|
const current = useSession.getState().server;
|
||||||
|
const download = opts.localFile ? (useDownloads.getState().items.find((d) => d.filePath === opts.localFile) ?? null) : null;
|
||||||
|
const s = opts.localFile ? (current && download && current.machineId === download.meta.serverId ? current : null) : current;
|
||||||
|
playServer = s;
|
||||||
|
playDownload = download;
|
||||||
|
localScrobbled = false;
|
||||||
|
// From the miniplayer the window may have gone full screen (or left it) since.
|
||||||
|
const fullscreenNow = await win.isFullscreen().catch(() => false);
|
||||||
|
if (stale()) return;
|
||||||
if (!previous.open) {
|
if (!previous.open) {
|
||||||
triedFallback = false;
|
triedFallback = false;
|
||||||
wasFullscreenBeforePlay = await win.isFullscreen().catch(() => false);
|
wasFullscreenBeforePlay = fullscreenNow;
|
||||||
}
|
}
|
||||||
set({
|
set({
|
||||||
open: true,
|
open: true,
|
||||||
|
|
@ -580,23 +815,29 @@ 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,
|
||||||
duration: input.duration / 1000,
|
duration: input.duration / 1000,
|
||||||
cacheTime: 0,
|
cacheTime: 0,
|
||||||
paused: false,
|
paused: false,
|
||||||
buffering: true,
|
buffering: true,
|
||||||
ended: false,
|
ended: false,
|
||||||
nextUp: null,
|
nextUp: null,
|
||||||
|
prevUp: null,
|
||||||
|
episodeContextReady: false,
|
||||||
countdown: null,
|
countdown: null,
|
||||||
|
countdownTotal: 0,
|
||||||
|
postPlay: false,
|
||||||
postPlayDismissed: false,
|
postPlayDismissed: false,
|
||||||
chapters: [],
|
chapters: [],
|
||||||
audioTracks: [],
|
audioTracks: [],
|
||||||
subTracks: [],
|
subTracks: [],
|
||||||
audioKey: '',
|
audioKey: opts.tracks?.audioKey ?? '',
|
||||||
subKey: '__init',
|
subKey: opts.tracks?.subKey ?? '__init',
|
||||||
video: null,
|
video: null,
|
||||||
fullscreen: wasFullscreenBeforePlay,
|
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 },
|
||||||
});
|
});
|
||||||
|
|
@ -607,16 +848,16 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
if (!opts.localFile && s && (!input.media.length || !input.media[0].parts[0]?.streams.length || !input.raw?.Marker)) {
|
if (!opts.localFile && s && (!input.media.length || !input.media[0].parts[0]?.streams.length || !input.raw?.Marker)) {
|
||||||
item = await api.metadata(s, input.id).catch(() => input);
|
item = await api.metadata(s, input.id).catch(() => input);
|
||||||
}
|
}
|
||||||
if (token !== loadToken) return;
|
if (stale()) return;
|
||||||
const mediaIndex = Math.min(opts.mediaIndex ?? 0, Math.max(0, item.media.length - 1));
|
const mediaIndex = Math.min(opts.mediaIndex ?? 0, Math.max(0, item.media.length - 1));
|
||||||
const media = item.media[mediaIndex];
|
let media = item.media[mediaIndex];
|
||||||
let offsetMs = opts.offsetMs ?? (opts.resume !== false && item.viewOffset && item.viewOffset < item.duration * 0.97 ? item.viewOffset : 0);
|
let offsetMs = opts.offsetMs ?? (opts.resume !== false && item.viewOffset && item.viewOffset < item.duration * 0.97 ? item.viewOffset : 0);
|
||||||
startOffsetMs = offsetMs;
|
|
||||||
const local = useSession.getState().connection?.local ?? true;
|
const local = useSession.getState().connection?.local ?? true;
|
||||||
const quality: Quality = opts.quality ?? (local ? prefs.quality : prefs.remoteQuality);
|
const quality: Quality = opts.quality ?? (local ? prefs.quality : prefs.remoteQuality);
|
||||||
session = crypto.randomUUID();
|
const streams = media?.parts.flatMap((p) => p.streams) ?? [];
|
||||||
sessionAnswered = false;
|
const audioTracks = streams.filter((x) => x.streamType === 2).map(audioTrackFromStream);
|
||||||
scrobbled = false;
|
const subTracks = streams.filter((x) => x.streamType === 3).map(subTrackFromStream);
|
||||||
|
let tracks: { audioKey: string; subKey: string } | null = null;
|
||||||
|
|
||||||
let delivery: Delivery;
|
let delivery: Delivery;
|
||||||
if (opts.localFile) {
|
if (opts.localFile) {
|
||||||
|
|
@ -626,30 +867,52 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
} else if (quality === 'original') {
|
} else if (quality === 'original') {
|
||||||
delivery = { url: directUrl(s, media), mode: 'direct', label: 'Original', absoluteTime: false };
|
delivery = { url: directUrl(s, media), mode: 'direct', label: 'Original', absoluteTime: false };
|
||||||
} else {
|
} else {
|
||||||
|
// Plex converts (and burns in) the tracks selected on the server, so the chosen
|
||||||
|
// ones are saved there before the conversion starts, not after.
|
||||||
|
tracks = preferredTracks(audioTracks, subTracks, prefs, opts.tracks?.audioKey, opts.tracks?.subKey);
|
||||||
|
const audioStreamID = streamId(audioTracks, tracks.audioKey);
|
||||||
|
const subtitleStreamID = streamId(subTracks, tracks.subKey) ?? '';
|
||||||
|
const base = item;
|
||||||
|
item = await saveSelection(s, base, mediaIndex, selectionFor(base, mediaIndex, audioStreamID, subtitleStreamID)).catch(() => base);
|
||||||
|
if (stale()) return;
|
||||||
|
media = item.media[mediaIndex];
|
||||||
const tsession = crypto.randomUUID();
|
const tsession = crypto.randomUUID();
|
||||||
delivery = {
|
delivery = {
|
||||||
url: transcodeUrl(s, item, { mediaIndex, quality, offsetMs, session: tsession, local }),
|
url: transcodeUrl(s, item, { mediaIndex, quality, offsetMs, session: tsession, local, audioStreamID, subtitleStreamID: subtitleStreamID || undefined }),
|
||||||
mode: 'transcode',
|
mode: 'transcode',
|
||||||
session: tsession,
|
session: tsession,
|
||||||
label: quality === '2160' ? '4K' : `${quality}p`,
|
label: quality === '2160' ? '4K' : `${quality}p`,
|
||||||
absoluteTime: true,
|
absoluteTime: true,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
startOffsetMs = offsetMs;
|
||||||
|
session = crypto.randomUUID();
|
||||||
|
sessionAnswered = false;
|
||||||
|
scrobbled = false;
|
||||||
|
|
||||||
const streams = media?.parts.flatMap((p) => p.streams) ?? [];
|
|
||||||
set({
|
set({
|
||||||
item,
|
item,
|
||||||
delivery,
|
delivery,
|
||||||
mediaIndex,
|
mediaIndex,
|
||||||
quality,
|
quality,
|
||||||
duration: (item.duration || media?.duration || 0) / 1000,
|
duration: (item.duration || media?.duration || 0) / 1000,
|
||||||
audioTracks: streams.filter((x) => x.streamType === 2).map(audioTrackFromStream),
|
audioTracks,
|
||||||
subTracks: streams.filter((x) => x.streamType === 3).map(subTrackFromStream),
|
subTracks,
|
||||||
|
...(tracks ?? {}),
|
||||||
|
});
|
||||||
|
|
||||||
|
findNeighbours(item).then((n) => {
|
||||||
|
if (token !== loadToken) return;
|
||||||
|
set({ ...n, episodeContextReady: true });
|
||||||
|
const current = get();
|
||||||
|
if (current.postPlay) startCountdown();
|
||||||
|
else if (current.ended) openPostPlay();
|
||||||
|
else maybeCredits(current.position);
|
||||||
});
|
});
|
||||||
|
|
||||||
await mpv.init({ hwdec: prefs.hwdec, hdr: prefs.hdrPassthrough });
|
await mpv.init({ hwdec: prefs.hwdec, hdr: prefs.hdrPassthrough });
|
||||||
if (!unlisten) unlisten = await mpv.on(onEvent);
|
if (!unlisten) unlisten = await mpv.on(onEvent);
|
||||||
if (token !== loadToken) return;
|
if (stale()) return;
|
||||||
// mpv keeps pause across files: a title paused and closed would start paused.
|
// mpv keeps pause across files: a title paused and closed would start paused.
|
||||||
await mpv.set('pause', false);
|
await mpv.set('pause', false);
|
||||||
await mpv.set('mute', false);
|
await mpv.set('mute', false);
|
||||||
|
|
@ -657,16 +920,24 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
await mpv.set('speed', 1);
|
await mpv.set('speed', 1);
|
||||||
await mpv.set('audio-delay', 0);
|
await mpv.set('audio-delay', 0);
|
||||||
await applySubtitleStyle(prefs);
|
await applySubtitleStyle(prefs);
|
||||||
|
if (stale()) return;
|
||||||
followVideoSize();
|
followVideoSize();
|
||||||
await requestEnhancement();
|
await requestEnhancement();
|
||||||
|
if (stale()) return;
|
||||||
watchPerformance(true);
|
watchPerformance(true);
|
||||||
await mpv.set('force-media-title', item.type === 'episode' ? `${item.grandparentTitle} — ${item.title}` : item.title);
|
await mpv.set('force-media-title', item.type === 'episode' ? `${item.grandparentTitle} — ${item.title}` : item.title);
|
||||||
|
if (stale()) return;
|
||||||
await mpv.show(true);
|
await mpv.show(true);
|
||||||
|
if (stale()) return;
|
||||||
const fileOpts = [
|
const fileOpts = [
|
||||||
delivery.mode === 'transcode' ? 'rebase-start-time=no' : 'rebase-start-time=yes',
|
delivery.mode === 'transcode' ? 'rebase-start-time=no' : 'rebase-start-time=yes',
|
||||||
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;
|
||||||
keepAwake(true);
|
keepAwake(true);
|
||||||
report('buffering');
|
report('buffering');
|
||||||
reportTimer && clearInterval(reportTimer);
|
reportTimer && clearInterval(reportTimer);
|
||||||
|
|
@ -674,7 +945,6 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
const st = get();
|
const st = get();
|
||||||
if (st.open && !st.ended) report(st.paused ? 'paused' : st.buffering ? 'buffering' : 'playing');
|
if (st.open && !st.ended) report(st.paused ? 'paused' : st.buffering ? 'buffering' : 'playing');
|
||||||
}, 10000);
|
}, 10000);
|
||||||
findNext(item).then((next) => token === loadToken && set({ nextUp: next }));
|
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
if (token !== loadToken) return;
|
if (token !== loadToken) return;
|
||||||
set({ error: e?.message ?? String(e), buffering: false });
|
set({ error: e?.message ?? String(e), buffering: false });
|
||||||
|
|
@ -685,25 +955,44 @@ 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');
|
||||||
const s = server();
|
const s = server();
|
||||||
if (st.delivery?.session && s) stopTranscode(s, st.delivery.session);
|
if (st.delivery?.session && s) stopTranscode(s, st.delivery.session);
|
||||||
|
// Nothing more is reported for this playback, whatever mpv says while it stops.
|
||||||
|
session = '';
|
||||||
|
playServer = null;
|
||||||
|
playDownload = null;
|
||||||
keepAwake(false);
|
keepAwake(false);
|
||||||
watchPerformance(false);
|
watchPerformance(false);
|
||||||
if (isNative) {
|
if (isNative) {
|
||||||
|
// From the miniplayer window, the video goes home first (and stays hidden).
|
||||||
|
if (separateMini && st.mini) await hideMiniWindow();
|
||||||
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, item: null, delivery: null, error: '', terminated: false, countdown: null, nextUp: 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 });
|
||||||
const fs = await win.isFullscreen().catch(() => false);
|
// Closing the full player hands back the window it found; closing the
|
||||||
if (fs && !wasFullscreenBeforePlay) win.setFullscreen(false);
|
// miniplayer leaves browsing as it is, full screen or not.
|
||||||
|
if (!st.mini) {
|
||||||
|
const fs = await win.isFullscreen().catch(() => false);
|
||||||
|
if (fs && !wasFullscreenBeforePlay) win.setFullscreen(false);
|
||||||
|
}
|
||||||
if (st.item) invalidateLibrary();
|
if (st.item) invalidateLibrary();
|
||||||
},
|
},
|
||||||
|
|
||||||
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 });
|
||||||
|
|
@ -714,11 +1003,8 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
seek(seconds) {
|
seek(seconds) {
|
||||||
const st = get();
|
const st = get();
|
||||||
const target = Math.max(0, Math.min(seconds, (st.duration || seconds) - 0.5));
|
const target = Math.max(0, Math.min(seconds, (st.duration || seconds) - 0.5));
|
||||||
set({ position: target, ended: false });
|
set({ position: target, ended: false, lastSeek: Date.now() });
|
||||||
if (st.countdown !== null) {
|
if (st.postPlay) st.dismissPostPlay();
|
||||||
stopCountdown();
|
|
||||||
set({ countdown: null });
|
|
||||||
}
|
|
||||||
mpv.command('seek', target.toFixed(3), 'absolute+exact').catch(() => {});
|
mpv.command('seek', target.toFixed(3), 'absolute+exact').catch(() => {});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -754,16 +1040,22 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
async minimize() {
|
async minimize() {
|
||||||
const st = get();
|
const st = get();
|
||||||
if (!st.open || st.mini) return;
|
if (!st.open || st.mini) return;
|
||||||
|
if (st.postPlay) st.dismissPostPlay();
|
||||||
|
// Full screen stays for browsing; Esc or the window controls leave it.
|
||||||
set({ mini: true });
|
set({ mini: true });
|
||||||
// Full screen was for the video; browsing goes back to the window.
|
if (separateMini) {
|
||||||
if (st.fullscreen && !wasFullscreenBeforePlay) {
|
// Once the page is opaque again (no video in it), the video moves into
|
||||||
await win.setFullscreen(false).catch(() => {});
|
// the miniplayer's own window (miniWindow.ts).
|
||||||
set({ fullscreen: false });
|
await new Promise((r) => requestAnimationFrame(() => requestAnimationFrame(r)));
|
||||||
|
if (get().open && get().mini) await showMiniWindow().catch((e) => console.warn('[mini]', e));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
expand() {
|
expand() {
|
||||||
if (get().mini) set({ mini: false });
|
if (!get().mini) return;
|
||||||
|
// The video comes back behind the still-opaque page before it turns transparent.
|
||||||
|
if (separateMini) hideMiniWindow().finally(() => set({ mini: false }));
|
||||||
|
else set({ mini: false });
|
||||||
},
|
},
|
||||||
|
|
||||||
async selectAudio(key) {
|
async selectAudio(key) {
|
||||||
|
|
@ -771,35 +1063,30 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
const t = st.audioTracks.find((x) => x.key === key);
|
const t = st.audioTracks.find((x) => x.key === key);
|
||||||
if (!t) return;
|
if (!t) return;
|
||||||
set({ audioKey: key });
|
set({ audioKey: key });
|
||||||
const s = server();
|
|
||||||
const part = st.item?.media[st.mediaIndex]?.parts[0];
|
|
||||||
if (s && part && t.stream) api.selectStreams(s, part.id, { audioStreamID: t.stream.id }).catch(() => {});
|
|
||||||
if (st.delivery?.mode === 'transcode' && st.item) {
|
if (st.delivery?.mode === 'transcode' && st.item) {
|
||||||
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: st.quality });
|
// The restart saves the choice on the server before converting with it.
|
||||||
|
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: st.quality, tracks: { ...currentTracks(st), audioKey: key } });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (t.mpvId) await mpv.set('aid', t.mpvId).catch(() => {});
|
if (t.mpvId) await mpv.set('aid', t.mpvId).catch(() => {});
|
||||||
|
rememberSelection(st, t.stream?.id, undefined);
|
||||||
},
|
},
|
||||||
|
|
||||||
async selectSubtitle(key) {
|
async selectSubtitle(key) {
|
||||||
const st = get();
|
const st = get();
|
||||||
set({ subKey: key });
|
set({ subKey: key });
|
||||||
const s = server();
|
|
||||||
const part = st.item?.media[st.mediaIndex]?.parts[0];
|
|
||||||
const t = st.subTracks.find((x) => x.key === key);
|
|
||||||
if (s && part) api.selectStreams(s, part.id, { subtitleStreamID: t?.stream?.id ?? '0' }).catch(() => {});
|
|
||||||
if (st.delivery?.mode === 'transcode' && st.item) {
|
if (st.delivery?.mode === 'transcode' && st.item) {
|
||||||
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: st.quality });
|
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: st.quality, tracks: { ...currentTracks(st), subKey: key } });
|
||||||
usePlayer.setState({ subKey: key });
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await setMpvSubtitle(key);
|
await setMpvSubtitle(key);
|
||||||
|
rememberSelection(st, undefined, streamId(st.subTracks, key) ?? '');
|
||||||
},
|
},
|
||||||
|
|
||||||
async setQuality(q) {
|
async setQuality(q) {
|
||||||
const st = get();
|
const st = get();
|
||||||
if (!st.item || q === st.quality) return;
|
if (!st.item || q === st.quality) return;
|
||||||
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: q });
|
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: q, tracks: currentTracks(st) });
|
||||||
},
|
},
|
||||||
|
|
||||||
async selectVersion(index) {
|
async selectVersion(index) {
|
||||||
|
|
@ -812,7 +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() {
|
||||||
|
const st = get();
|
||||||
|
if (!st.prevUp) return;
|
||||||
|
await st.play(st.prevUp, { resume: false, quality: st.quality });
|
||||||
},
|
},
|
||||||
|
|
||||||
cancelCountdown() {
|
cancelCountdown() {
|
||||||
|
|
@ -820,6 +1115,17 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
set({ countdown: null, postPlayDismissed: true });
|
set({ countdown: null, postPlayDismissed: true });
|
||||||
},
|
},
|
||||||
|
|
||||||
|
showPostPlay() {
|
||||||
|
// A deliberate Skip credits can reopen a screen previously dismissed.
|
||||||
|
set({ postPlayDismissed: false });
|
||||||
|
openPostPlay();
|
||||||
|
},
|
||||||
|
|
||||||
|
dismissPostPlay() {
|
||||||
|
stopCountdown();
|
||||||
|
set({ countdown: null, postPlay: false, postPlayDismissed: true });
|
||||||
|
},
|
||||||
|
|
||||||
async toggleFullscreen() {
|
async toggleFullscreen() {
|
||||||
const fs = await win.isFullscreen().catch(() => false);
|
const fs = await win.isFullscreen().catch(() => false);
|
||||||
await win.setFullscreen(!fs);
|
await win.setFullscreen(!fs);
|
||||||
|
|
@ -841,13 +1147,44 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
usePlayer.subscribe((st, prev) => {
|
usePlayer.subscribe((st, prev) => {
|
||||||
if (st.firstFrame !== prev.firstFrame || st.open !== prev.open || st.error !== prev.error || st.mini !== prev.mini) {
|
if (st.firstFrame !== prev.firstFrame || st.open !== prev.open || st.error !== prev.error || st.mini !== prev.mini) {
|
||||||
const html = document.documentElement.classList;
|
const html = document.documentElement.classList;
|
||||||
html.toggle('video-active', st.open && st.firstFrame && !st.error);
|
// With a miniplayer window, the video has left this page entirely.
|
||||||
|
html.toggle('video-active', st.open && st.firstFrame && !st.error && !(st.mini && separateMini));
|
||||||
html.toggle('player-open', st.open && !st.mini);
|
html.toggle('player-open', st.open && !st.mini);
|
||||||
html.toggle('player-mini', st.open && st.mini);
|
html.toggle('player-mini', st.open && st.mini);
|
||||||
}
|
}
|
||||||
// However the miniplayer is left (expanding, playing another title, closing),
|
// However the miniplayer is left (expanding, playing another title, closing),
|
||||||
// the video returns to the whole window.
|
// the video returns to the whole window.
|
||||||
if (prev.mini && !st.mini && isNative) mpv.rect(null).catch(() => {});
|
if (prev.mini && !st.mini && isNative) {
|
||||||
|
if (separateMini) hideMiniWindow();
|
||||||
|
else mpv.rect(null).catch(() => {});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
bridgeMiniWindow(usePlayer);
|
||||||
|
|
||||||
|
// Full screen can change outside the player (Esc or the window controls while
|
||||||
|
// browsing with the miniplayer, the OS): the player's controls follow it.
|
||||||
|
win.onResized(() => {
|
||||||
|
if (!usePlayer.getState().open) return;
|
||||||
|
win.isFullscreen().then((fs) => usePlayer.getState().fullscreen !== fs && usePlayer.setState({ fullscreen: fs }), () => {});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Signing out, or switching server or profile, ends a stream from the old one: its
|
||||||
|
* progress belongs to that account. A download keeps playing, without reporting.
|
||||||
|
* A reconnect to the same server with the same credentials carries on.
|
||||||
|
*/
|
||||||
|
useSession.subscribe((st, prev) => {
|
||||||
|
const old = prev.server;
|
||||||
|
if (!old || st.server === old) return;
|
||||||
|
const same = !!st.server && st.server.machineId === old.machineId && st.server.token === old.token;
|
||||||
|
if (playServer !== old) return;
|
||||||
|
if (same) {
|
||||||
|
playServer = st.server;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (usePlayer.getState().open && !playDownload) usePlayer.getState().close();
|
||||||
|
playServer = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
/** Subtitle look changes apply to the playing video straight away. */
|
/** Subtitle look changes apply to the playing video straight away. */
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { arr, bool, num, str } from './parse';
|
import { arr, bool, num, str } from './parse';
|
||||||
import { clientIdentifier, PlexError, plexRequest, PRODUCT } from './client';
|
import { clientIdentifier, DEVICE, PLATFORM, PlexError, plexRequest, PRODUCT } from './client';
|
||||||
import type { HomeUser, PlexUser, ServerConnection, ServerResource } from './types';
|
import type { HomeUser, PlexUser, ServerConnection, ServerResource } from './types';
|
||||||
|
|
||||||
const TV = 'https://plex.tv/api/v2';
|
const TV = 'https://plex.tv/api/v2';
|
||||||
|
|
@ -26,8 +26,8 @@ export function authUrl(pin: Pin): string {
|
||||||
clientID: clientIdentifier(),
|
clientID: clientIdentifier(),
|
||||||
code: pin.code,
|
code: pin.code,
|
||||||
'context[device][product]': PRODUCT,
|
'context[device][product]': PRODUCT,
|
||||||
'context[device][platform]': 'Windows',
|
'context[device][platform]': PLATFORM,
|
||||||
'context[device][device]': 'Windows',
|
'context[device][device]': DEVICE,
|
||||||
});
|
});
|
||||||
return `https://app.plex.tv/auth#?${params.toString()}`;
|
return `https://app.plex.tv/auth#?${params.toString()}`;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
import { httpFetch } from '../platform/native';
|
import { hostOS, httpFetch } from '../platform/native';
|
||||||
|
|
||||||
export const PRODUCT = 'Kaleido';
|
export const PRODUCT = 'Kaleido';
|
||||||
export const PLATFORM = 'Windows';
|
/** How Plex lists this player (Plex's own names for each OS and device). */
|
||||||
|
export const PLATFORM = hostOS === 'macos' ? 'macOS' : hostOS === 'linux' ? 'Linux' : 'Windows';
|
||||||
|
export const DEVICE = hostOS === 'macos' ? 'Mac' : hostOS === 'linux' ? 'Linux' : 'Windows';
|
||||||
|
|
||||||
export class PlexError extends Error {
|
export class PlexError extends Error {
|
||||||
constructor(
|
constructor(
|
||||||
|
|
@ -14,7 +16,8 @@ export class PlexError extends Error {
|
||||||
|
|
||||||
let clientId = '';
|
let clientId = '';
|
||||||
let version = '0.1.0';
|
let version = '0.1.0';
|
||||||
let deviceName = 'Windows PC';
|
let deviceName = hostOS === 'macos' ? 'Mac' : 'Windows PC';
|
||||||
|
let platformVersion = hostOS === 'windows' ? '11' : '';
|
||||||
|
|
||||||
/** A stable, random identifier for this installation (not secret). */
|
/** A stable, random identifier for this installation (not secret). */
|
||||||
export function clientIdentifier(): string {
|
export function clientIdentifier(): string {
|
||||||
|
|
@ -27,9 +30,24 @@ export function clientIdentifier(): string {
|
||||||
return clientId;
|
return clientId;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function configureClient(opts: { version?: string; deviceName?: string }) {
|
export function configureClient(opts: { version?: string; deviceName?: string; platformVersion?: string }) {
|
||||||
if (opts.version) version = opts.version;
|
if (opts.version) version = opts.version;
|
||||||
if (opts.deviceName) deviceName = opts.deviceName;
|
if (opts.deviceName) deviceName = opts.deviceName;
|
||||||
|
if (opts.platformVersion) platformVersion = opts.platformVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* HTTP header values must be ASCII; Mac names usually aren't ("Elijah’s MacBook").
|
||||||
|
* Typographic punctuation becomes its plain form and accents are dropped.
|
||||||
|
*/
|
||||||
|
export function headerSafe(value: string): string {
|
||||||
|
return value
|
||||||
|
.replace(/[‘’]/g, "'")
|
||||||
|
.replace(/[“”]/g, '"')
|
||||||
|
.replace(/[–—]/g, '-')
|
||||||
|
.normalize('NFKD')
|
||||||
|
.replace(/[^\x20-\x7e]/g, '')
|
||||||
|
.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function plexHeaders(token?: string | null): Record<string, string> {
|
export function plexHeaders(token?: string | null): Record<string, string> {
|
||||||
|
|
@ -39,9 +57,9 @@ export function plexHeaders(token?: string | null): Record<string, string> {
|
||||||
'X-Plex-Version': version,
|
'X-Plex-Version': version,
|
||||||
'X-Plex-Client-Identifier': clientIdentifier(),
|
'X-Plex-Client-Identifier': clientIdentifier(),
|
||||||
'X-Plex-Platform': PLATFORM,
|
'X-Plex-Platform': PLATFORM,
|
||||||
'X-Plex-Platform-Version': '11',
|
'X-Plex-Platform-Version': platformVersion,
|
||||||
'X-Plex-Device': 'Windows',
|
'X-Plex-Device': DEVICE,
|
||||||
'X-Plex-Device-Name': `Kaleido (${deviceName})`,
|
'X-Plex-Device-Name': headerSafe(`Kaleido (${deviceName})`),
|
||||||
'X-Plex-Model': 'Desktop',
|
'X-Plex-Model': 'Desktop',
|
||||||
'X-Plex-Provides': 'player',
|
'X-Plex-Provides': 'player',
|
||||||
'X-Plex-Language': navigator.language || 'en',
|
'X-Plex-Language': navigator.language || 'en',
|
||||||
|
|
@ -57,7 +75,7 @@ export function plexQuery(token?: string | null): Record<string, string> {
|
||||||
'X-Plex-Version': version,
|
'X-Plex-Version': version,
|
||||||
'X-Plex-Client-Identifier': clientIdentifier(),
|
'X-Plex-Client-Identifier': clientIdentifier(),
|
||||||
'X-Plex-Platform': PLATFORM,
|
'X-Plex-Platform': PLATFORM,
|
||||||
'X-Plex-Device': 'Windows',
|
'X-Plex-Device': DEVICE,
|
||||||
'X-Plex-Device-Name': `Kaleido (${deviceName})`,
|
'X-Plex-Device-Name': `Kaleido (${deviceName})`,
|
||||||
};
|
};
|
||||||
if (token) q['X-Plex-Token'] = token;
|
if (token) q['X-Plex-Token'] = token;
|
||||||
|
|
@ -103,23 +121,41 @@ export async function plexRequest<T = any>(url: string, token: string | null | u
|
||||||
const timer = setTimeout(() => controller.abort(), opts.timeout ?? 30000);
|
const timer = setTimeout(() => controller.abort(), opts.timeout ?? 30000);
|
||||||
const onAbort = () => controller.abort();
|
const onAbort = () => controller.abort();
|
||||||
opts.signal?.addEventListener('abort', onAbort);
|
opts.signal?.addEventListener('abort', onAbort);
|
||||||
|
// The timeout and the caller's cancel cover the body as well as the headers: a reply
|
||||||
|
// that stalls part way must still end. (Rejects only once aborted.)
|
||||||
|
const aborted = new Promise<never>((_, reject) =>
|
||||||
|
controller.signal.addEventListener('abort', () => reject(opts.signal?.aborted ? opts.signal.reason : new PlexError('The server took too long to respond.', 0)), { once: true }),
|
||||||
|
);
|
||||||
|
aborted.catch(() => {});
|
||||||
|
if (opts.signal?.aborted) controller.abort();
|
||||||
let response: Response;
|
let response: Response;
|
||||||
|
let text: string;
|
||||||
try {
|
try {
|
||||||
response = await httpFetch(withParams(url, opts.params), {
|
try {
|
||||||
method: opts.method ?? 'GET',
|
response = await Promise.race([
|
||||||
headers: { ...plexHeaders(token), ...opts.headers },
|
httpFetch(withParams(url, opts.params), {
|
||||||
body: opts.body ?? undefined,
|
method: opts.method ?? 'GET',
|
||||||
signal: controller.signal,
|
headers: { ...plexHeaders(token), ...opts.headers },
|
||||||
});
|
body: opts.body ?? undefined,
|
||||||
} catch (e: any) {
|
signal: controller.signal,
|
||||||
if (opts.signal?.aborted) throw e;
|
}),
|
||||||
throw new PlexError(controller.signal.aborted ? 'The server took too long to respond.' : 'Could not reach the server.', 0);
|
aborted,
|
||||||
|
]);
|
||||||
|
} catch (e: any) {
|
||||||
|
if (opts.signal?.aborted) throw e;
|
||||||
|
throw new PlexError(controller.signal.aborted ? 'The server took too long to respond.' : 'Could not reach the server.', 0);
|
||||||
|
}
|
||||||
|
if (!response.ok) throw new PlexError(statusMessage(response.status), response.status);
|
||||||
|
try {
|
||||||
|
text = await Promise.race([response.text(), aborted]);
|
||||||
|
} catch (e: any) {
|
||||||
|
if (opts.signal?.aborted || e instanceof PlexError) throw e;
|
||||||
|
throw new PlexError('The connection to the server was lost.', 0);
|
||||||
|
}
|
||||||
} finally {
|
} finally {
|
||||||
clearTimeout(timer);
|
clearTimeout(timer);
|
||||||
opts.signal?.removeEventListener('abort', onAbort);
|
opts.signal?.removeEventListener('abort', onAbort);
|
||||||
}
|
}
|
||||||
if (!response.ok) throw new PlexError(statusMessage(response.status), response.status);
|
|
||||||
const text = await response.text();
|
|
||||||
if (opts.text) return text as unknown as T;
|
if (opts.text) return text as unknown as T;
|
||||||
if (!text.trim()) return {} as T;
|
if (!text.trim()) return {} as T;
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,10 @@ export function transcodeUrl(
|
||||||
path: `/library/metadata/${item.id}`,
|
path: `/library/metadata/${item.id}`,
|
||||||
mediaIndex: opts.mediaIndex,
|
mediaIndex: opts.mediaIndex,
|
||||||
partIndex: 0,
|
partIndex: 0,
|
||||||
|
// Plex converts the part's selected streams; callers save the selection first and
|
||||||
|
// name it here as well.
|
||||||
|
audioStreamID: opts.audioStreamID,
|
||||||
|
subtitleStreamID: opts.subtitleStreamID,
|
||||||
protocol: 'hls',
|
protocol: 'hls',
|
||||||
session: opts.session,
|
session: opts.session,
|
||||||
offset: (opts.offsetMs / 1000).toFixed(1),
|
offset: (opts.offsetMs / 1000).toFixed(1),
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@ import { describe, expect, it } from 'vitest';
|
||||||
import { parseItem, parseScores } from './parse';
|
import { parseItem, parseScores } from './parse';
|
||||||
import { isLocalAddress } from './account';
|
import { isLocalAddress } from './account';
|
||||||
import { partAt } from './playback';
|
import { partAt } from './playback';
|
||||||
import { duration, formatBadges, isWatched, remaining, washGradient } from '../app/format';
|
import { headerSafe } from './client';
|
||||||
|
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';
|
||||||
|
|
||||||
|
|
@ -64,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', () => {
|
||||||
|
|
@ -112,3 +119,10 @@ describe('features', () => {
|
||||||
expect(washGradient(movie().ultraBlur)).toContain('rgba(48, 97, 143');
|
expect(washGradient(movie().ultraBlur)).toContain('rgba(48, 97, 143');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('headerSafe', () => {
|
||||||
|
it('turns Mac computer names into ASCII header values', () => {
|
||||||
|
expect(headerSafe('Elijah’s MacBook Pro')).toBe("Elijah's MacBook Pro");
|
||||||
|
expect(headerSafe('Zoë’s iMac — Studio')).toBe("Zoe's iMac - Studio");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
|
||||||
|
|
@ -174,7 +174,7 @@ export default function Downloads({ offline }: { offline?: boolean }) {
|
||||||
{!isNative && (
|
{!isNative && (
|
||||||
<div className="downloads-empty">
|
<div className="downloads-empty">
|
||||||
<EmptyState icon="download" title="Downloads need the desktop app">
|
<EmptyState icon="download" title="Downloads need the desktop app">
|
||||||
Install Kaleido for Windows to save movies and episodes for offline viewing.
|
Install the Kaleido desktop app to save movies and episodes for offline viewing.
|
||||||
</EmptyState>
|
</EmptyState>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
import { useQuery } from '@tanstack/react-query';
|
import { useQuery } from '@tanstack/react-query';
|
||||||
import * as api from '../plex/api';
|
import * as api from '../plex/api';
|
||||||
import { useSections, useServerQuery } from '../app/queries';
|
import { PROGRESS, WATCH_STATE, useSections, useServerQuery } from '../app/queries';
|
||||||
import { useServer } from '../app/session';
|
import { useServer } from '../app/session';
|
||||||
import { navigate } from '../app/router';
|
import { navigate } from '../app/router';
|
||||||
import { Hero } from '../ui/Hero';
|
import { Hero } from '../ui/Hero';
|
||||||
|
|
@ -14,8 +14,8 @@ export function Home() {
|
||||||
const sections = useSections();
|
const sections = useSections();
|
||||||
const video = (sections.data ?? []).filter((s) => (s.type === 'movie' || s.type === 'show') && !s.hidden);
|
const video = (sections.data ?? []).filter((s) => (s.type === 'movie' || s.type === 'show') && !s.hidden);
|
||||||
|
|
||||||
const home = useServerQuery(['homeHubs'], (s) => api.homeHubs(s));
|
const home = useServerQuery(['homeHubs'], (s) => api.homeHubs(s), WATCH_STATE);
|
||||||
const continueWatching = useServerQuery(['continue'], (s) => api.continueWatching(s), { staleTime: 15_000 });
|
const continueWatching = useServerQuery(['continue'], (s) => api.continueWatching(s), PROGRESS);
|
||||||
// Section hubs feed the hero and the release shelves; shared with Discover.
|
// Section hubs feed the hero and the release shelves; shared with Discover.
|
||||||
const sectionHubs = useQuery({
|
const sectionHubs = useQuery({
|
||||||
queryKey: [server.machineId, 'sectionHubsAll', video.map((s) => s.id).join(',')],
|
queryKey: [server.machineId, 'sectionHubsAll', video.map((s) => s.id).join(',')],
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,15 @@
|
||||||
import { useEffect, useMemo, useState, type ReactNode } from 'react';
|
import { useEffect, useMemo, useState, type ReactNode } from 'react';
|
||||||
import * as api from '../plex/api';
|
import * as api from '../plex/api';
|
||||||
import type { Item } from '../plex/types';
|
import type { Item } from '../plex/types';
|
||||||
import { 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), { staleTime: 15_000 });
|
|
||||||
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)}>
|
||||||
|
|
|
||||||
|
|
@ -236,6 +236,33 @@ function LibraryGrid({ section, type, sort, filters, title, sortTitle }: { secti
|
||||||
loadPage(0);
|
loadPage(0);
|
||||||
}, [loadPage]);
|
}, [loadPage]);
|
||||||
|
|
||||||
|
// Pages are copied out of the cache, so nothing re-renders when it is invalidated
|
||||||
|
// (watched state, edits, deletions, library changes): fetch the loaded ones again.
|
||||||
|
const loaded = useRef(pages);
|
||||||
|
loaded.current = pages;
|
||||||
|
useEffect(() => {
|
||||||
|
const prefix = JSON.stringify([server.machineId, 'libraryPage', section.id, params]);
|
||||||
|
const due = new Set<number>();
|
||||||
|
let timer: ReturnType<typeof setTimeout> | null = null;
|
||||||
|
const unsubscribe = queryClient.getQueryCache().subscribe((event) => {
|
||||||
|
if (event.type !== 'updated' || event.action.type !== 'invalidate') return;
|
||||||
|
const key = event.query.queryKey;
|
||||||
|
const p = key[4];
|
||||||
|
if (typeof p !== 'number' || !loaded.current[p] || JSON.stringify(key.slice(0, 4)) !== prefix) return;
|
||||||
|
due.add(p);
|
||||||
|
// One pass after the whole invalidation, not one per page as it happens.
|
||||||
|
timer ??= setTimeout(() => {
|
||||||
|
timer = null;
|
||||||
|
for (const page of due) loadPage(page);
|
||||||
|
due.clear();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
unsubscribe();
|
||||||
|
if (timer) clearTimeout(timer);
|
||||||
|
};
|
||||||
|
}, [loadPage]);
|
||||||
|
|
||||||
const gap = 16;
|
const gap = 16;
|
||||||
const target = CARD_WIDTH[posterSize];
|
const target = CARD_WIDTH[posterSize];
|
||||||
const cols = Math.max(2, Math.floor((width + gap) / (target + gap)));
|
const cols = Math.max(2, Math.floor((width + gap) / (target + gap)));
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
import * as api from '../plex/api';
|
import * as api from '../plex/api';
|
||||||
import { useSectionFor, useServerQuery } from '../app/queries';
|
import { PROGRESS, useSectionFor, useServerQuery } from '../app/queries';
|
||||||
import { navigate, useRouter, type SectionKind, type SectionTab } from '../app/router';
|
import { navigate, useRouter, type SectionKind, type SectionTab } from '../app/router';
|
||||||
import { useSettings } from '../app/settings';
|
import { useSettings } from '../app/settings';
|
||||||
import type { Section } from '../plex/types';
|
import type { Section } from '../plex/types';
|
||||||
|
|
@ -46,7 +46,7 @@ function SectionHeader({ kind, tab, section, all, overlay }: { kind: SectionKind
|
||||||
|
|
||||||
function Discover({ kind, section }: { kind: SectionKind; section: Section }) {
|
function Discover({ kind, section }: { kind: SectionKind; section: Section }) {
|
||||||
const hubs = useServerQuery(['sectionHubs', section.id], (s) => api.sectionHubs(s, section.id));
|
const hubs = useServerQuery(['sectionHubs', section.id], (s) => api.sectionHubs(s, section.id));
|
||||||
const cw = useServerQuery(['continue', section.id], (s) => api.continueWatching(s, section.id), { staleTime: 15_000 });
|
const cw = useServerQuery(['continue', section.id], (s) => api.continueWatching(s, section.id), PROGRESS);
|
||||||
const seasons = useServerQuery(['recentSeasons', section.id], (s) => recentSeasons(s, section.id), { enabled: kind === 'show', staleTime: 120_000 });
|
const seasons = useServerQuery(['recentSeasons', section.id], (s) => recentSeasons(s, section.id), { enabled: kind === 'show', staleTime: 120_000 });
|
||||||
const features = useMemo(() => buildFeatures(hubs.data ?? [], 7, kind === 'movie' ? 1 : 2), [hubs.data, kind]);
|
const features = useMemo(() => buildFeatures(hubs.data ?? [], 7, kind === 'movie' ? 1 : 2), [hubs.data, kind]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@ import { useEffect, useRef } from 'react';
|
||||||
import { useSettings } from '../app/settings';
|
import { useSettings } from '../app/settings';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The cold-start brand sequence, the same as Kaleido for TV: a closed iris lit
|
* The cold-start brand sequence, kept short because desktop startup is quick:
|
||||||
* from behind twists open, light catches the facets and the wordmark slides out
|
* the mark's six facets spin in from a loose ring and snap together with a
|
||||||
* of the mark. Once startup is ready the camera flies through the aperture's
|
* ring pulse. If startup is still going, small shards circle the mark. Once
|
||||||
* dark centre, revealing the app drawn beneath (which settles from a slight
|
* startup is ready the camera flies through the mark's open centre, revealing
|
||||||
* 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 };
|
||||||
|
|
@ -41,73 +41,83 @@ const Emphasized = bezier(0.2, 0, 0, 1);
|
||||||
const EmphasizedDecelerate = bezier(0.05, 0.7, 0.1, 1);
|
const EmphasizedDecelerate = bezier(0.05, 0.7, 0.1, 1);
|
||||||
const Standard = bezier(0.4, 0, 0.2, 1);
|
const Standard = bezier(0.4, 0, 0.2, 1);
|
||||||
const InOut = bezier(0.45, 0, 0.55, 1);
|
const InOut = bezier(0.45, 0, 0.55, 1);
|
||||||
// A mechanical iris: the blades gather, snap open and overshoot slightly as they lock.
|
|
||||||
const IrisOpen = bezier(0.55, 0, 0.15, 1);
|
|
||||||
const IrisTwist = bezier(0.5, 0, 0.18, 1.1);
|
|
||||||
// Applied in log space: a brief pull back, then an accelerating flight.
|
// Applied in log space: a brief pull back, then an accelerating flight.
|
||||||
const Flight = bezier(0.55, -0.06, 0.8, 0.36);
|
const Flight = bezier(0.55, -0.06, 0.8, 0.36);
|
||||||
|
|
||||||
const phase = (time: number, start: number, end: number) => Math.min(1, Math.max(0, (time - start) / (end - start)));
|
const phase = (time: number, start: number, end: number) => Math.min(1, Math.max(0, (time - start) / (end - start)));
|
||||||
const mix = (from: number, to: number, amount: number) => from + (to - from) * amount;
|
const mix = (from: number, to: number, amount: number) => from + (to - from) * amount;
|
||||||
|
const rad = (deg: number) => (deg * Math.PI) / 180;
|
||||||
|
|
||||||
|
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
|
||||||
// outward normal of its hexagon edge for the iris motion.
|
// 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], '#C3E8D3'],
|
[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], '#71B9B0'],
|
[55.5, 47, 33, 60, 33, 45, 42.5, 39.5],
|
||||||
[[55.5, 47, 33, 60, 33, 45, 42.5, 39.5], '#3D7C7B'],
|
[31, 60, 8.5, 47, 21.5, 39.5, 31, 45],
|
||||||
[[31, 60, 8.5, 47, 21.5, 39.5, 31, 45], '#D0A977'],
|
[7.5, 45, 7.5, 19, 20.5, 26.5, 20.5, 37.5],
|
||||||
[[7.5, 45, 7.5, 19, 20.5, 26.5, 20.5, 37.5], '#E9D8AE'],
|
[8.5, 17, 31, 4, 31, 19, 21.5, 24.5],
|
||||||
[[8.5, 17, 31, 4, 31, 19, 21.5, 24.5], '#EEF2DD'],
|
].map((pts, i) => {
|
||||||
] as [number[], string][]
|
|
||||||
).map(([pts, color], i) => {
|
|
||||||
const angle = ((-60 + 60 * i) * Math.PI) / 180;
|
|
||||||
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 });
|
||||||
return { points, color, normal: { x: Math.cos(angle), y: Math.sin(angle) } };
|
const centroid = { x: points.reduce((s, p) => s + p.x, 0) / 4, y: points.reduce((s, p) => s + p.y, 0) / 4 };
|
||||||
|
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];
|
||||||
|
|
||||||
// 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 INNER_APOTHEM = 11.8;
|
const MARK_BOX = 140;
|
||||||
const INTRO_BOX = 132;
|
// Timeline (ms): the last facet locks at INTRO_END; the sequence then idles until startup is ready.
|
||||||
// The settled lockup is the header brand scaled up, so it reads as the same mark.
|
const FACET_STAGGER = 18;
|
||||||
const LOCK_SCALE = 2.75;
|
const FACET_MS = 350;
|
||||||
const LOCK_BOX = 29 * LOCK_SCALE;
|
const INTRO_END = FACET_STAGGER * 5 + FACET_MS;
|
||||||
const LOCK_GAP = 7 * LOCK_SCALE;
|
// Still waiting at this point: shards start circling and a sheen crosses the mark.
|
||||||
// Timeline (ms): held at GATHER_END until startup is ready (at most HOLD_MAX),
|
const IDLE_START = 1100;
|
||||||
// complete at INTRO_END; the slow settle runs on to TIMELINE_END.
|
// Keep in step with the `splash-arrival` animation in app.css.
|
||||||
const GATHER_END = 260;
|
const EXIT_MS = 540;
|
||||||
const INTRO_END = 2260;
|
const FLIGHT_ZOOM = 30;
|
||||||
const TIMELINE_END = 2900;
|
|
||||||
const HOLD_MAX = 700;
|
|
||||||
const EXIT_MS = 640;
|
|
||||||
|
|
||||||
const INK = '#090a0c';
|
const INK = '#090a0c';
|
||||||
const WORDMARK = '#F1F1F1';
|
|
||||||
const SEA_GLASS = [113, 185, 176];
|
const SEA_GLASS = [113, 185, 176];
|
||||||
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)})`;
|
||||||
|
|
||||||
interface Iris {
|
/**
|
||||||
inward: number;
|
* Facet `f` around mark centre `o`, `unit` px per grid unit: pushed `out` along its
|
||||||
theta: number;
|
* normal, shrunk and spun about its own centroid, then turned `rot` about the mark centre.
|
||||||
grow: number;
|
*/
|
||||||
}
|
function facetPath(ctx: CanvasRenderingContext2D, f: Facet, o: Point, unit: number, out = 0, scale = 1, spin = 0, rot = 0) {
|
||||||
function irisAt(time: number): Iris {
|
const cr = Math.cos(rot);
|
||||||
const p = phase(time, 140, 1180);
|
const sr = Math.sin(rot);
|
||||||
return { inward: INNER_APOTHEM * (1 - IrisOpen(p)), theta: ((-44 * (1 - IrisTwist(p))) * Math.PI) / 180, grow: mix(0.64, 1, Emphasized(p)) };
|
const cs = Math.cos(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) => {
|
||||||
|
const rx = p.x + f.normal.x * out - cx;
|
||||||
|
const ry = p.y + f.normal.y * out - cy;
|
||||||
|
const x = cx + (rx * cs - ry * ss) * scale;
|
||||||
|
const y = cy + (rx * ss + ry * cs) * scale;
|
||||||
|
const px = o.x + (x * cr - y * sr) * unit;
|
||||||
|
const py = o.y + (x * sr + y * cr) * unit;
|
||||||
|
if (i === 0) ctx.moveTo(px, py);
|
||||||
|
else ctx.lineTo(px, py);
|
||||||
|
});
|
||||||
|
ctx.closePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
function facetPath(ctx: CanvasRenderingContext2D, facet: (typeof FACETS)[number], iris: Iris, unit: number, o: Point) {
|
/** A loose facet shape with its centroid at `pos`. */
|
||||||
const c = Math.cos(iris.theta);
|
function shardPath(ctx: CanvasRenderingContext2D, f: Facet, pos: Point, size: number, angle: number) {
|
||||||
const s = Math.sin(iris.theta);
|
const c = Math.cos(angle);
|
||||||
const k = unit * iris.grow;
|
const s = Math.sin(angle);
|
||||||
facet.points.forEach((p, i) => {
|
f.points.forEach((p, i) => {
|
||||||
const x = p.x - facet.normal.x * iris.inward;
|
const x = p.x - f.centroid.x;
|
||||||
const y = p.y - facet.normal.y * iris.inward;
|
const y = p.y - f.centroid.y;
|
||||||
const px = o.x + (x * c - y * s) * k;
|
const px = pos.x + (x * c - y * s) * size;
|
||||||
const py = o.y + (x * s + y * c) * k;
|
const py = pos.y + (x * s + y * c) * size;
|
||||||
if (i === 0) ctx.moveTo(px, py);
|
if (i === 0) ctx.moveTo(px, py);
|
||||||
else ctx.lineTo(px, py);
|
else ctx.lineTo(px, py);
|
||||||
});
|
});
|
||||||
|
|
@ -116,7 +126,7 @@ function facetPath(ctx: CanvasRenderingContext2D, facet: (typeof FACETS)[number]
|
||||||
|
|
||||||
function hexagon(ctx: CanvasRenderingContext2D, o: Point, radius: number) {
|
function hexagon(ctx: CanvasRenderingContext2D, o: Point, radius: number) {
|
||||||
for (let i = 0; i < 6; i++) {
|
for (let i = 0; i < 6; i++) {
|
||||||
const a = ((-90 + 60 * i) * Math.PI) / 180;
|
const a = rad(-90 + 60 * i);
|
||||||
const x = o.x + Math.cos(a) * radius;
|
const x = o.x + Math.cos(a) * radius;
|
||||||
const y = o.y + Math.sin(a) * radius;
|
const y = o.y + Math.sin(a) * radius;
|
||||||
if (i === 0) ctx.moveTo(x, y);
|
if (i === 0) ctx.moveTo(x, y);
|
||||||
|
|
@ -125,41 +135,14 @@ function hexagon(ctx: CanvasRenderingContext2D, o: Point, radius: number) {
|
||||||
ctx.closePath();
|
ctx.closePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Letters {
|
function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number, q: number) {
|
||||||
font: string;
|
const o = { x: w / 2, y: h / 2 };
|
||||||
chars: string[];
|
|
||||||
x: number[];
|
|
||||||
width: number;
|
|
||||||
cap: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number, q: number, letters: Letters) {
|
|
||||||
const center = { x: w / 2, y: h / 2 };
|
|
||||||
ctx.clearRect(0, 0, w, h);
|
ctx.clearRect(0, 0, w, h);
|
||||||
const lockup = Emphasized(phase(time, 1250, 2000));
|
const zoom = q > 0 ? Math.exp(Math.log(FLIGHT_ZOOM) * Flight(q)) : 1;
|
||||||
const lockWidth = LOCK_BOX + LOCK_GAP + letters.width;
|
const unit = (MARK_BOX / 64) * zoom;
|
||||||
const box = mix(INTRO_BOX, LOCK_BOX, lockup);
|
|
||||||
// A slow push-in keeps the settled frame alive.
|
|
||||||
const drift = 1 + 0.025 * InOut(phase(time, 1900, 2900));
|
|
||||||
let cx = mix(center.x, center.x - lockWidth / 2 + LOCK_BOX / 2, lockup);
|
|
||||||
let cy = center.y;
|
|
||||||
let zoom = 1;
|
|
||||||
let textAlpha = 1;
|
|
||||||
let textShift = 0;
|
|
||||||
let hole = 0;
|
|
||||||
if (q > 0) {
|
|
||||||
zoom = Math.exp(Math.log(52) * Flight(q));
|
|
||||||
const recenter = Standard(Math.min(1, q / 0.75));
|
|
||||||
cx = mix(cx, center.x, recenter);
|
|
||||||
cy = mix(cy, center.y, recenter);
|
|
||||||
textAlpha = 1 - Standard(phase(q, 0, 0.4));
|
|
||||||
textShift = -14 * Standard(phase(q, 0, 0.4));
|
|
||||||
hole = InOut(phase(q, 0.12, 0.5));
|
|
||||||
}
|
|
||||||
const unit = (box / 64) * drift * zoom;
|
|
||||||
const o = { x: cx, y: cy };
|
|
||||||
|
|
||||||
// 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));
|
||||||
ctx.globalCompositeOperation = 'source-over';
|
ctx.globalCompositeOperation = 'source-over';
|
||||||
ctx.globalAlpha = 1;
|
ctx.globalAlpha = 1;
|
||||||
ctx.fillStyle = INK;
|
ctx.fillStyle = INK;
|
||||||
|
|
@ -175,161 +158,83 @@ function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number,
|
||||||
ctx.globalAlpha = 1;
|
ctx.globalAlpha = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
const iris = irisAt(time);
|
const bloom = 0.09 * InOut(phase(time, 0, 260)) * (1 - Standard(phase(time, 420, 1100)));
|
||||||
const lightUp = EmphasizedDecelerate(phase(time, 0, 620));
|
if (bloom > 0.001) {
|
||||||
const light = lightUp * (1 - Standard(phase(time, 620, 1250)));
|
|
||||||
const ambient = 0.03 * InOut(phase(time, 300, 900)) * (1 - Standard(phase(time, 1500, 2300)));
|
|
||||||
// Light behind the blades: a soft bloom, a hot core, and rays leaking
|
|
||||||
// through the six gaps while the iris turns.
|
|
||||||
if (light > 0.001 || ambient > 0.001) {
|
|
||||||
ctx.globalCompositeOperation = 'lighter';
|
ctx.globalCompositeOperation = 'lighter';
|
||||||
const bloom = 250;
|
const g = ctx.createRadialGradient(o.x, o.y, 0, o.x, o.y, 300);
|
||||||
let g = ctx.createRadialGradient(o.x, o.y, 0, o.x, o.y, bloom);
|
g.addColorStop(0, rgba(SEA_GLASS, bloom));
|
||||||
g.addColorStop(0, rgba(SEA_GLASS, 0.16 * light + ambient));
|
g.addColorStop(0.45, rgba(SEA_GLASS, bloom * 0.3));
|
||||||
g.addColorStop(0.45, rgba(SEA_GLASS, 0.04 * light + ambient * 0.3));
|
|
||||||
g.addColorStop(1, rgba(SEA_GLASS, 0));
|
g.addColorStop(1, rgba(SEA_GLASS, 0));
|
||||||
ctx.fillStyle = g;
|
ctx.fillStyle = g;
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
ctx.arc(o.x, o.y, bloom, 0, Math.PI * 2);
|
ctx.arc(o.x, o.y, 300, 0, Math.PI * 2);
|
||||||
ctx.fill();
|
ctx.fill();
|
||||||
if (light > 0.001) {
|
|
||||||
const core = ((26 * unit) / 2.0625) * mix(0.6, 1, light);
|
|
||||||
g = ctx.createRadialGradient(o.x, o.y, 0, o.x, o.y, core);
|
|
||||||
g.addColorStop(0, `rgba(255, 250, 236, ${0.95 * light})`);
|
|
||||||
g.addColorStop(0.35, `rgba(238, 242, 221, ${0.55 * light})`);
|
|
||||||
g.addColorStop(1, 'rgba(238, 242, 221, 0)');
|
|
||||||
ctx.fillStyle = g;
|
|
||||||
ctx.beginPath();
|
|
||||||
ctx.arc(o.x, o.y, core, 0, Math.PI * 2);
|
|
||||||
ctx.fill();
|
|
||||||
const rays = light * Math.min(1, IrisOpen(phase(time, 140, 1180)) * 2.5);
|
|
||||||
for (let i = 0; i < 6; i++) {
|
|
||||||
const angle = ((-90 + 60 * i) * Math.PI) / 180 + iris.theta;
|
|
||||||
const length = mix(40, 250, lightUp) * (0.75 + 0.25 * Math.sin(i * 2.1 + 1));
|
|
||||||
const end = { x: o.x + Math.cos(angle) * length, y: o.y + Math.sin(angle) * length };
|
|
||||||
g = ctx.createLinearGradient(o.x, o.y, end.x, end.y);
|
|
||||||
g.addColorStop(0, `rgba(255, 248, 230, ${0.42 * rays})`);
|
|
||||||
g.addColorStop(0.25, `rgba(214, 236, 226, ${0.12 * rays})`);
|
|
||||||
g.addColorStop(1, 'rgba(214, 236, 226, 0)');
|
|
||||||
ctx.fillStyle = g;
|
|
||||||
ctx.beginPath();
|
|
||||||
ctx.moveTo(o.x, o.y);
|
|
||||||
ctx.lineTo(o.x + Math.cos(angle - 0.014) * length, o.y + Math.sin(angle - 0.014) * length);
|
|
||||||
ctx.lineTo(o.x + Math.cos(angle + 0.014) * length, o.y + Math.sin(angle + 0.014) * length);
|
|
||||||
ctx.closePath();
|
|
||||||
ctx.fill();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ctx.globalCompositeOperation = 'source-over';
|
ctx.globalCompositeOperation = 'source-over';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Facets. Short echoes of earlier frames act as motion blur while the
|
// The six facets spin in from a loose ring and lock into the mark.
|
||||||
// blades turn; they disappear beneath the facets once the iris is still.
|
FACETS.forEach((f, s) => {
|
||||||
const facetAlpha = (i: number) => EmphasizedDecelerate(phase(time, 40 + i * 34, 380 + i * 34));
|
const start = s * FACET_STAGGER;
|
||||||
if (time < 1400) {
|
const p = Emphasized(phase(time, start, start + FACET_MS));
|
||||||
for (const [delay, alpha] of [
|
ctx.globalAlpha = Standard(phase(time, start, start + 160));
|
||||||
[84, 0.07],
|
|
||||||
[56, 0.12],
|
|
||||||
[28, 0.2],
|
|
||||||
]) {
|
|
||||||
const echo = irisAt(time - delay);
|
|
||||||
FACETS.forEach((f, i) => {
|
|
||||||
ctx.globalAlpha = alpha * facetAlpha(i);
|
|
||||||
ctx.fillStyle = f.color;
|
|
||||||
ctx.beginPath();
|
|
||||||
facetPath(ctx, f, echo, unit, o);
|
|
||||||
ctx.fill();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
FACETS.forEach((f, i) => {
|
|
||||||
ctx.globalAlpha = facetAlpha(i);
|
|
||||||
ctx.fillStyle = f.color;
|
ctx.fillStyle = f.color;
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
facetPath(ctx, f, iris, unit, o);
|
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;
|
||||||
|
|
||||||
const sheen = phase(time, 980, 1560);
|
// A ring pulses out as the facets lock.
|
||||||
if (light > 0.01 || (sheen > 0 && sheen < 1)) {
|
const pulse = phase(time, 340, 900);
|
||||||
ctx.save();
|
if (pulse > 0 && pulse < 1) {
|
||||||
|
ctx.strokeStyle = rgba(SEA_GLASS, 0.45 * (1 - pulse) * (1 - phase(q, 0, 0.3)));
|
||||||
|
ctx.lineWidth = 1.5;
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
FACETS.forEach((f) => facetPath(ctx, f, iris, unit, o));
|
hexagon(ctx, o, (30 + 22 * EmphasizedDecelerate(pulse)) * unit);
|
||||||
ctx.clip();
|
ctx.stroke();
|
||||||
// Backlight tints the blades while the core is hot, so they read as glass.
|
|
||||||
if (light > 0.01) {
|
|
||||||
const radius = (36 * unit) / 2.0625;
|
|
||||||
const g = ctx.createRadialGradient(o.x, o.y, 0, o.x, o.y, radius);
|
|
||||||
g.addColorStop(0, `rgba(255, 252, 240, ${0.26 * light})`);
|
|
||||||
g.addColorStop(1, 'rgba(255, 252, 240, 0)');
|
|
||||||
ctx.fillStyle = g;
|
|
||||||
ctx.fillRect(o.x - radius, o.y - radius, radius * 2, radius * 2);
|
|
||||||
}
|
|
||||||
// One diagonal band of light crosses the settled mark.
|
|
||||||
if (sheen > 0 && sheen < 1) {
|
|
||||||
const reach = 34 * unit;
|
|
||||||
const a = (36 * Math.PI) / 180;
|
|
||||||
const d = { x: Math.cos(a), y: Math.sin(a) };
|
|
||||||
const pos = mix(-1.25, 1.25, InOut(sheen)) * reach;
|
|
||||||
const width = 10 * unit;
|
|
||||||
const peak = 0.42 * Math.sin(Math.min(1, sheen * 1.1) * Math.PI);
|
|
||||||
const g = ctx.createLinearGradient(o.x + d.x * (pos - width), o.y + d.y * (pos - width), o.x + d.x * (pos + width), o.y + d.y * (pos + width));
|
|
||||||
g.addColorStop(0, 'rgba(255, 255, 255, 0)');
|
|
||||||
g.addColorStop(0.5, `rgba(255, 255, 255, ${peak})`);
|
|
||||||
g.addColorStop(1, 'rgba(255, 255, 255, 0)');
|
|
||||||
ctx.fillStyle = g;
|
|
||||||
ctx.fillRect(o.x - reach, o.y - reach, reach * 2, reach * 2);
|
|
||||||
}
|
|
||||||
ctx.restore();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// The wordmark slides out from behind the mark as it moves into the lockup.
|
// Still starting: small shards circle the mark.
|
||||||
if (time >= 1400 && textAlpha > 0) {
|
const idle = Standard(phase(time, IDLE_START, IDLE_START + 600)) * (1 - phase(q, 0, 0.25));
|
||||||
const scale = (box / LOCK_BOX) * drift;
|
if (idle > 0) {
|
||||||
const textLeft = cx - (box * drift) / 2 + (LOCK_BOX + LOCK_GAP) * scale;
|
ctx.globalCompositeOperation = 'screen';
|
||||||
const slide = EmphasizedDecelerate(phase(time, 1400, 2050));
|
ctx.globalAlpha = 0.4 * idle;
|
||||||
const baseline = cy + (letters.cap / 2) * scale;
|
for (let s = 0; s < 6; s++) {
|
||||||
|
for (const side of [-1, 1]) {
|
||||||
|
const a = rad(-60 + 60 * s) + side * rad(11) + (time - IDLE_START) * 0.00032;
|
||||||
|
ctx.fillStyle = PALETTE[(s + (side > 0 ? 2 : 4)) % 6];
|
||||||
|
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);
|
||||||
|
ctx.fill();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ctx.globalAlpha = 1;
|
||||||
|
ctx.globalCompositeOperation = 'source-over';
|
||||||
|
}
|
||||||
|
|
||||||
|
// While it waits, a band of light crosses the mark every few seconds.
|
||||||
|
const sheen = time < IDLE_START ? 0 : ((time - IDLE_START) % 3600) / 900;
|
||||||
|
if (q === 0 && sheen > 0 && sheen < 1) {
|
||||||
ctx.save();
|
ctx.save();
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
const clipLeft = cx + 24.5 * unit + 2 * scale;
|
FACETS.forEach((f) => facetPath(ctx, f, o, unit));
|
||||||
ctx.rect(clipLeft, 0, w - clipLeft, h);
|
|
||||||
ctx.clip();
|
ctx.clip();
|
||||||
ctx.font = letters.font;
|
const reach = 40 * unit;
|
||||||
ctx.fillStyle = WORDMARK;
|
const a = rad(36);
|
||||||
ctx.textBaseline = 'alphabetic';
|
const d = { x: Math.cos(a), y: Math.sin(a) };
|
||||||
letters.chars.forEach((ch, i) => {
|
const pos = mix(-1.25, 1.25, InOut(sheen)) * reach;
|
||||||
const start = 1460 + i * 45;
|
const width = 10 * unit;
|
||||||
const reveal = Standard(phase(time, start, start + 320));
|
const peak = 0.42 * Math.sin(Math.min(1, sheen * 1.1) * Math.PI);
|
||||||
if (reveal <= 0) return;
|
const g = ctx.createLinearGradient(o.x + d.x * (pos - width), o.y + d.y * (pos - width), o.x + d.x * (pos + width), o.y + d.y * (pos + width));
|
||||||
ctx.save();
|
g.addColorStop(0, 'rgba(255, 255, 255, 0)');
|
||||||
ctx.globalAlpha = reveal * textAlpha;
|
g.addColorStop(0.5, `rgba(255, 255, 255, ${peak})`);
|
||||||
ctx.translate(textLeft + (letters.x[i] - (1 - slide) * letters.width * 0.42) * scale + textShift, baseline);
|
g.addColorStop(1, 'rgba(255, 255, 255, 0)');
|
||||||
ctx.scale(scale, scale);
|
ctx.fillStyle = g;
|
||||||
ctx.fillText(ch, 0, 0);
|
ctx.fillRect(o.x - reach, o.y - reach, reach * 2, reach * 2);
|
||||||
ctx.restore();
|
|
||||||
});
|
|
||||||
ctx.restore();
|
ctx.restore();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function measureLetters(): Promise<Letters> {
|
|
||||||
const size = 19 * LOCK_SCALE;
|
|
||||||
const font = `700 ${size}px 'Inter Variable', 'Segoe UI', sans-serif`;
|
|
||||||
await document.fonts?.load(font).catch(() => {});
|
|
||||||
const ctx = document.createElement('canvas').getContext('2d')!;
|
|
||||||
ctx.font = font;
|
|
||||||
const tracking = 1.4 * LOCK_SCALE;
|
|
||||||
const chars = 'KALEIDO'.split('');
|
|
||||||
const x: number[] = [];
|
|
||||||
let at = 0;
|
|
||||||
for (const ch of chars) {
|
|
||||||
x.push(at);
|
|
||||||
at += ctx.measureText(ch).width + tracking;
|
|
||||||
}
|
|
||||||
return { font, chars, x, width: at - tracking, cap: size * 0.711 };
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Splash({ ready, onDone }: { ready: boolean; onDone: () => void }) {
|
export function Splash({ ready, onDone }: { ready: boolean; onDone: () => void }) {
|
||||||
const reduced = useSettings((s) => s.reducedMotion);
|
const reduced = useSettings((s) => s.reducedMotion);
|
||||||
const canvas = useRef<HTMLCanvasElement>(null);
|
const canvas = useRef<HTMLCanvasElement>(null);
|
||||||
|
|
@ -349,7 +254,6 @@ export function Splash({ ready, onDone }: { ready: boolean; onDone: () => void }
|
||||||
const ctx = el.getContext('2d')!;
|
const ctx = el.getContext('2d')!;
|
||||||
let raf = 0;
|
let raf = 0;
|
||||||
let stopped = false;
|
let stopped = false;
|
||||||
let letters: Letters | null = null;
|
|
||||||
const size = () => {
|
const size = () => {
|
||||||
const dpr = window.devicePixelRatio || 1;
|
const dpr = window.devicePixelRatio || 1;
|
||||||
el.width = Math.round(window.innerWidth * dpr);
|
el.width = Math.round(window.innerWidth * dpr);
|
||||||
|
|
@ -359,43 +263,35 @@ export function Splash({ ready, onDone }: { ready: boolean; onDone: () => void }
|
||||||
size();
|
size();
|
||||||
window.addEventListener('resize', size);
|
window.addEventListener('resize', size);
|
||||||
|
|
||||||
// Timeline time advances with the clock, except while held at GATHER_END.
|
|
||||||
let last = 0;
|
let last = 0;
|
||||||
let time = 0;
|
let time = 0;
|
||||||
let held = 0;
|
|
||||||
let exitStart = 0;
|
let exitStart = 0;
|
||||||
const frame = (now: number) => {
|
const frame = (now: number) => {
|
||||||
if (stopped) return;
|
if (stopped) return;
|
||||||
const dt = last ? Math.min(64, now - last) : 0;
|
// Clamp long frames so a stall doesn't skip the gather.
|
||||||
|
time += last ? Math.min(64, now - last) : 0;
|
||||||
last = now;
|
last = now;
|
||||||
if (time < GATHER_END) time = Math.min(GATHER_END, time + dt);
|
|
||||||
else if (time === GATHER_END && !readyRef.current && held < HOLD_MAX) held += dt;
|
|
||||||
else time = Math.min(TIMELINE_END, time + dt);
|
|
||||||
if (!exitStart && time >= INTRO_END && readyRef.current) {
|
if (!exitStart && time >= INTRO_END && readyRef.current) {
|
||||||
exitStart = now;
|
exitStart = now;
|
||||||
document.documentElement.classList.add('splash-arrival');
|
document.documentElement.classList.add('splash-arrival');
|
||||||
}
|
}
|
||||||
const q = exitStart ? Math.min(1, (now - exitStart) / EXIT_MS) : 0;
|
const q = exitStart ? Math.min(1, (now - exitStart) / EXIT_MS) : 0;
|
||||||
if (letters) draw(ctx, window.innerWidth, window.innerHeight, time, q, letters);
|
draw(ctx, window.innerWidth, window.innerHeight, time, q);
|
||||||
if (q >= 1) {
|
if (q >= 1) {
|
||||||
done.current();
|
done.current();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
raf = requestAnimationFrame(frame);
|
raf = requestAnimationFrame(frame);
|
||||||
};
|
};
|
||||||
// Draw the first (dark) frame at once; start the clock once the wordmark's font is ready.
|
// Draw the first (dark) frame at once so the app never shows through.
|
||||||
ctx.fillStyle = INK;
|
draw(ctx, window.innerWidth, window.innerHeight, 0, 0);
|
||||||
ctx.fillRect(0, 0, window.innerWidth, window.innerHeight);
|
raf = requestAnimationFrame(frame);
|
||||||
measureLetters().then((l) => {
|
|
||||||
letters = l;
|
|
||||||
if (!stopped) raf = requestAnimationFrame(frame);
|
|
||||||
});
|
|
||||||
return () => {
|
return () => {
|
||||||
stopped = true;
|
stopped = true;
|
||||||
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]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,12 @@
|
||||||
import { isNative, win } from '../platform/native';
|
import { isNative } from '../platform/native';
|
||||||
import { Icon } from '../ui/Icon';
|
import { WindowControls } from '../app/TopBar';
|
||||||
|
|
||||||
/** A draggable strip with window controls for full-screen states without the top bar. */
|
/** A draggable strip with window controls for full-screen states without the top bar. */
|
||||||
export function WindowDrag() {
|
export function WindowDrag() {
|
||||||
if (!isNative) return null;
|
if (!isNative) return null;
|
||||||
return (
|
return (
|
||||||
<div className="window-drag" data-tauri-drag-region>
|
<div className="window-drag" data-tauri-drag-region>
|
||||||
<div className="window-controls">
|
<WindowControls />
|
||||||
<button aria-label="Minimize" onClick={() => win.minimize()}>
|
|
||||||
<Icon name="minimize" size={15} strokeWidth={1.4} />
|
|
||||||
</button>
|
|
||||||
<button aria-label="Maximize" onClick={() => win.toggleMaximize()}>
|
|
||||||
<Icon name="maximize" size={13} strokeWidth={1.4} />
|
|
||||||
</button>
|
|
||||||
<button aria-label="Close" className="close" onClick={() => win.close()}>
|
|
||||||
<Icon name="x" size={15} strokeWidth={1.4} />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,26 +16,21 @@ function shuffled<T>(list: T[], salt = 0): T[] {
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
const FEATURE_SOURCES: [RegExp, string][] = [
|
/** Recently released, highly rated, recently added, start watching, recommended. */
|
||||||
[/recentlyreleased|recentlyaired/, 'Recently released'],
|
const FEATURE_SOURCES: RegExp[] = [/recentlyreleased|recentlyaired/, /topunwatched|toprated/, /recentlyadded/, /startwatching/, /curated|genre|by\.actor|moreingenre/];
|
||||||
[/topunwatched|toprated/, 'Highly rated'],
|
|
||||||
[/recentlyadded/, 'Recently added'],
|
|
||||||
[/startwatching/, 'Start watching'],
|
|
||||||
[/curated|genre|by\.actor|moreingenre/, 'Recommended'],
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Features interleave recently released, highly rated unwatched and
|
* Features interleave recently released, highly rated unwatched and
|
||||||
* Plex-recommended titles; they need artwork and skip in-progress titles.
|
* Plex-recommended titles; they need artwork and skip in-progress titles.
|
||||||
*/
|
*/
|
||||||
export function buildFeatures(hubs: Hub[], limit = 8, salt = 0): Feature[] {
|
export function buildFeatures(hubs: Hub[], limit = 8, salt = 0): Feature[] {
|
||||||
const pools: Feature[][] = FEATURE_SOURCES.map(([re, eyebrow]) =>
|
const pools: Feature[][] = FEATURE_SOURCES.map((re) =>
|
||||||
shuffled(
|
shuffled(
|
||||||
hubs
|
hubs
|
||||||
.filter((h) => re.test(h.id))
|
.filter((h) => re.test(h.id))
|
||||||
.flatMap((h) => h.items)
|
.flatMap((h) => h.items)
|
||||||
.filter((i) => (i.type === 'movie' || i.type === 'show') && i.art && !i.viewOffset && i.summary)
|
.filter((i) => (i.type === 'movie' || i.type === 'show') && i.art && !i.viewOffset && i.summary)
|
||||||
.map((item) => ({ item, eyebrow })),
|
.map((item) => ({ item })),
|
||||||
salt,
|
salt,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import { useSections, useServerQuery } from '../../app/queries';
|
||||||
import * as api from '../../plex/api';
|
import * as api from '../../plex/api';
|
||||||
import { art } from '../../app/format';
|
import { art } from '../../app/format';
|
||||||
import { useDownloads } from '../../downloads/store';
|
import { useDownloads } from '../../downloads/store';
|
||||||
import { appInfo, isNative, openExternal, pickFolder, revealPath, type AppInfo } from '../../platform/native';
|
import { appInfo, fullscreenShortcut, isMac, isNative, openExternal, pickFolder, revealPath, shortcut, type AppInfo } from '../../platform/native';
|
||||||
import { checkForUpdate, installUpdate, useUpdater } from '../../app/updater';
|
import { checkForUpdate, installUpdate, useUpdater } from '../../app/updater';
|
||||||
import { Button, Segmented, Select, Switch } from '../../ui/primitives';
|
import { Button, Segmented, Select, Switch } from '../../ui/primitives';
|
||||||
import { confirmDialog } from '../../ui/overlays';
|
import { confirmDialog } from '../../ui/overlays';
|
||||||
|
|
@ -42,14 +42,16 @@ const skipOptions: { value: SkipMode; label: string }[] = [
|
||||||
{ value: 'off', label: 'Off' },
|
{ value: 'off', label: 'Off' },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const OS_NAMES: Record<string, string> = { windows: 'Windows', macos: 'macOS', linux: 'Linux' };
|
||||||
|
|
||||||
const SHORTCUTS: [string, string][][] = [
|
const SHORTCUTS: [string, string][][] = [
|
||||||
[
|
[
|
||||||
['Ctrl + K', 'Search'],
|
[shortcut('K'), 'Search'],
|
||||||
['Alt + ← / Mouse back', 'Go back'],
|
[isMac ? '⌘[ / Mouse back' : 'Alt + ← / Mouse back', 'Go back'],
|
||||||
['Alt + → / Mouse forward', 'Go forward'],
|
[isMac ? '⌘] / Mouse forward' : 'Alt + → / Mouse forward', 'Go forward'],
|
||||||
['Esc', 'Go back or close a dialog'],
|
['Esc', 'Go back or close a dialog'],
|
||||||
['F11', 'Full screen'],
|
[fullscreenShortcut, 'Full screen'],
|
||||||
['Ctrl + ,', 'Settings'],
|
[shortcut(','), 'Settings'],
|
||||||
['Right-click a title', 'Title actions'],
|
['Right-click a title', 'Title actions'],
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
|
|
@ -63,7 +65,7 @@ const SHORTCUTS: [string, string][][] = [
|
||||||
['C', 'Next subtitle track'],
|
['C', 'Next subtitle track'],
|
||||||
['U', 'Cycle upscaling'],
|
['U', 'Cycle upscaling'],
|
||||||
['B', 'Compare with enhancement off'],
|
['B', 'Compare with enhancement off'],
|
||||||
['Shift + N', 'Next episode'],
|
['Shift + P / N', 'Previous / next episode'],
|
||||||
['0–9', 'Jump to 0–90%'],
|
['0–9', 'Jump to 0–90%'],
|
||||||
['Esc or Backspace', 'Exit full screen, then keep playing in the corner'],
|
['Esc or Backspace', 'Exit full screen, then keep playing in the corner'],
|
||||||
],
|
],
|
||||||
|
|
@ -182,7 +184,7 @@ export function AppSettings({ tab }: { tab: string }) {
|
||||||
<Pref label="Hardware decoding" description="Uses your graphics card to decode video. Turn off only if you see artifacts. Applies after restarting Kaleido.">
|
<Pref label="Hardware decoding" description="Uses your graphics card to decode video. Turn off only if you see artifacts. Applies after restarting Kaleido.">
|
||||||
<Switch checked={s.hwdec} onChange={(v) => set('hwdec', v)} />
|
<Switch checked={s.hwdec} onChange={(v) => set('hwdec', v)} />
|
||||||
</Pref>
|
</Pref>
|
||||||
<Pref label="HDR passthrough" description="Sends HDR video to HDR-capable displays when Windows HDR is on. Applies after restarting Kaleido.">
|
<Pref label="HDR passthrough" description={`Sends HDR video to HDR-capable displays${isMac ? '' : ' when Windows HDR is on'}. Applies after restarting Kaleido.`}>
|
||||||
<Switch checked={s.hdrPassthrough} onChange={(v) => set('hdrPassthrough', v)} />
|
<Switch checked={s.hdrPassthrough} onChange={(v) => set('hdrPassthrough', v)} />
|
||||||
</Pref>
|
</Pref>
|
||||||
</SettingsSection>
|
</SettingsSection>
|
||||||
|
|
@ -190,14 +192,27 @@ export function AppSettings({ tab }: { tab: string }) {
|
||||||
<Pref label="Skip intros">
|
<Pref label="Skip intros">
|
||||||
<Select value={s.skipIntro} onChange={(v) => set('skipIntro', v)} options={skipOptions} />
|
<Select value={s.skipIntro} onChange={(v) => set('skipIntro', v)} options={skipOptions} />
|
||||||
</Pref>
|
</Pref>
|
||||||
<Pref label="Skip credits">
|
<Pref label="Skip movie credits" description="Episodes open Up Next when their credits begin.">
|
||||||
<Select value={s.skipCredits} onChange={(v) => set('skipCredits', v)} options={skipOptions} />
|
<Select value={s.skipCredits} onChange={(v) => set('skipCredits', v)} options={skipOptions} />
|
||||||
</Pref>
|
</Pref>
|
||||||
<Pref label="Play the next episode automatically">
|
<Pref label="Automatic skip delay" description="How long the button counts down before skipping automatically. Pause, seek or press any key to keep watching instead.">
|
||||||
<Switch checked={s.autoplayNext} onChange={(v) => set('autoplayNext', v)} />
|
<Select
|
||||||
|
value={s.autoSkipDelay}
|
||||||
|
disabled={s.skipIntro !== 'auto' && s.skipCredits !== 'auto'}
|
||||||
|
onChange={(v) => set('autoSkipDelay', v)}
|
||||||
|
options={[0, 3, 5, 10].map((v) => ({ value: v, label: v ? `${v} seconds` : 'Skip straight away' }))}
|
||||||
|
/>
|
||||||
</Pref>
|
</Pref>
|
||||||
<Pref label="Countdown" description="Seconds before the next episode starts.">
|
<Pref label="Autoplay next episode">
|
||||||
<Select value={s.countdownSeconds} disabled={!s.autoplayNext} onChange={(v) => set('countdownSeconds', v)} options={[5, 8, 10, 15, 20, 30].map((v) => ({ value: v, label: `${v} seconds` }))} />
|
<Select
|
||||||
|
label="Autoplay next episode"
|
||||||
|
value={s.autoplayNext ? s.countdownSeconds : 0}
|
||||||
|
onChange={(seconds) => {
|
||||||
|
set('autoplayNext', seconds > 0);
|
||||||
|
if (seconds > 0) set('countdownSeconds', seconds);
|
||||||
|
}}
|
||||||
|
options={[{ value: 0, label: 'Off' }, ...[5, 8, 10, 15, 20, 30].map((v) => ({ value: v, label: `After ${v} seconds` }))]}
|
||||||
|
/>
|
||||||
</Pref>
|
</Pref>
|
||||||
<Pref label="Arrow-key seek">
|
<Pref label="Arrow-key seek">
|
||||||
<Select value={s.seekStep} onChange={(v) => set('seekStep', v)} options={[5, 10, 15, 30].map((v) => ({ value: v, label: `${v} seconds` }))} />
|
<Select value={s.seekStep} onChange={(v) => set('seekStep', v)} options={[5, 10, 15, 30].map((v) => ({ value: v, label: `${v} seconds` }))} />
|
||||||
|
|
@ -374,7 +389,7 @@ export function AppSettings({ tab }: { tab: string }) {
|
||||||
<div>
|
<div>
|
||||||
<h2>Kaleido</h2>
|
<h2>Kaleido</h2>
|
||||||
<p className="muted">
|
<p className="muted">
|
||||||
Version {info?.version ?? '—'} · {info?.platform === 'windows' ? 'Windows' : info?.platform}
|
Version {info?.version ?? '—'} · {OS_NAMES[info?.platform ?? ''] ?? info?.platform}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -248,6 +248,14 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
}
|
}
|
||||||
|
/* macOS draws its traffic lights at the top left (tauri.macos.conf.json places
|
||||||
|
them in the bar's centre line); keep the bar's content clear of them. */
|
||||||
|
html.os-macos:not(.window-fullscreen) {
|
||||||
|
--traffic-lights: 92px;
|
||||||
|
}
|
||||||
|
html.os-macos:not(.window-fullscreen) .topbar {
|
||||||
|
padding-left: max(calc(var(--gutter) - 10px), var(--traffic-lights));
|
||||||
|
}
|
||||||
|
|
||||||
/* —— Splash ————————————————————————————————————————————————— */
|
/* —— Splash ————————————————————————————————————————————————— */
|
||||||
.splash {
|
.splash {
|
||||||
|
|
@ -262,10 +270,11 @@
|
||||||
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% {
|
||||||
|
|
@ -507,6 +516,12 @@ html.splash-arrival .auth-screen {
|
||||||
.backdrop-layer.ready {
|
.backdrop-layer.ready {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
/* The outgoing art fades too, a beat behind the incoming, so nothing of it is
|
||||||
|
left to vanish through the new art's faded edges. */
|
||||||
|
.backdrop-layer.ready.leaving {
|
||||||
|
opacity: 0;
|
||||||
|
transition-delay: 180ms;
|
||||||
|
}
|
||||||
/* The colour wash lives outside the clipped backdrop so it can carry on down
|
/* The colour wash lives outside the clipped backdrop so it can carry on down
|
||||||
the page behind the rows, fading out as it goes. */
|
the page behind the rows, fading out as it goes. */
|
||||||
.backdrop-tint {
|
.backdrop-tint {
|
||||||
|
|
@ -520,14 +535,42 @@ html.splash-arrival .auth-screen {
|
||||||
-webkit-mask-image: linear-gradient(180deg, #000 0%, rgba(0, 0, 0, 0.75) 45%, transparent 100%);
|
-webkit-mask-image: linear-gradient(180deg, #000 0%, rgba(0, 0, 0, 0.75) 45%, transparent 100%);
|
||||||
mask-image: linear-gradient(180deg, #000 0%, rgba(0, 0, 0, 0.75) 45%, transparent 100%);
|
mask-image: linear-gradient(180deg, #000 0%, rgba(0, 0, 0, 0.75) 45%, transparent 100%);
|
||||||
}
|
}
|
||||||
|
/* Registered as colours so a change of title blends the wash from one set of
|
||||||
|
colours to the next, instead of swapping the gradient outright. */
|
||||||
|
@property --wash-tr {
|
||||||
|
syntax: '<color>';
|
||||||
|
inherits: false;
|
||||||
|
initial-value: transparent;
|
||||||
|
}
|
||||||
|
@property --wash-tl {
|
||||||
|
syntax: '<color>';
|
||||||
|
inherits: false;
|
||||||
|
initial-value: transparent;
|
||||||
|
}
|
||||||
|
@property --wash-br {
|
||||||
|
syntax: '<color>';
|
||||||
|
inherits: false;
|
||||||
|
initial-value: transparent;
|
||||||
|
}
|
||||||
|
@property --wash-bl {
|
||||||
|
syntax: '<color>';
|
||||||
|
inherits: false;
|
||||||
|
initial-value: transparent;
|
||||||
|
}
|
||||||
.backdrop-wash {
|
.backdrop-wash {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
inset: 0;
|
inset: 0;
|
||||||
opacity: 0;
|
|
||||||
transition: opacity 420ms var(--ease);
|
|
||||||
}
|
|
||||||
.backdrop-wash.ready {
|
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
|
background:
|
||||||
|
radial-gradient(ellipse at 100% 0%, var(--wash-tr) 0%, transparent 62%),
|
||||||
|
radial-gradient(ellipse at 0% 0%, var(--wash-tl) 0%, transparent 55%),
|
||||||
|
radial-gradient(ellipse at 100% 100%, var(--wash-br) 0%, transparent 60%),
|
||||||
|
radial-gradient(ellipse at 0% 100%, var(--wash-bl) 0%, transparent 60%);
|
||||||
|
transition:
|
||||||
|
--wash-tr 700ms var(--ease),
|
||||||
|
--wash-tl 700ms var(--ease),
|
||||||
|
--wash-br 700ms var(--ease),
|
||||||
|
--wash-bl 700ms var(--ease);
|
||||||
}
|
}
|
||||||
.backdrop-art {
|
.backdrop-art {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
@ -604,11 +647,9 @@ html.splash-arrival .auth-screen {
|
||||||
transform: none;
|
transform: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.hero-eyebrow {
|
/* Scoped so the later `.title-art { margin: 0 }` can't cancel the gap above the facts. */
|
||||||
margin-bottom: 16px;
|
.hero-content .hero-title {
|
||||||
}
|
margin: 0 0 22px;
|
||||||
.hero-title {
|
|
||||||
margin: 0 0 18px;
|
|
||||||
}
|
}
|
||||||
.hero-episode {
|
.hero-episode {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
|
@ -813,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;
|
||||||
}
|
}
|
||||||
|
|
@ -1051,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;
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ html.player-mini.video-active .app-shell {
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
-webkit-mask-image: linear-gradient(#000 0 0), url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 160 90'%3E%3Crect width='160' height='90' rx='3.6'/%3E%3C/svg%3E");
|
-webkit-mask-image: linear-gradient(#000 0 0), url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 160 90'%3E%3Crect width='160' height='90' rx='3.6'/%3E%3C/svg%3E");
|
||||||
-webkit-mask-size: 100% 100%, var(--mini-w) var(--mini-h);
|
-webkit-mask-size: 100% 100%, var(--mini-w) var(--mini-h);
|
||||||
-webkit-mask-position: 0 0, right var(--mini-gap) bottom var(--mini-gap);
|
-webkit-mask-position: 0 0, right var(--mini-x, var(--mini-gap)) bottom var(--mini-y, var(--mini-gap));
|
||||||
-webkit-mask-repeat: no-repeat;
|
-webkit-mask-repeat: no-repeat;
|
||||||
-webkit-mask-composite: xor;
|
-webkit-mask-composite: xor;
|
||||||
mask-composite: exclude;
|
mask-composite: exclude;
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,9 @@
|
||||||
transition: opacity 400ms var(--ease);
|
transition: opacity 400ms var(--ease);
|
||||||
}
|
}
|
||||||
/* The window's own buttons, top right, fading with the rest of the chrome. */
|
/* The window's own buttons, top right, fading with the rest of the chrome. */
|
||||||
|
html.os-macos:not(.window-fullscreen) .player-top {
|
||||||
|
padding-left: var(--traffic-lights);
|
||||||
|
}
|
||||||
.player-top .window-controls {
|
.player-top .window-controls {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
|
|
@ -325,17 +328,35 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Controls */
|
/* Controls */
|
||||||
|
/* Volume and time | playback, centred under the timeline | tracks and window. */
|
||||||
.player-controls {
|
.player-controls {
|
||||||
display: flex;
|
display: grid;
|
||||||
|
grid-template-columns: 1fr auto 1fr;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
gap: 16px;
|
||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
}
|
}
|
||||||
.player-controls-left,
|
.player-controls-left,
|
||||||
|
.player-controls-center,
|
||||||
.player-controls-right {
|
.player-controls-right {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 4px;
|
gap: 4px;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
.player-controls-right {
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
|
.player-controls-center {
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
.player-icon-spacer {
|
||||||
|
width: 44px;
|
||||||
|
height: 44px;
|
||||||
|
}
|
||||||
|
.player-icon:disabled {
|
||||||
|
opacity: 0.32;
|
||||||
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
.player-icon {
|
.player-icon {
|
||||||
width: 44px;
|
width: 44px;
|
||||||
|
|
@ -361,11 +382,12 @@
|
||||||
color: var(--accent-strong);
|
color: var(--accent-strong);
|
||||||
}
|
}
|
||||||
.player-icon.big {
|
.player-icon.big {
|
||||||
width: 48px;
|
width: 54px;
|
||||||
height: 48px;
|
height: 54px;
|
||||||
}
|
}
|
||||||
.player-time {
|
.player-time {
|
||||||
margin-left: 12px;
|
margin-left: 8px;
|
||||||
|
white-space: nowrap;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-variant-numeric: tabular-nums;
|
font-variant-numeric: tabular-nums;
|
||||||
color: #f0f2f2;
|
color: #f0f2f2;
|
||||||
|
|
@ -407,6 +429,8 @@
|
||||||
/* Panels */
|
/* Panels */
|
||||||
.player-panel {
|
.player-panel {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
/* Above the skip and post-play cards. */
|
||||||
|
z-index: 2;
|
||||||
right: clamp(24px, 3.5vw, 56px);
|
right: clamp(24px, 3.5vw, 56px);
|
||||||
bottom: 84px;
|
bottom: 84px;
|
||||||
min-width: 300px;
|
min-width: 300px;
|
||||||
|
|
@ -635,7 +659,10 @@
|
||||||
min-width: 340px;
|
min-width: 340px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Skip & post-play */
|
/* The skip button sits above the bottom chrome. */
|
||||||
|
.skip-button {
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
.skip-button {
|
.skip-button {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: clamp(24px, 3.5vw, 56px);
|
right: clamp(24px, 3.5vw, 56px);
|
||||||
|
|
@ -663,74 +690,272 @@
|
||||||
background: #f3f5f4;
|
background: #f3f5f4;
|
||||||
color: #111;
|
color: #111;
|
||||||
}
|
}
|
||||||
.post-play {
|
/* An automatic skip fills the button as it counts down. */
|
||||||
position: absolute;
|
.skip-button.counting {
|
||||||
right: clamp(24px, 3.5vw, 56px);
|
|
||||||
bottom: 150px;
|
|
||||||
display: flex;
|
|
||||||
gap: 16px;
|
|
||||||
align-items: center;
|
|
||||||
width: min(520px, calc(100vw - 48px));
|
|
||||||
padding: 14px;
|
|
||||||
border-radius: 14px;
|
|
||||||
background: rgba(20, 22, 24, 0.88);
|
|
||||||
backdrop-filter: blur(20px);
|
|
||||||
box-shadow:
|
|
||||||
0 24px 70px rgba(0, 0, 0, 0.6),
|
|
||||||
inset 0 0 0 1px rgba(255, 255, 255, 0.12);
|
|
||||||
animation: rise-in 360ms var(--ease-out);
|
|
||||||
}
|
|
||||||
.post-play-art {
|
|
||||||
position: relative;
|
|
||||||
width: 180px;
|
|
||||||
aspect-ratio: 16 / 9;
|
|
||||||
border-radius: 8px;
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
flex: none;
|
|
||||||
background: #000;
|
|
||||||
}
|
}
|
||||||
.post-play-art img {
|
.skip-button.counting::before {
|
||||||
width: 100%;
|
content: '';
|
||||||
height: 100%;
|
|
||||||
object-fit: cover;
|
|
||||||
}
|
|
||||||
.post-play-ring {
|
|
||||||
position: absolute;
|
position: absolute;
|
||||||
inset: 0;
|
inset: 0 auto 0 0;
|
||||||
margin: auto;
|
width: var(--p, 0%);
|
||||||
width: 46px;
|
background: rgba(255, 255, 255, 0.18);
|
||||||
height: 46px;
|
transition: width 260ms linear;
|
||||||
transform: rotate(-90deg);
|
|
||||||
}
|
}
|
||||||
.post-play-ring circle {
|
.skip-button.counting:hover::before {
|
||||||
fill: rgba(0, 0, 0, 0.45);
|
background: rgba(0, 0, 0, 0.1);
|
||||||
stroke: #fff;
|
|
||||||
stroke-width: 3;
|
|
||||||
stroke-dasharray: 107;
|
|
||||||
animation: ring 8s linear forwards;
|
|
||||||
}
|
}
|
||||||
@keyframes ring {
|
.skip-button > * {
|
||||||
from {
|
position: relative;
|
||||||
stroke-dashoffset: 107;
|
|
||||||
}
|
|
||||||
to {
|
|
||||||
stroke-dashoffset: 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.post-play-text {
|
/* —— Up Next ————————————————————————————————————————————————————————
|
||||||
|
The credits keep playing in the top-left frame: the native video is drawn
|
||||||
|
into its rectangle and the scene has a matching hole (PostPlay.tsx). Only
|
||||||
|
the rows scroll, so the frame never moves. */
|
||||||
|
.up-next {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 6px;
|
--up-top: 64px;
|
||||||
min-width: 0;
|
--up-video-w: clamp(320px, 34vw, 640px);
|
||||||
}
|
}
|
||||||
.post-play-text b {
|
.up-next-scene {
|
||||||
font-size: 14px;
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
isolation: isolate;
|
||||||
white-space: nowrap;
|
background: var(--bg);
|
||||||
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
.post-play-text .actions {
|
.up-next.placed .up-next-scene {
|
||||||
margin-top: 6px;
|
-webkit-mask-image: linear-gradient(#000 0 0), url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 160 90'%3E%3Crect width='160' height='90' rx='2.4'/%3E%3C/svg%3E");
|
||||||
|
-webkit-mask-size: 100% 100%, var(--up-w) var(--up-h);
|
||||||
|
-webkit-mask-position: 0 0, var(--up-x) var(--up-y);
|
||||||
|
-webkit-mask-repeat: no-repeat;
|
||||||
|
-webkit-mask-composite: xor;
|
||||||
|
mask-composite: exclude;
|
||||||
|
}
|
||||||
|
.up-next-backdrop {
|
||||||
|
height: min(78vh, 860px);
|
||||||
|
bottom: auto;
|
||||||
|
}
|
||||||
|
.backdrop-tint.up-next-backdrop {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
/* The next episode's details sit over the artwork, so it stays dimmer here
|
||||||
|
than on a title page, with or without the colour wash. */
|
||||||
|
.up-next-backdrop .backdrop-scrim,
|
||||||
|
.up-next-backdrop.washed .backdrop-scrim {
|
||||||
|
background:
|
||||||
|
linear-gradient(90deg, rgba(9, 10, 12, 0.96) 0%, rgba(9, 10, 12, 0.9) 38%, rgba(9, 10, 12, 0.74) 62%, rgba(9, 10, 12, 0.55) 100%),
|
||||||
|
linear-gradient(0deg, var(--bg) 0%, rgba(9, 10, 12, 0.6) 22%, transparent 55%);
|
||||||
|
}
|
||||||
|
.up-next-top {
|
||||||
|
height: 60px;
|
||||||
|
z-index: 3;
|
||||||
|
}
|
||||||
|
.up-next-fullscreen {
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
/* Beside the window's own buttons (Windows, outside full screen), it takes
|
||||||
|
their size and line so the four read as one group. */
|
||||||
|
.up-next-top:has(> .window-controls) .up-next-fullscreen {
|
||||||
|
align-self: flex-start;
|
||||||
|
width: 46px;
|
||||||
|
height: 34px;
|
||||||
|
margin-right: 110px;
|
||||||
|
border-radius: 0;
|
||||||
|
color: #e4e8e9;
|
||||||
|
}
|
||||||
|
.up-next-top:has(> .window-controls) .up-next-fullscreen svg {
|
||||||
|
width: 15px;
|
||||||
|
height: 15px;
|
||||||
|
}
|
||||||
|
.up-next-head {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
flex: none;
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
gap: clamp(28px, 3vw, 48px);
|
||||||
|
padding: var(--up-top) var(--gutter) 30px;
|
||||||
|
animation: fade-in 320ms var(--ease);
|
||||||
|
}
|
||||||
|
.up-next-now {
|
||||||
|
flex: none;
|
||||||
|
width: var(--up-video-w);
|
||||||
|
}
|
||||||
|
.up-next-video {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
aspect-ratio: 16 / 9;
|
||||||
|
border-radius: 8px;
|
||||||
|
box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.16);
|
||||||
|
transition: box-shadow var(--t-fast);
|
||||||
|
}
|
||||||
|
.up-next-video:hover,
|
||||||
|
.up-next-video:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
box-shadow: 0 0 0 2px #fff;
|
||||||
|
}
|
||||||
|
.up-next-progress {
|
||||||
|
margin-top: 12px;
|
||||||
|
}
|
||||||
|
.up-next-progress-text {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--muted);
|
||||||
|
}
|
||||||
|
.up-next-progress-text span {
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
.up-next-progress-text small {
|
||||||
|
flex: none;
|
||||||
|
font-size: inherit;
|
||||||
|
color: var(--dim);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
.up-next-video:hover + .up-next-progress .up-next-progress-text span {
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
.up-next-progress-bar {
|
||||||
|
height: 3px;
|
||||||
|
margin-top: 8px;
|
||||||
|
border-radius: 3px;
|
||||||
|
background: rgba(255, 255, 255, 0.22);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
.up-next-progress-bar i {
|
||||||
|
display: block;
|
||||||
|
height: 100%;
|
||||||
|
background: var(--accent);
|
||||||
|
}
|
||||||
|
.up-next-info {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
max-width: 680px;
|
||||||
|
padding-top: 6px;
|
||||||
|
text-shadow: 0 1px 12px rgba(0, 0, 0, 0.5);
|
||||||
|
}
|
||||||
|
.up-next-info .micro {
|
||||||
|
display: block;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
.up-next-info .up-next-logo {
|
||||||
|
margin-bottom: 14px;
|
||||||
|
}
|
||||||
|
.up-next-info .title-text {
|
||||||
|
font-size: clamp(26px, 2.4vw, 36px);
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
.up-next-info h1 {
|
||||||
|
margin: 0 0 10px;
|
||||||
|
font-size: clamp(20px, 1.7vw, 26px);
|
||||||
|
line-height: 1.2;
|
||||||
|
letter-spacing: -0.025em;
|
||||||
|
font-weight: 680;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
.up-next-summary {
|
||||||
|
margin: 14px 0 0;
|
||||||
|
color: #e3e7e9;
|
||||||
|
text-shadow: 0 1px 3px rgba(0, 0, 0, 0.6), 0 1px 14px rgba(0, 0, 0, 0.55);
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1.62;
|
||||||
|
display: -webkit-box;
|
||||||
|
-webkit-line-clamp: 3;
|
||||||
|
-webkit-box-orient: vertical;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
/* The countdown: a lighter fill sweeps across the button, without numbers. */
|
||||||
|
.up-next-play {
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
isolation: isolate;
|
||||||
|
margin-top: 22px;
|
||||||
|
text-shadow: none;
|
||||||
|
}
|
||||||
|
.up-next-play.counting,
|
||||||
|
.up-next-play.counting:hover:not(:disabled) {
|
||||||
|
background: #a3a8a9;
|
||||||
|
}
|
||||||
|
.up-next-play-fill {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
z-index: -1;
|
||||||
|
background: #f6f7f7;
|
||||||
|
transform: scaleX(0);
|
||||||
|
transform-origin: left;
|
||||||
|
will-change: transform;
|
||||||
|
}
|
||||||
|
.up-next-play:focus-visible {
|
||||||
|
outline: 2px solid #fff;
|
||||||
|
outline-offset: 3px;
|
||||||
|
}
|
||||||
|
.up-next-rows {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
flex: 1;
|
||||||
|
min-height: 0;
|
||||||
|
overflow-x: hidden;
|
||||||
|
overflow-y: auto;
|
||||||
|
padding-bottom: 12px;
|
||||||
|
animation: fade-in 420ms var(--ease);
|
||||||
|
}
|
||||||
|
.up-next-shelf {
|
||||||
|
margin-bottom: 22px;
|
||||||
|
}
|
||||||
|
/* Cards are sized from the space below the header, so the season and related
|
||||||
|
rows fill it (--up-row: a row's height besides its artwork). In a short,
|
||||||
|
wide window they keep a sensible size and the related row runs off the
|
||||||
|
bottom, as on Android TV. */
|
||||||
|
.up-next-rows {
|
||||||
|
container-type: size;
|
||||||
|
--up-row: 128px;
|
||||||
|
}
|
||||||
|
.up-next-shelf .shelf .card.landscape {
|
||||||
|
width: clamp(15vw, calc((50cqh - var(--up-row)) * 16 / 9), 26vw);
|
||||||
|
}
|
||||||
|
@media (max-width: 1333px) {
|
||||||
|
.up-next-shelf .shelf .card.landscape {
|
||||||
|
width: clamp(200px, calc((50cqh - var(--up-row)) * 16 / 9), 26vw);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.up-next-shelf .card {
|
||||||
|
scroll-margin-left: 0;
|
||||||
|
}
|
||||||
|
@media (max-height: 760px) {
|
||||||
|
.up-next-head {
|
||||||
|
padding-bottom: 20px;
|
||||||
|
}
|
||||||
|
.up-next-info .micro {
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
.up-next-info .up-next-logo {
|
||||||
|
height: 44px !important;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
.up-next-info .up-next-logo img {
|
||||||
|
max-height: 44px !important;
|
||||||
|
}
|
||||||
|
.up-next-summary {
|
||||||
|
-webkit-line-clamp: 2;
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
.up-next-play {
|
||||||
|
margin-top: 16px;
|
||||||
|
}
|
||||||
|
.up-next-shelf {
|
||||||
|
margin-bottom: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.up-next .card:focus-visible {
|
||||||
|
outline: none;
|
||||||
}
|
}
|
||||||
.player-error {
|
.player-error {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
@ -762,10 +987,11 @@
|
||||||
--mini-h: calc(var(--mini-w) * 9 / 16);
|
--mini-h: calc(var(--mini-w) * 9 / 16);
|
||||||
--mini-gap: 24px;
|
--mini-gap: 24px;
|
||||||
}
|
}
|
||||||
|
/* --mini-x/-y: where it was dragged to, from the right and bottom (PlayerOverlay). */
|
||||||
.mini-player {
|
.mini-player {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
right: var(--mini-gap);
|
right: var(--mini-x, var(--mini-gap));
|
||||||
bottom: var(--mini-gap);
|
bottom: var(--mini-y, var(--mini-gap));
|
||||||
z-index: 600;
|
z-index: 600;
|
||||||
width: var(--mini-w);
|
width: var(--mini-w);
|
||||||
height: var(--mini-h);
|
height: var(--mini-h);
|
||||||
|
|
@ -778,6 +1004,9 @@
|
||||||
.mini-player.loading {
|
.mini-player.loading {
|
||||||
background: #000;
|
background: #000;
|
||||||
}
|
}
|
||||||
|
.mini-player.dragging {
|
||||||
|
cursor: grabbing;
|
||||||
|
}
|
||||||
/* Opacity only: the video beneath can't follow a transform. */
|
/* Opacity only: the video beneath can't follow a transform. */
|
||||||
@keyframes mini-in {
|
@keyframes mini-in {
|
||||||
from {
|
from {
|
||||||
|
|
@ -801,6 +1030,8 @@
|
||||||
.mini-player:hover .mini-top,
|
.mini-player:hover .mini-top,
|
||||||
.mini-player:hover .mini-center,
|
.mini-player:hover .mini-center,
|
||||||
.mini-player:hover .mini-caption,
|
.mini-player:hover .mini-caption,
|
||||||
|
.mini-player.dragging .mini-scrim,
|
||||||
|
.mini-player.dragging .mini-caption,
|
||||||
.mini-player.loading .mini-center,
|
.mini-player.loading .mini-center,
|
||||||
.mini-player:focus-within .mini-top,
|
.mini-player:focus-within .mini-top,
|
||||||
.mini-player:focus-within .mini-center {
|
.mini-player:focus-within .mini-center {
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,25 @@
|
||||||
import { useEffect, useRef, useState } from 'react';
|
import { useEffect, useRef, useState, type CSSProperties } from 'react';
|
||||||
import type { Item } from '../plex/types';
|
import type { Item } from '../plex/types';
|
||||||
import { useServer } from '../app/session';
|
import { useServer } from '../app/session';
|
||||||
import { useSettings } from '../app/settings';
|
import { useSettings } from '../app/settings';
|
||||||
import { art, washGradient } from '../app/format';
|
import { art, washColors } from '../app/format';
|
||||||
|
|
||||||
interface Layer {
|
interface Layer {
|
||||||
key: number;
|
key: number;
|
||||||
src: string;
|
src: string;
|
||||||
wash: string;
|
blur: Item['ultraBlur'];
|
||||||
ready: boolean;
|
ready: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** How long an outgoing layer lingers: its fade (with delay) plus a margin. */
|
||||||
|
const LEAVE_MS = 700;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Artwork-led page background. The image sits top-right and fades into the
|
* Artwork-led page background. The image sits top-right and fades into the
|
||||||
* page toward its left and bottom edges; the UltraBlur colour wash tints the
|
* page toward its left and bottom edges; the UltraBlur colour wash tints the
|
||||||
* page beneath it and carries on down behind the rows. Changes crossfade; the
|
* page beneath it and carries on down behind the rows. Artwork crossfades
|
||||||
* outgoing layer stays until the new image has decoded.
|
* once the new image has decoded, and the wash's colours blend into the new
|
||||||
|
* title's at the same moment (registered custom properties, app.css).
|
||||||
*/
|
*/
|
||||||
export function Backdrop({ item, className = '', width = 1600, height = 900, wash: forceWash }: { item: Item | null | undefined; className?: string; width?: number; height?: number; wash?: Item['ultraBlur'] }) {
|
export function Backdrop({ item, className = '', width = 1600, height = 900, wash: forceWash }: { item: Item | null | undefined; className?: string; width?: number; height?: number; wash?: Item['ultraBlur'] }) {
|
||||||
const server = useServer();
|
const server = useServer();
|
||||||
|
|
@ -25,39 +29,50 @@ export function Backdrop({ item, className = '', width = 1600, height = 900, was
|
||||||
const path = item ? art.backdrop(item) : '';
|
const path = item ? art.backdrop(item) : '';
|
||||||
const src = path ? server.image(path, width, height) : '';
|
const src = path ? server.image(path, width, height) : '';
|
||||||
const blur = forceWash ?? item?.ultraBlur ?? null;
|
const blur = forceWash ?? item?.ultraBlur ?? null;
|
||||||
const wash = colorWash && blur ? washGradient(blur) : '';
|
const blurKey = blur ? `${blur.topLeft}${blur.topRight}${blur.bottomRight}${blur.bottomLeft}` : '';
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!src && !wash) return;
|
if (!src && !blur) return;
|
||||||
setLayers((prev) => {
|
setLayers((prev) => {
|
||||||
if (prev.length && prev[prev.length - 1].src === src) {
|
const last = prev[prev.length - 1];
|
||||||
// Same art, maybe new wash.
|
// Same art, maybe new colours: the wash blends to them in place.
|
||||||
return prev.map((l, i) => (i === prev.length - 1 ? { ...l, wash } : l));
|
if (last && last.src === src) return prev.map((l) => (l === last ? { ...l, blur } : l));
|
||||||
}
|
// Keep only what is on screen (the newest layer that has shown) under the new one.
|
||||||
return [...prev.slice(-1), { key: ++counter.current, src, wash, ready: !src }];
|
const shown = prev.filter((l) => l.ready).slice(-1);
|
||||||
|
return [...shown, { key: ++counter.current, src, blur, ready: !src }];
|
||||||
});
|
});
|
||||||
}, [src, wash]);
|
}, [src, blurKey]);
|
||||||
|
|
||||||
const onReady = (key: number) =>
|
const onReady = (key: number) => setLayers((prev) => (prev.some((l) => l.key === key && !l.ready) ? prev.map((l) => (l.key === key ? { ...l, ready: true } : l)) : prev));
|
||||||
setLayers((prev) => {
|
|
||||||
const idx = prev.findIndex((l) => l.key === key);
|
// Once the newest layer is in, the ones beneath fade out and then go.
|
||||||
if (idx < 0) return prev;
|
const newest = layers[layers.length - 1];
|
||||||
const next = prev.map((l) => (l.key === key ? { ...l, ready: true } : l));
|
useEffect(() => {
|
||||||
// Drop older layers once the newest is visible (after its fade).
|
if (!newest?.ready || layers.length < 2) return;
|
||||||
setTimeout(() => setLayers((p) => (p.length > 1 && p[p.length - 1].key === key ? p.slice(-1) : p)), 500);
|
const t = setTimeout(() => setLayers((p) => (p[p.length - 1]?.key === newest.key ? p.slice(-1) : p)), LEAVE_MS);
|
||||||
return next;
|
return () => clearTimeout(t);
|
||||||
});
|
}, [newest?.key, newest?.ready, layers.length]);
|
||||||
|
|
||||||
|
let top = -1;
|
||||||
|
layers.forEach((l, i) => l.ready && (top = i));
|
||||||
|
const colors = top >= 0 ? washColors(layers[top].blur) : null;
|
||||||
|
const washStyle = {
|
||||||
|
'--wash-tr': colors?.topRight ?? 'transparent',
|
||||||
|
'--wash-tl': colors?.topLeft ?? 'transparent',
|
||||||
|
'--wash-br': colors?.bottomRight ?? 'transparent',
|
||||||
|
'--wash-bl': colors?.bottomLeft ?? 'transparent',
|
||||||
|
} as CSSProperties;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{colorWash && (
|
{colorWash && (
|
||||||
<div className={`backdrop-tint ${className}`} aria-hidden="true">
|
<div className={`backdrop-tint ${className}`} aria-hidden="true">
|
||||||
{layers.map((l) => l.wash && <div key={l.key} className={`backdrop-wash${l.ready ? ' ready' : ''}`} style={{ background: l.wash }} />)}
|
<div className="backdrop-wash" style={washStyle} />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className={`backdrop ${className}${colorWash ? ' washed' : ''}`} aria-hidden="true">
|
<div className={`backdrop ${className}${colorWash ? ' washed' : ''}`} aria-hidden="true">
|
||||||
{layers.map((l) => (
|
{layers.map((l, i) => (
|
||||||
<div key={l.key} className={`backdrop-layer${l.ready ? ' ready' : ''}`}>
|
<div key={l.key} className={`backdrop-layer${l.ready ? ' ready' : ''}${i < top ? ' leaving' : ''}`}>
|
||||||
{l.src && <img className="backdrop-art" src={l.src} alt="" draggable={false} decoding="async" onLoad={() => onReady(l.key)} onError={() => onReady(l.key)} />}
|
{l.src && <img className="backdrop-art" src={l.src} alt="" draggable={false} decoding="async" onLoad={() => onReady(l.key)} onError={() => onReady(l.key)} />}
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ const ROTATE_MS = 8000;
|
||||||
|
|
||||||
export interface Feature {
|
export interface Feature {
|
||||||
item: Item;
|
item: Item;
|
||||||
eyebrow: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -44,14 +43,14 @@ export function Hero({ features, variant = 'home' }: { features: Feature[]; vari
|
||||||
img.decode?.().catch(() => {});
|
img.decode?.().catch(() => {});
|
||||||
}, [upcoming?.id]);
|
}, [upcoming?.id]);
|
||||||
|
|
||||||
|
// Pause rotation when the hero is scrolled away; it picks up again on its return.
|
||||||
|
const [visible, setVisible] = useState(true);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!rotate || reduced || count < 2 || hover) return;
|
if (!rotate || reduced || count < 2 || hover || !visible) return;
|
||||||
const t = setTimeout(() => go(index + 1), ROTATE_MS);
|
const t = setTimeout(() => go(index + 1), ROTATE_MS);
|
||||||
return () => clearTimeout(t);
|
return () => clearTimeout(t);
|
||||||
}, [index, rotate, reduced, count, hover]);
|
}, [index, rotate, reduced, count, hover, visible]);
|
||||||
|
|
||||||
// Pause rotation when the hero is scrolled away.
|
|
||||||
const [visible, setVisible] = useState(true);
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const el = root.current;
|
const el = root.current;
|
||||||
if (!el) return;
|
if (!el) return;
|
||||||
|
|
@ -61,7 +60,6 @@ export function Hero({ features, variant = 'home' }: { features: Feature[]; vari
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const go = (i: number) => {
|
const go = (i: number) => {
|
||||||
if (!visible && i !== index) return;
|
|
||||||
setIndex(((i % count) + count) % count);
|
setIndex(((i % count) + count) % count);
|
||||||
setCopyKey((k) => k + 1);
|
setCopyKey((k) => k + 1);
|
||||||
};
|
};
|
||||||
|
|
@ -75,7 +73,6 @@ export function Hero({ features, variant = 'home' }: { features: Feature[]; vari
|
||||||
<section ref={root} className={`hero ${variant}`} onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)}>
|
<section ref={root} className={`hero ${variant}`} onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)}>
|
||||||
<Backdrop item={item} className="hero-backdrop" />
|
<Backdrop item={item} className="hero-backdrop" />
|
||||||
<div className="hero-content" key={copyKey}>
|
<div className="hero-content" key={copyKey}>
|
||||||
<div className="micro hero-eyebrow">{feature.eyebrow}</div>
|
|
||||||
<TitleArt item={item} className="hero-title" maxWidth={variant === 'home' ? 420 : 380} maxHeight={variant === 'home' ? 128 : 108} />
|
<TitleArt item={item} className="hero-title" maxWidth={variant === 'home' ? 420 : 380} maxHeight={variant === 'home' ? 128 : 108} />
|
||||||
{item.type === 'episode' && (
|
{item.type === 'episode' && (
|
||||||
<div className="hero-episode">
|
<div className="hero-episode">
|
||||||
|
|
|
||||||
|
|
@ -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 } 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';
|
||||||
|
|
@ -90,7 +91,8 @@ export function Facts({ item, withFormats = true, episode = true, children }: {
|
||||||
|
|
||||||
/** Original clear-logo artwork, falling back to the title in type. */
|
/** Original clear-logo artwork, falling back to the title in type. */
|
||||||
export function TitleArt({ item, logo, className = '', maxWidth = 420, maxHeight = 130, as: As = 'h1' }: { item: Item; logo?: string; className?: string; maxWidth?: number; maxHeight?: number; as?: 'h1' | 'h2' }) {
|
export function TitleArt({ item, logo, className = '', maxWidth = 420, maxHeight = 130, as: As = 'h1' }: { item: Item; logo?: string; className?: string; maxWidth?: number; maxHeight?: number; as?: 'h1' | 'h2' }) {
|
||||||
const server = useServer();
|
// The player shows this offline too, where there is no server to draw the logo from.
|
||||||
|
const server = useSession((s) => s.server);
|
||||||
const path = logo ?? item.logo;
|
const path = logo ?? item.logo;
|
||||||
const [failed, setFailed] = useState(false);
|
const [failed, setFailed] = useState(false);
|
||||||
const [ready, setReady] = useState(false);
|
const [ready, setReady] = useState(false);
|
||||||
|
|
@ -99,7 +101,7 @@ export function TitleArt({ item, logo, className = '', maxWidth = 420, maxHeight
|
||||||
setReady(false);
|
setReady(false);
|
||||||
}, [path]);
|
}, [path]);
|
||||||
const title = item.type === 'episode' ? item.grandparentTitle : item.type === 'season' ? item.parentTitle || item.title : item.title;
|
const title = item.type === 'episode' ? item.grandparentTitle : item.type === 'season' ? item.parentTitle || item.title : item.title;
|
||||||
if (!path || failed)
|
if (!path || failed || !server)
|
||||||
return (
|
return (
|
||||||
<As className={`title-text ${className}`} style={{ maxWidth: maxWidth * 1.4 }}>
|
<As className={`title-text ${className}`} style={{ maxWidth: maxWidth * 1.4 }}>
|
||||||
{title}
|
{title}
|
||||||
|
|
@ -140,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)}%` }} />
|
||||||
|
|
@ -203,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" />
|
||||||
|
|
@ -218,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>
|
||||||
|
|
@ -231,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 (
|
||||||
|
|
@ -253,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>
|
||||||
|
|
@ -267,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
|
||||||
|
|
@ -289,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;
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,11 @@
|
||||||
|
|
||||||
`latest.json` is the feed the in-app updater reads (see `plugins.updater.endpoints` in
|
`latest.json` is the feed the in-app updater reads (see `plugins.updater.endpoints` in
|
||||||
`src-tauri/tauri.conf.json`). It lists one signed build per platform:
|
`src-tauri/tauri.conf.json`). It lists one signed build per platform:
|
||||||
`windows-x86_64`, `darwin-aarch64`, `darwin-x86_64` and `linux-x86_64`.
|
`windows-x86_64` and `darwin-aarch64`.
|
||||||
|
|
||||||
Regenerate it after building a release, pointing at the release's download folder:
|
Regenerate it once a release has every platform's build uploaded (see
|
||||||
|
`docs/development.md` → Releases); it reads the release's assets on Forgejo:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
node scripts/update-manifest.mjs 0.2.0 https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v0.2.0
|
node scripts/update-manifest.mjs 0.2.0
|
||||||
```
|
```
|
||||||
|
|
||||||
Platforms built elsewhere can be merged in by listing their bundle folders in
|
|
||||||
`KALEIDO_BUNDLES` (separated by `;`). Existing platform entries are kept, so each OS
|
|
||||||
can publish independently.
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
{
|
{
|
||||||
|
"version": "1.0.1",
|
||||||
|
"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-17T17:47:20.996Z",
|
||||||
"platforms": {
|
"platforms": {
|
||||||
"windows-x86_64": {
|
"windows-x86_64": {
|
||||||
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVURlZleWFKRzhRNVBjYzJZNVRDU2h3dlRnZlgreDY1RHl3Y0J2MkVWdmxzU1IrckJXZ2FmcURWdTBwMHZ5RFJzOUIxU2FZNFVFemhxTzQydzdidzNHdk1LdlZYR2NkUkFjPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzkzNDE1MzA1CWZpbGU6S2FsZWlkb18wLjEuMC1iZXRhLjVfeDY0LXNldHVwLmV4ZQl2ZXJzaW9uOjAuMS4wLWJldGEuNQp5YUNETGxsS3lsTWVWNStMOXBHdGZrMVhWRzFIUWFUeGZJb3hsK1o1MVAvU250Z3R0M3BkMFdRMUsvbWw2NUhEci9UVkM2YTFncHZJVlVrWE01dnRBdz09Cg==",
|
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NFZMQVRPVll0SHZPQWJWUlIyQnZEME10bldKUnYxSkhHWEJSWWxOT3FoVHp6NlNsU0dwdlg1UmUweGlEdzNoQnduSnora0dZempZS2ZWdFZLa3BIRkFJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0OTM3NjI5CWZpbGU6S2FsZWlkb18xLjAuMV94NjQtc2V0dXAuZXhlCXZlcnNpb246MS4wLjEKeUI5aUJ4d3hONmVlNlBBWDFxQkFkYTV4WXU0eHIzb1ZKaVZjaDhpODhpbXdvL2RWRlhTRTBwQXJGV3hJYlg2RERnMDBhSFBRWHZDekxCRTVNNCtIRFE9PQo=",
|
||||||
"url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v0.1.0-beta.5/Kaleido_0.1.0-beta.5_x64-setup.exe"
|
"url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v1.0.1/Kaleido_1.0.1_x64-setup.exe"
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
"version": "0.1.0-beta.5",
|
|
||||||
"notes": "A live-action Quality upscaling tier.\n\n- The Quality tier now uses nlmeans denoising (AN3223, made for live action, and it works at any size) ahead of the larger FSRCNNX 16 upscaler, replacing ArtCNN, which is tuned for animation and looked unnatural on live action. It also compiles in seconds rather than about a minute per model.\n- The \"Preparing upscaling\" notice only appears if a first-time shader compile takes more than a few seconds.",
|
|
||||||
"pub_date": "2026-10-31T02:56:11.979Z"
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
2
vendor/mpv/README.md
vendored
|
|
@ -6,7 +6,7 @@ folder, which is ignored by git and fetched by a script:
|
||||||
| OS | Folder | How to fetch |
|
| OS | Folder | How to fetch |
|
||||||
| --- | --- | --- |
|
| --- | --- | --- |
|
||||||
| Windows | `windows/libmpv-2.dll` | `scripts/fetch-libmpv.ps1` (shinchiro `mpv-dev-x86_64` build) |
|
| Windows | `windows/libmpv-2.dll` | `scripts/fetch-libmpv.ps1` (shinchiro `mpv-dev-x86_64` build) |
|
||||||
| macOS | `macos/libmpv.2.dylib` | `scripts/fetch-libmpv.sh` (Homebrew `mpv`) |
|
| macOS | `macos/libmpv.2.dylib` and the libraries it links | `scripts/fetch-libmpv.sh` (Homebrew `mpv`, made self-contained) |
|
||||||
| Linux | system `libmpv.so.2` | Install your distribution's `libmpv2` package |
|
| Linux | system `libmpv.so.2` | Install your distribution's `libmpv2` package |
|
||||||
|
|
||||||
At runtime Kaleido looks in the app's resources, beside the executable, here, and
|
At runtime Kaleido looks in the app's resources, beside the executable, here, and
|
||||||
|
|
|
||||||
|
|
@ -34,5 +34,10 @@ export default defineConfig({
|
||||||
plugins: [react(), devSession()],
|
plugins: [react(), devSession()],
|
||||||
clearScreen: false,
|
clearScreen: false,
|
||||||
server: { port: 1420, strictPort: true, watch: { ignored: ['**/src-tauri/**'] } },
|
server: { port: 1420, strictPort: true, watch: { ignored: ['**/src-tauri/**'] } },
|
||||||
build: { target: 'es2022', chunkSizeWarningLimit: 1500 },
|
build: {
|
||||||
|
target: 'es2022',
|
||||||
|
chunkSizeWarningLimit: 1500,
|
||||||
|
// The miniplayer window has a page of its own (src/mini/).
|
||||||
|
rollupOptions: { input: { main: path.resolve(import.meta.dirname, 'index.html'), mini: path.resolve(import.meta.dirname, 'mini.html') } },
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||