From 82c0a8e758c3305f82be40ce470eaa21d90b47c0 Mon Sep 17 00:00:00 2001 From: Elijah Date: Wed, 11 Nov 2026 23:30:24 -0700 Subject: [PATCH 01/16] Publish the 0.1.0-beta.15 update feed (Windows) --- updates/latest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/updates/latest.json b/updates/latest.json index 94c03a4..ff32f7f 100644 --- a/updates/latest.json +++ b/updates/latest.json @@ -1,11 +1,11 @@ { - "version": "0.1.0-beta.14", - "notes": "Full screen stays on with the miniplayer, a smoother colour wash, and a round of playback and download fixes.\n\n- 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.\n- 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.\n- 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.\n- 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.\n- Watching a download offline now saves where you stopped and marks it watched.\n- Fixed: playing something offline could crash the player.\n- Fixed: closing or switching titles while a video was still starting could start it anyway.\n- Fixed: Home and the libraries could still show the previous account's or profile's titles after switching.\n- 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.\n- 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.\n- 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.", - "pub_date": "2026-11-07T02:37:16.806Z", + "version": "0.1.0-beta.15", + "notes": "A new Up Next screen, adapted from Kaleido for Android TV for mouse and keyboard.\n\n- 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.\n- 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.\n- 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.\n- 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.", + "pub_date": "2026-11-12T06:30:07.693Z", "platforms": { "windows-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NFgxcit2QjBSdGQ4ait3d1FwdzZXMlJBeS95R25BTFV5ekUremhQdVAzd0h3M2hTMXVNWTBkeHlnRXlaam1rTHRIbGhOSWM2aXVqcFJHLzBCZTdJandrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0MDE5MDE2CWZpbGU6S2FsZWlkb18wLjEuMC1iZXRhLjE0X3g2NC1zZXR1cC5leGUJdmVyc2lvbjowLjEuMC1iZXRhLjE0CkpqTDRPeGVDeDFSZjdkSWUxeDdQbXlpUTdLR1BrRk00Z2labzMyVjEzQUZFZkJrM3lVKzlheGpKQm5TQTVyMmFpTHFwNUYrd2huUkZ4OFhiaTFjNUNBPT0K", - "url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v0.1.0-beta.14/Kaleido_0.1.0-beta.14_x64-setup.exe" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NGNsZS9tbXN1UjZnbkVlanBVWTg5ekpsc3NlM1pVQ3NJaGpuZ3ZrT283U2FMUUtMVTJnckVQaFlDelhxbTRVNnVjQTNQTk8zaFU3SWtxcFBDeE8zTUFrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0NDY0OTM2CWZpbGU6S2FsZWlkb18wLjEuMC1iZXRhLjE1X3g2NC1zZXR1cC5leGUJdmVyc2lvbjowLjEuMC1iZXRhLjE1CktjVnA5ekhyOVphdzlPbEFjbm1taG1aQ1ZZdWpjNEViekppc3l2NDArMUovY1BGZGlJcGdQeFhubk4yNmh4cVY1eHVPRHZIbE9Xd3NUZ2s4RWFBcERBPT0K", + "url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v0.1.0-beta.15/Kaleido_0.1.0-beta.15_x64-setup.exe" } } } From c7dcdffc309db414ead07e40329de0c8f0e4ec82 Mon Sep 17 00:00:00 2001 From: Elijah Date: Wed, 11 Nov 2026 23:51:05 -0700 Subject: [PATCH 02/16] Release Kaleido Desktop 0.1.0-beta.16 --- CHANGELOG.md | 5 +++ package-lock.json | 4 +-- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- src/screens/settings/AppSettings.tsx | 47 +++++++++++++++++----------- src/styles/player.css | 27 +++++++++++----- src/styles/screens.css | 23 ++++++++++++++ 9 files changed, 83 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6656595..b281c27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 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. diff --git a/package-lock.json b/package-lock.json index bbfdf4d..65e2443 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kaleido-desktop", - "version": "0.1.0-beta.15", + "version": "0.1.0-beta.16", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kaleido-desktop", - "version": "0.1.0-beta.15", + "version": "0.1.0-beta.16", "dependencies": { "@fontsource-variable/inter": "^5.3.0", "@tanstack/react-query": "^5.105.0", diff --git a/package.json b/package.json index 3700006..28680cb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "kaleido-desktop", "private": true, - "version": "0.1.0-beta.15", + "version": "0.1.0-beta.16", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index c4c276e..17a9765 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "kaleido" -version = "0.1.0-beta.15" +version = "0.1.0-beta.16" dependencies = [ "fs2", "futures-util", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index e8daa1f..958479f 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kaleido" -version = "0.1.0-beta.15" +version = "0.1.0-beta.16" description = "Kaleido — a Plex client for Windows" authors = ["Elijah"] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index ad6166f..173497f 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Kaleido", - "version": "0.1.0-beta.15", + "version": "0.1.0-beta.16", "identifier": "tv.kaleido.desktop", "build": { "beforeDevCommand": "npm run dev", diff --git a/src/screens/settings/AppSettings.tsx b/src/screens/settings/AppSettings.tsx index 8d271ae..67594c7 100644 --- a/src/screens/settings/AppSettings.tsx +++ b/src/screens/settings/AppSettings.tsx @@ -188,27 +188,38 @@ export function AppSettings({ tab }: { tab: string }) { set('hdrPassthrough', v)} /> - - - set('skipCredits', v)} options={skipOptions} /> - - + +
+ +
+
+ Intros + set('skipCredits', v)} options={skipOptions} /> +
+ {(s.skipIntro === 'auto' || s.skipCredits === 'auto') && ( +
+ Skip delay + set('autoSkipDelay', v)} - options={[0, 3, 5, 10].map((v) => ({ value: v, label: v ? `${v} seconds` : 'Skip straight away' }))} + 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` }))]} /> - - set('autoplayNext', v)} /> - - - set('seekStep', v)} options={[5, 10, 15, 30].map((v) => ({ value: v, label: `${v} seconds` }))} /> diff --git a/src/styles/player.css b/src/styles/player.css index 77ea766..bfee1b9 100644 --- a/src/styles/player.css +++ b/src/styles/player.css @@ -717,6 +717,16 @@ only the rows scroll. */ background: var(--bg); pointer-events: none; } +/* Up Next places copy on the right as well as the left. Keep every part of + the artwork dark enough for text, including with the colour wash enabled. + This layer shares the scene's video cutout, so it never dims the credits. */ +.up-next-scene::after { + content: ''; + position: absolute; + inset: 0; + z-index: 1; + background: linear-gradient(180deg, rgba(9, 10, 12, 0.76), rgba(9, 10, 12, 0.9)); +} .up-next.placed .up-next-scene { -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'/%3E%3C/svg%3E"); -webkit-mask-size: 100% 100%, var(--up-video-w) var(--up-video-h); @@ -748,7 +758,7 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { align-items: center; gap: 8px; font-size: 13px; - color: #b6bdbf; + color: #d6dcde; padding: 8px 0; } .up-next-back:hover, .up-next-cancel:hover { @@ -796,7 +806,7 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { gap: 12px; margin: 14px 0 8px; font-size: 12px; - color: #b8bfc1; + color: #cbd2d4; } .up-next-caption > span { overflow: hidden; @@ -825,7 +835,10 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { .up-next-details .micro { display: block; margin-bottom: 10px; - color: #a5adaf; + color: #c3cbcd; +} +.up-next-details .facts { + color: #d0d6d8; } .up-next-details .title-art { margin-bottom: 10px; @@ -837,8 +850,8 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { letter-spacing: -.025em; } .up-next-summary { - color: #b6bdbf; - font-size: 13px; + color: #d6dcde; + font-size: 14px; line-height: 1.65; margin: 12px 0 18px; display: -webkit-box; @@ -879,8 +892,8 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { box-shadow: 0 0 0 2px #ffffff40; } .up-next-hint { - font-size: 11px; - color: #90999c; + font-size: 12px; + color: #bdc7ca; margin: 10px 0 0; } .up-next-rows { diff --git a/src/styles/screens.css b/src/styles/screens.css index 64b7acd..191a778 100644 --- a/src/styles/screens.css +++ b/src/styles/screens.css @@ -1152,6 +1152,29 @@ button.chip:hover { gap: 8px; flex: none; } +.marker-preference .pref { + flex-direction: column; + align-items: flex-start; + gap: 14px; +} +.marker-preference .pref-control { + width: 100%; +} +.marker-controls { + display: flex; + flex-wrap: wrap; + gap: 12px 20px; +} +.marker-control { + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 6px; +} +.marker-control > span { + font-size: 11.5px; + color: var(--muted); +} .pref-input { width: 240px; min-height: 34px; From dfe865d8f41ade10b2917988fc3aa89180cfc251 Mon Sep 17 00:00:00 2001 From: Elijah Date: Wed, 11 Nov 2026 23:51:26 -0700 Subject: [PATCH 03/16] Publish the 0.1.0-beta.16 update feed (Windows) --- updates/latest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/updates/latest.json b/updates/latest.json index ff32f7f..b8cdf27 100644 --- a/updates/latest.json +++ b/updates/latest.json @@ -1,11 +1,11 @@ { - "version": "0.1.0-beta.15", - "notes": "A new Up Next screen, adapted from Kaleido for Android TV for mouse and keyboard.\n\n- 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.\n- 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.\n- 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.\n- 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.", - "pub_date": "2026-11-12T06:30:07.693Z", + "version": "0.1.0-beta.16", + "notes": "- 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.\n- 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.", + "pub_date": "2026-11-12T06:51:10.050Z", "platforms": { "windows-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NGNsZS9tbXN1UjZnbkVlanBVWTg5ekpsc3NlM1pVQ3NJaGpuZ3ZrT283U2FMUUtMVTJnckVQaFlDelhxbTRVNnVjQTNQTk8zaFU3SWtxcFBDeE8zTUFrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0NDY0OTM2CWZpbGU6S2FsZWlkb18wLjEuMC1iZXRhLjE1X3g2NC1zZXR1cC5leGUJdmVyc2lvbjowLjEuMC1iZXRhLjE1CktjVnA5ekhyOVphdzlPbEFjbm1taG1aQ1ZZdWpjNEViekppc3l2NDArMUovY1BGZGlJcGdQeFhubk4yNmh4cVY1eHVPRHZIbE9Xd3NUZ2s4RWFBcERBPT0K", - "url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v0.1.0-beta.15/Kaleido_0.1.0-beta.15_x64-setup.exe" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NFRWYUFBcFRudUhuVmx4eDZSb0RxUGlhOFF1Qi9kOU5STDJTbEJZb2dNYmExeGk3Tll0WXZ3bVEwMjlxRFlMODVOOHlYdHRyY3FoSm54VGpyYTMvOVFJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0NDY2MjUxCWZpbGU6S2FsZWlkb18wLjEuMC1iZXRhLjE2X3g2NC1zZXR1cC5leGUJdmVyc2lvbjowLjEuMC1iZXRhLjE2CjZwRmRuSU56am8xN3hUbThyVXFac3E4TjhOVmFDek4rS3UvS1duOWlFQ3J1bThWQ21Oa0ZDTGVpTXRPclQrdC9FUCtuenFzM0llKytiUm4xQndsRENRPT0K", + "url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v0.1.0-beta.16/Kaleido_0.1.0-beta.16_x64-setup.exe" } } } From 28e633dad177becb8a70439d741733353530624d Mon Sep 17 00:00:00 2001 From: Elijah Date: Thu, 12 Nov 2026 11:45:07 -0700 Subject: [PATCH 04/16] Release Kaleido Desktop 0.1.0-beta.17 --- CHANGELOG.md | 7 +++ docs/development.md | 10 +-- package-lock.json | 4 +- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- src/player/PlayerOverlay.tsx | 9 +-- src/player/PostPlay.tsx | 42 +++++++------ src/player/store.test.ts | 69 ++++++++++++++++----- src/player/store.ts | 72 +++++++++++----------- src/screens/settings/AppSettings.tsx | 8 +-- src/styles/player.css | 92 ++++++++-------------------- 13 files changed, 165 insertions(+), 156 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b281c27..4dc20e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 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. diff --git a/docs/development.md b/docs/development.md index a7911e8..316d041 100644 --- a/docs/development.md +++ b/docs/development.md @@ -47,10 +47,12 @@ 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 for that file. -Up Next: automatic episode credits open the screen immediately; button-only credits -open it on click, and EOF opens it regardless of the credits preference. There is one -autoplay timer. Clicks, keypresses (including Tab), and scrolling cancel it; pointer -movement leaves it running. Esc returns to the video; F/F11 toggles full screen. +Up Next opens at the first Plex credits marker for an episode, including after a seek; +without markers it opens at EOF. Movie-credit skipping is independent. There is one +autoplay timer, measured by elapsed time without requiring webview keyboard focus. +Mouse movement, clicks, keypresses (including Tab), and scrolling cancel it. Esc or +clicking the video returns to playback; F/F11 toggles full screen. Video hover/focus +shows only a white outline. The play button's fill is the visible countdown. The video rectangle must follow window resizes and DPI changes and return to the full window on dismissal, episode changes, errors, and closing. Verify those native video transitions on a GPU-equipped machine; browser layout checks cannot prove rendering. diff --git a/package-lock.json b/package-lock.json index 65e2443..5751ec6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kaleido-desktop", - "version": "0.1.0-beta.16", + "version": "0.1.0-beta.17", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kaleido-desktop", - "version": "0.1.0-beta.16", + "version": "0.1.0-beta.17", "dependencies": { "@fontsource-variable/inter": "^5.3.0", "@tanstack/react-query": "^5.105.0", diff --git a/package.json b/package.json index 28680cb..ec1a7fc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "kaleido-desktop", "private": true, - "version": "0.1.0-beta.16", + "version": "0.1.0-beta.17", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 17a9765..49f2df2 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "kaleido" -version = "0.1.0-beta.16" +version = "0.1.0-beta.17" dependencies = [ "fs2", "futures-util", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 958479f..2f201f8 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kaleido" -version = "0.1.0-beta.16" +version = "0.1.0-beta.17" description = "Kaleido — a Plex client for Windows" authors = ["Elijah"] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 173497f..525d4f7 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Kaleido", - "version": "0.1.0-beta.16", + "version": "0.1.0-beta.17", "identifier": "tv.kaleido.desktop", "build": { "beforeDevCommand": "npm run dev", diff --git a/src/player/PlayerOverlay.tsx b/src/player/PlayerOverlay.tsx index 16023dc..b917128 100644 --- a/src/player/PlayerOverlay.tsx +++ b/src/player/PlayerOverlay.tsx @@ -506,8 +506,8 @@ function SkipButton() { const item = usePlayer((s) => s.item); const position = usePlayer((s) => s.position); const seek = usePlayer((s) => s.seek); - const nextUp = usePlayer((s) => s.nextUp); 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); @@ -520,8 +520,9 @@ function SkipButton() { const ms = position * 1000; const marker = item?.markers.find((m) => (m.type === 'intro' || m.type === 'credits') && ms >= m.start && ms < m.end - 1000); const key = item && marker ? `${item.id}:${marker.type}:${marker.start}` : ''; - const mode = marker?.type === 'intro' ? skipIntro : skipCredits; - const auto = !!marker && mode === 'auto' && !(marker.type === 'credits' && nextUp); + 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 = () => { @@ -569,7 +570,7 @@ function SkipButton() { return () => window.removeEventListener('keydown', onKey, true); }, [counting]); - if (!marker || mode === 'off' || countdown !== null) return null; + 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 ( diff --git a/src/player/PostPlay.tsx b/src/player/PostPlay.tsx index 5f103da..b76c3e7 100644 --- a/src/player/PostPlay.tsx +++ b/src/player/PostPlay.tsx @@ -4,13 +4,14 @@ import { mpv } from './engine'; import { isNative } from '../platform/native'; import { useSession } from '../app/session'; import { navigate } from '../app/router'; -import { clock, episodeLabel } from '../app/format'; +import { 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, TitleArt } from '../ui/media'; import { Icon } from '../ui/Icon'; import { WindowControls } from '../app/TopBar'; +import { Spinner } from '../ui/primitives'; /** One Up Next screen, with a transparent opening over the native video. */ export function PostPlay() { @@ -53,7 +54,13 @@ export function PostPlay() { useEffect(() => { const previous = document.activeElement as HTMLElement | null; (play.current ?? video.current)?.focus({ preventScroll: true }); - const cancel = () => usePlayer.getState().cancelCountdown(); + const cancel = () => { + const player = usePlayer.getState(); + if (!player.postPlayDismissed) player.cancelCountdown(); + }; + const move = (event: MouseEvent) => { + if (event.movementX !== 0 || event.movementY !== 0) cancel(); + }; const key = (e: KeyboardEvent) => { cancel(); if (e.key === 'Escape' || e.key === 'Backspace') { @@ -73,10 +80,12 @@ export function PostPlay() { }; window.addEventListener('keydown', key, true); window.addEventListener('pointerdown', cancel, true); + window.addEventListener('mousemove', move, { capture: true, passive: true }); window.addEventListener('wheel', cancel, { capture: true, passive: true }); return () => { window.removeEventListener('keydown', key, true); window.removeEventListener('pointerdown', cancel, true); + window.removeEventListener('mousemove', move, true); window.removeEventListener('wheel', cancel, true); if (previous?.isConnected) previous.focus({ preventScroll: true }); }; @@ -126,12 +135,12 @@ export function PostPlay() {

{label}

{items.map((entry) => ( - ))}
@@ -141,33 +150,26 @@ export function PostPlay() { return (
{server && }
-
- - - {st.fullscreen && } - {!st.fullscreen && } -
-
+ {!st.fullscreen &&
} +
- -
{episodeLabel(item)} · {item.title}{st.ended ? 'Finished' : `−${clock(Math.max(0, st.duration - st.position))}`}
+
- {upcoming ? 'Up next' : 'More to watch'} + {upcoming || !st.episodeContextReady ? 'Up next' : 'More to watch'} {upcoming ? <>

{upcoming.title}

- + {upcoming.summary &&

{upcoming.summary}

}
- {counting && }
-

{counting ? 'Autoplay is on · Click, scroll or press any key to cancel' : 'Autoplay is off for this episode'}

- :

You’ve reached the end of this series.

} + : st.episodeContextReady ?

You’ve reached the end of this series.

: }
diff --git a/src/player/store.test.ts b/src/player/store.test.ts index 4d67b8d..26169bc 100644 --- a/src/player/store.test.ts +++ b/src/player/store.test.ts @@ -4,7 +4,7 @@ import type { MpvEvent } from './engine'; const harness = vi.hoisted(() => { const memory = new Map(); 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', { hidden: false, hasFocus: () => true, documentElement: { classList: { toggle: vi.fn() } } }); + vi.stubGlobal('document', Object.assign(new EventTarget(), { hidden: false, hasFocus: () => true, documentElement: { classList: { toggle: vi.fn() } } })); return { event: (_e: MpvEvent) => {}, next: [] as unknown[], focused: true }; }); @@ -67,15 +67,25 @@ describe('Up Next playback lifecycle', () => { time(81); expect(usePlayer.getState()).toMatchObject({ postPlay: true, countdown: 5, countdownTotal: 5 }); }); - it('leaves button-only credits to the viewer, and opens on a deliberate skip', () => { - useSettings.setState({ skipCredits: 'button' }); - time(81); - vi.advanceTimersByTime(2000); - time(83); + 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); - usePlayer.getState().showPostPlay(); + 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(); @@ -106,11 +116,9 @@ describe('Up Next playback lifecycle', () => { eof(); expect(usePlayer.getState()).toMatchObject({ postPlay: false, countdown: null }); }); - it.each(['hidden', 'unfocused', 'paused', 'mini'] as const)('holds the countdown while %s', (reason) => { + it.each(['hidden', 'mini'] as const)('holds the countdown while %s', (reason) => { time(81); if (reason === 'hidden') Object.assign(document, { hidden: true }); - if (reason === 'unfocused') harness.focused = false; - if (reason === 'paused') usePlayer.setState({ paused: true }); if (reason === 'mini') usePlayer.setState({ mini: true }); vi.advanceTimersByTime(20000); expect(usePlayer.getState().countdown).toBe(5); @@ -126,6 +134,22 @@ describe('Up Next playback lifecycle', () => { 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(); @@ -136,30 +160,43 @@ describe('Up Next playback lifecycle', () => { time(81); expect(usePlayer.getState()).toMatchObject({ postPlay: true, countdown: null }); }); - it('treats a seek into credits as a choice to watch them', () => { + 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(false); + expect(usePlayer.getState().postPlay).toBe(true); expect(mpv.command).toHaveBeenCalledWith('seek', '81.000', 'absolute+exact'); }); - it.each(['ended', 'button'] as const)('waits for slow episode context after %s', async (reason) => { + it.each(['ended', 'credits'] as const)('shows Up Next immediately and loads slow episode context after %s', async (reason) => { let resolve!: (items: ReturnType[]) => 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 usePlayer.getState().showPostPlay(); - expect(usePlayer.getState().postPlay).toBe(false); + else time(80); + expect(usePlayer.getState().postPlay).toBe(true); + expect(usePlayer.getState().countdown).toBeNull(); resolve([episode(), episode('2')]); - await vi.waitFor(() => expect(usePlayer.getState().postPlay).toBe(true)); + 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[]) => 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(); diff --git a/src/player/store.ts b/src/player/store.ts index d494670..5107db3 100644 --- a/src/player/store.ts +++ b/src/player/store.ts @@ -70,6 +70,7 @@ interface PlayerState { nextUp: Item | null; /** The episode before this one, for the previous-episode button. */ prevUp: Item | null; + episodeContextReady: boolean; countdown: number | null; countdownTotal: number; postPlay: boolean; @@ -115,13 +116,12 @@ let lastReport = 0; let sessionAnswered = false; let reportTimer: ReturnType | null = null; let countdownTimer: ReturnType | null = null; +let unwatchCountdown: (() => void) | null = null; let scrobbled = false; let unlisten: (() => void) | null = null; let loadToken = 0; let wasFullscreenBeforePlay = false; let pendingExternal: Track | null = null; -let neighboursReady = false; -let postPlayRequested = false; /** * The server this playback belongs to, fixed when it starts. Progress, watched state @@ -338,27 +338,33 @@ async function findNeighbours(item: Item): Promise<{ prevUp: Item | null; nextUp } } -function startCountdown() { +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() { + const st = usePlayer.getState(); + if (!st.open || !st.postPlay || st.error || !st.nextUp || st.postPlayDismissed || st.countdown !== null) return; const settings = useSettings.getState(); - // Don't mistake a slow context request for the end of the series. - if (!neighboursReady) return; - postPlayRequested = false; - const total = st.nextUp && settings.autoplayNext ? settings.countdownSeconds : 0; - usePlayer.setState({ postPlay: true, countdown: total > 0 ? total : null, countdownTotal: total }); + const total = settings.autoplayNext ? settings.countdownSeconds : 0; if (total <= 0) return; + stopCountdown(); + usePlayer.setState({ countdown: total, countdownTotal: total }); let lastTick = performance.now(); - countdownTimer && clearInterval(countdownTimer); + const visibilityChanged = () => { lastTick = performance.now(); }; + document.addEventListener('visibilitychange', visibilityChanged); + unwatchCountdown = () => document.removeEventListener('visibilitychange', visibilityChanged); countdownTimer = setInterval(() => { const now = performance.now(); - // Never spend time hidden, in the separate miniplayer, or behind another app. - // Cap a delayed tick so sleep / a suspended web view cannot skip an episode. - const elapsed = Math.min((now - lastTick) / 1000, 0.1); + const elapsed = Math.max(0, (now - lastTick) / 1000); lastTick = now; const current = usePlayer.getState(); if (!current.open || !current.postPlay || current.error || current.countdown === null) return stopCountdown(); - if (document.hidden || !document.hasFocus() || current.mini || (current.paused && !current.ended)) return; + // Native video can own keyboard focus while the webview is still on screen. + if (document.hidden || current.mini) return; const remaining = Math.max(0, current.countdown - elapsed); usePlayer.setState({ countdown: remaining }); if (remaining === 0) { @@ -371,6 +377,8 @@ function startCountdown() { function stopCountdown() { if (countdownTimer) clearInterval(countdownTimer); countdownTimer = null; + unwatchCountdown?.(); + unwatchCountdown = null; } /** @@ -639,9 +647,8 @@ function fallbackAfterError() { function maybeCredits(pos: number) { const st = usePlayer.getState(); - if (st.item?.type !== 'episode' || !st.firstFrame || st.paused || st.postPlayDismissed || Date.now() - st.lastSeek < 1500) return; - const credits = st.item.markers.find((m) => m.type === 'credits'); - if (credits && pos * 1000 >= credits.start && pos * 1000 < credits.end && useSettings.getState().skipCredits === 'auto') startCountdown(); + if (st.item?.type !== 'episode' || !st.firstFrame || st.postPlayDismissed) return; + if (st.item.markers.some((m) => m.type === 'credits' && pos * 1000 >= m.start && pos * 1000 < m.end)) openPostPlay(); } function onEnded() { @@ -650,7 +657,7 @@ function onEnded() { usePlayer.setState({ ended: true }); report('stopped'); checkScrobble(); - if (st.item?.type === 'episode') startCountdown(); + if (st.item?.type === 'episode') openPostPlay(); } export const usePlayer = create((set, get) => ({ @@ -682,6 +689,7 @@ export const usePlayer = create((set, get) => ({ ended: false, nextUp: null, prevUp: null, + episodeContextReady: false, countdown: null, countdownTotal: 0, postPlay: false, @@ -697,8 +705,6 @@ export const usePlayer = create((set, get) => ({ // Closing or starting something else while this one is still setting up wins. const stale = () => token !== loadToken; const prefs = useSettings.getState(); - neighboursReady = false; - postPlayRequested = false; stopThemeMusic(); stopCountdown(); if (!isNative) { @@ -743,6 +749,7 @@ export const usePlayer = create((set, get) => ({ ended: false, nextUp: null, prevUp: null, + episodeContextReady: false, countdown: null, countdownTotal: 0, postPlay: false, @@ -818,6 +825,15 @@ export const usePlayer = create((set, get) => ({ ...(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 }); if (!unlisten) unlisten = await mpv.on(onEvent); if (stale()) return; @@ -850,18 +866,6 @@ export const usePlayer = create((set, get) => ({ const st = get(); if (st.open && !st.ended) report(st.paused ? 'paused' : st.buffering ? 'buffering' : 'playing'); }, 10000); - findNeighbours(item).then((n) => { - if (token !== loadToken) return; - neighboursReady = true; - set(n); - const current = get(); - // Metadata may arrive after EOF / the credits. Open only once it is known - // whether there is a next episode, without restarting a cancelled timer. - if (!current.postPlay) { - if (postPlayRequested || current.ended) startCountdown(); - else maybeCredits(current.position); - } - }); } catch (e: any) { if (token !== loadToken) return; set({ error: e?.message ?? String(e), buffering: false }); @@ -911,8 +915,7 @@ export const usePlayer = create((set, get) => ({ seek(seconds) { const st = get(); const target = Math.max(0, Math.min(seconds, (st.duration || seconds) - 0.5)); - const choseCredits = st.item?.type === 'episode' && st.item.markers.some((m) => m.type === 'credits' && target * 1000 >= m.start && target * 1000 < m.end); - set({ position: target, ended: false, lastSeek: Date.now(), ...(choseCredits ? { postPlayDismissed: true } : {}) }); + set({ position: target, ended: false, lastSeek: Date.now() }); if (st.postPlay) st.dismissPostPlay(); mpv.command('seek', target.toFixed(3), 'absolute+exact').catch(() => {}); }, @@ -1024,9 +1027,8 @@ export const usePlayer = create((set, get) => ({ showPostPlay() { // A deliberate Skip credits can reopen a screen previously dismissed. - postPlayRequested = true; set({ postPlayDismissed: false }); - startCountdown(); + openPostPlay(); }, dismissPostPlay() { diff --git a/src/screens/settings/AppSettings.tsx b/src/screens/settings/AppSettings.tsx index 67594c7..4ef6f38 100644 --- a/src/screens/settings/AppSettings.tsx +++ b/src/screens/settings/AppSettings.tsx @@ -190,15 +190,15 @@ export function AppSettings({ tab }: { tab: string }) {
- +
Intros set('skipCredits', v)} options={skipOptions} /> + Movie credits + .up-next-back:first-child { - margin-right: auto; -} -.up-next-toolbar .window-controls { - margin-right: calc(-1 * var(--up-gutter)); -} -html.os-macos:not(.window-fullscreen) .up-next-toolbar { - padding-left: max(var(--up-gutter), var(--traffic-lights)); -} -.up-next-back, .up-next-cancel { - display: inline-flex; - align-items: center; - gap: 8px; - font-size: 13px; - color: #d6dcde; - padding: 8px 0; -} -.up-next-back:hover, .up-next-cancel:hover { - color: #fff; +.up-next-window-controls { + position: absolute; + top: 0; + right: 0; + z-index: 2; } .up-next-header { position: relative; display: grid; grid-template-columns: minmax(240px, 37%) minmax(0, 1fr); gap: clamp(28px, 4vw, 64px); - padding: 14px var(--up-gutter) 26px; + padding: 36px var(--up-gutter) 26px; flex: none; } .up-next-now { @@ -784,21 +761,10 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { outline: 1px solid #ffffff30; outline-offset: 2px; } -.up-next-video > span { - position: absolute; - inset: 0; - display: flex; - gap: 8px; - align-items: center; - justify-content: center; - border-radius: inherit; - background: #0007; - opacity: 0; - transition: opacity 150ms; - font-size: 14px; -} -.up-next-video:hover > span, .up-next-video:focus-visible > span { - opacity: 1; +.up-next-video:hover, +.up-next-video:focus-visible { + outline: 2px solid #fff; + outline-offset: 2px; } .up-next-caption { display: flex; @@ -843,6 +809,11 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { .up-next-details .title-art { margin-bottom: 10px; } +.up-next-details .title-text { + margin: 0 0 10px; + font-size: clamp(24px, 2.4vw, 34px); + line-height: 1.1; +} .up-next-details h1 { margin: 10px 0; font-size: clamp(22px, 2vw, 30px); @@ -891,11 +862,6 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { .up-next-play:hover { box-shadow: 0 0 0 2px #ffffff40; } -.up-next-hint { - font-size: 12px; - color: #bdc7ca; - margin: 10px 0 0; -} .up-next-rows { position: relative; overflow-y: auto; @@ -939,18 +905,10 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { object-fit: cover; transition: transform 180ms; } -.up-next-card:hover img { - transform: scale(1.035); -} -.up-next-card-art > span { - position: absolute; - left: 8px; - bottom: 8px; - background: #0b0d0fe6; - border-radius: 4px; - padding: 4px 7px; - font-size: 10px; - font-weight: 650; +.up-next-card:hover .up-next-card-art, +.up-next-card:focus-visible .up-next-card-art { + outline: 2px solid #fff; + outline-offset: 2px; } .up-next-card > b { display: block; @@ -961,11 +919,11 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { overflow: hidden; text-overflow: ellipsis; } -.up-next-card.poster { - flex-basis: clamp(120px, 12vw, 170px); -} -.up-next-card.poster .up-next-card-art { - aspect-ratio: 2 / 3; +.up-next-card > small { + display: block; + margin-top: 5px; + font-size: 11px; + color: #aeb8bb; } .up-next button:focus-visible { outline: 2px solid #fff; @@ -975,7 +933,7 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { .up-next-header { grid-template-columns: minmax(220px, 32%) minmax(0, 1fr); gap: 28px; - padding-top: 8px; + padding-top: 30px; padding-bottom: 22px; } .up-next-details .title-art { From 2db7d8b2721d371ca6472fbb25296756eb564105 Mon Sep 17 00:00:00 2001 From: Elijah Date: Thu, 12 Nov 2026 11:45:30 -0700 Subject: [PATCH 05/16] Publish the 0.1.0-beta.17 update feed (Windows) --- updates/latest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/updates/latest.json b/updates/latest.json index b8cdf27..a62614b 100644 --- a/updates/latest.json +++ b/updates/latest.json @@ -1,11 +1,11 @@ { - "version": "0.1.0-beta.16", - "notes": "- 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.\n- 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.", - "pub_date": "2026-11-12T06:51:10.050Z", + "version": "0.1.0-beta.17", + "notes": "- 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.\n- 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.\n- Cancel autoplay on mouse movement, clicks, scrolling or keypresses. A stationary pointer does not cancel it; cancelled autoplay stays cancelled when delayed metadata arrives.\n- 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.", + "pub_date": "2026-11-12T18:45:12.386Z", "platforms": { "windows-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NFRWYUFBcFRudUhuVmx4eDZSb0RxUGlhOFF1Qi9kOU5STDJTbEJZb2dNYmExeGk3Tll0WXZ3bVEwMjlxRFlMODVOOHlYdHRyY3FoSm54VGpyYTMvOVFJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0NDY2MjUxCWZpbGU6S2FsZWlkb18wLjEuMC1iZXRhLjE2X3g2NC1zZXR1cC5leGUJdmVyc2lvbjowLjEuMC1iZXRhLjE2CjZwRmRuSU56am8xN3hUbThyVXFac3E4TjhOVmFDek4rS3UvS1duOWlFQ3J1bThWQ21Oa0ZDTGVpTXRPclQrdC9FUCtuenFzM0llKytiUm4xQndsRENRPT0K", - "url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v0.1.0-beta.16/Kaleido_0.1.0-beta.16_x64-setup.exe" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NGJ5Yjl4OHhRYnZtVXE4WHZhTTNBSkJ2QloyMTZJY2l2Nm14MlY0dlhYbEpNNjVHem1vVUduenIvL2xJY0VDTlpiajY1NnFIcGRKMlRxYTNJSGZobGd3PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0NTA5MDkxCWZpbGU6S2FsZWlkb18wLjEuMC1iZXRhLjE3X3g2NC1zZXR1cC5leGUJdmVyc2lvbjowLjEuMC1iZXRhLjE3CklvZnZuK1hOaCt1Rk9TcHV0Z0N4YSt0eXJsWVRPTVlvTU1pMmJ4QWVWZ3VUQjZTREh4QmVkMy93YWxWbXZHVkl6TXFveWhjU2tlODBPWWg0cEZ5ZUFBPT0K", + "url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v0.1.0-beta.17/Kaleido_0.1.0-beta.17_x64-setup.exe" } } } From 70530e30e28d6e1490803d4d00b9791c16ca090b Mon Sep 17 00:00:00 2001 From: Elijah Date: Thu, 12 Nov 2026 12:17:52 -0700 Subject: [PATCH 06/16] Release Kaleido Desktop 0.1.0-beta.18 Rebuild the Up Next screen on Kaleido's own components: - Backdrop, colour wash, buttons and cards from the title pages; the credits play in a top-left frame with a matching hole in the page. - Season and related rows use Shelf, so they scroll with side arrows instead of scrollbars; the season row starts at the playing episode. - Returning to the video at the end no longer restarts the episode. - Compact layout for short windows; Mac window buttons stay visible. - Restore the flat Episodes and markers settings. Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 10 + docs/development.md | 14 +- package-lock.json | 4 +- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- src/player/PlayerOverlay.tsx | 2 +- src/player/PostPlay.tsx | 370 ++++++++++++++++++--------- src/screens/settings/AppSettings.tsx | 38 ++- src/styles/player.css | 304 +++++++++++----------- src/styles/screens.css | 23 -- 12 files changed, 427 insertions(+), 346 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dc20e3..fe77357 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 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. diff --git a/docs/development.md b/docs/development.md index 316d041..dbf8d76 100644 --- a/docs/development.md +++ b/docs/development.md @@ -47,15 +47,11 @@ 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 for that file. -Up Next opens at the first Plex credits marker for an episode, including after a seek; -without markers it opens at EOF. Movie-credit skipping is independent. There is one -autoplay timer, measured by elapsed time without requiring webview keyboard focus. -Mouse movement, clicks, keypresses (including Tab), and scrolling cancel it. Esc or -clicking the video returns to playback; F/F11 toggles full screen. Video hover/focus -shows only a white outline. The play button's fill is the visible countdown. -The video rectangle must follow window resizes and DPI changes and return to the full -window on dismissal, episode changes, errors, and closing. Verify those native video -transitions on a GPU-equipped machine; browser layout checks cannot prove rendering. +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 diff --git a/package-lock.json b/package-lock.json index 5751ec6..0d3af2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kaleido-desktop", - "version": "0.1.0-beta.17", + "version": "0.1.0-beta.18", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kaleido-desktop", - "version": "0.1.0-beta.17", + "version": "0.1.0-beta.18", "dependencies": { "@fontsource-variable/inter": "^5.3.0", "@tanstack/react-query": "^5.105.0", diff --git a/package.json b/package.json index ec1a7fc..22fdfd0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "kaleido-desktop", "private": true, - "version": "0.1.0-beta.17", + "version": "0.1.0-beta.18", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 49f2df2..1b9a740 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "kaleido" -version = "0.1.0-beta.17" +version = "0.1.0-beta.18" dependencies = [ "fs2", "futures-util", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 2f201f8..b8c8d87 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kaleido" -version = "0.1.0-beta.17" +version = "0.1.0-beta.18" description = "Kaleido — a Plex client for Windows" authors = ["Elijah"] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 525d4f7..951df20 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Kaleido", - "version": "0.1.0-beta.17", + "version": "0.1.0-beta.18", "identifier": "tv.kaleido.desktop", "build": { "beforeDevCommand": "npm run dev", diff --git a/src/player/PlayerOverlay.tsx b/src/player/PlayerOverlay.tsx index b917128..5843ece 100644 --- a/src/player/PlayerOverlay.tsx +++ b/src/player/PlayerOverlay.tsx @@ -911,7 +911,7 @@ export function PlayerOverlay() { }, [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 && !visible && st.firstFrame && !st.error; + const chromeHidden = st.open && !st.mini && !st.postPlay && !visible && st.firstFrame && !st.error; useEffect(() => { if (!chromeHidden) return; win.setButtonsVisible(false); diff --git a/src/player/PostPlay.tsx b/src/player/PostPlay.tsx index b76c3e7..6241093 100644 --- a/src/player/PostPlay.tsx +++ b/src/player/PostPlay.tsx @@ -1,181 +1,297 @@ -import { useEffect, useRef, useState, type CSSProperties } from 'react'; +import { useEffect, useLayoutEffect, useRef, type CSSProperties } 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 { clock, duration, episodeLabel } from '../app/format'; +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, TitleArt } from '../ui/media'; +import { Facts, Shelf, TitleArt } from '../ui/media'; +import { Artwork } from '../ui/primitives'; import { Icon } from '../ui/Icon'; import { WindowControls } from '../app/TopBar'; -import { Spinner } from '../ui/primitives'; -/** One Up Next screen, with a transparent opening over the native video. */ +/** + * 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 st = usePlayer(); + 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(null); const video = useRef(null); const play = useRef(null); - const currentEpisode = useRef(null); - const [season, setSeason] = useState([]); - const [related, setRelated] = useState([]); - const [details, setDetails] = useState(null); - const item = st.item!; - const upcoming = details?.id === st.nextUp?.id ? details : st.nextUp; - const counting = st.countdown !== 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(() => { - currentEpisode.current?.scrollIntoView({ block: 'nearest', inline: 'center' }); - }, [season]); - - useEffect(() => { - if (!server) return; - let alive = true; - if (item.parentId) api.children(server, item.parentId).then((items) => alive && setSeason(items), () => {}); - if (item.grandparentId) api.related(server, item.grandparentId).then((hubs) => { - const seen = new Set([item.grandparentId]); - const shows = hubs.flatMap((h) => h.items).filter((i) => i.type === 'show' && !seen.has(i.id) && !!seen.add(i.id)); - if (alive) setRelated(shows); - }, () => {}); - return () => { alive = false; }; - }, [server, item.id]); - - useEffect(() => { - if (!server || !st.nextUp) return; - let alive = true; - api.metadata(server, st.nextUp.id).then((next) => alive && setDetails(next), () => {}); - return () => { alive = false; }; - }, [server, st.nextUp?.id]); - - useEffect(() => { - const previous = document.activeElement as HTMLElement | null; (play.current ?? video.current)?.focus({ preventScroll: true }); - const cancel = () => { - const player = usePlayer.getState(); - if (!player.postPlayDismissed) player.cancelCountdown(); - }; - const move = (event: MouseEvent) => { - if (event.movementX !== 0 || event.movementY !== 0) cancel(); + 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) => { - cancel(); + stop(); if (e.key === 'Escape' || e.key === 'Backspace') { e.preventDefault(); - e.stopImmediatePropagation(); usePlayer.getState().dismissPostPlay(); - } else if (e.key === 'F11' || (e.key.toLowerCase() === 'f' && !e.ctrlKey && !e.metaKey && !e.altKey)) { + } else if (e.key === 'F11' || ((e.key === 'f' || e.key === 'F') && !e.ctrlKey && !e.metaKey && !e.altKey)) { e.preventDefault(); usePlayer.getState().toggleFullscreen(); - } else if (e.key === 'Tab') { - // Keep keyboard focus in the player, including after Shift+Tab. - const buttons = [...root.current!.querySelectorAll('button:not(:disabled)')]; - const first = buttons[0], last = buttons[buttons.length - 1]; - if (e.shiftKey && document.activeElement === first) { e.preventDefault(); last?.focus(); } - else if (!e.shiftKey && document.activeElement === last) { e.preventDefault(); first?.focus(); } } }; + const opts = { capture: true, passive: true }; window.addEventListener('keydown', key, true); - window.addEventListener('pointerdown', cancel, true); - window.addEventListener('mousemove', move, { capture: true, passive: true }); - window.addEventListener('wheel', cancel, { capture: true, passive: 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', cancel, true); - window.removeEventListener('mousemove', move, true); - window.removeEventListener('wheel', cancel, true); - if (previous?.isConnected) previous.focus({ preventScroll: true }); + window.removeEventListener('pointerdown', stop, opts); + window.removeEventListener('mousemove', move, opts); + window.removeEventListener('wheel', stop, opts); }; }, []); - useEffect(() => { - const el = video.current; - if (!el) return; - let frame = 0; + const backToVideo = () => usePlayer.getState().dismissPostPlay(); + + return ( +
+
{server && }
+
+ {!fullscreen && } +
+ +
+
+
+
+ + {upcoming || !contextReady ? 'Up next' : 'More to watch'} + + + {upcoming ? ( + <> +

{upcoming.title}

+ + {upcoming.summary &&

{upcoming.summary}

} + + + ) : ( + contextReady &&

You’ve reached the end of this series.

+ )} +
+
+ + {server && } +
+ ); +} + +/** + * 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, frame: React.RefObject) { + useLayoutEffect(() => { + const el = frame.current; + const page = root.current; + if (!el || !page) return; + let raf = 0; const place = () => { - cancelAnimationFrame(frame); - frame = requestAnimationFrame(() => { + cancelAnimationFrame(raf); + raf = requestAnimationFrame(() => { const r = el.getBoundingClientRect(); - const style = root.current!.style; - for (const [key, value] of Object.entries({ x: r.x, y: r.y, w: r.width, h: r.height })) style.setProperty(`--up-video-${key}`, `${value}px`); + 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(() => {}); - root.current!.classList.add('placed'); }); }; - const observer = new ResizeObserver(place); - observer.observe(el); + const ro = new ResizeObserver(place); + ro.observe(el); window.addEventListener('resize', place); place(); return () => { - cancelAnimationFrame(frame); - observer.disconnect(); + cancelAnimationFrame(raf); + ro.disconnect(); window.removeEventListener('resize', place); if (isNative) mpv.rect(null).catch(() => {}); }; }, []); +} - const watch = () => { - if (st.ended) st.togglePause(); - st.dismissPostPlay(); - }; - const choose = (episode: Item) => { - if (episode.id === item.id) watch(); - else st.play(episode, { resume: true, quality: st.quality }); - }; - const browse = async (show: Item) => { - await st.close(); - navigate({ name: 'item', id: show.id, title: show.title }); - }; - const rail = (label: string, items: Item[], episodes: boolean) => items.length > 0 && ( -
-

{label}

-
- {items.map((entry) => ( - - ))} -
-
- ); - +/** 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 ( -
-
{server && }
- {!st.fullscreen &&
} -
-
-
-
- {upcoming || !st.episodeContextReady ? 'Up next' : 'More to watch'} - - {upcoming ? <> -

{upcoming.title}

- - {upcoming.summary &&

{upcoming.summary}

} -
- -
- : st.episodeContextReady ?

You’ve reached the end of this series.

: } -
+
+
+ + {episodeLabel(item)} · {item.title} + + −{clock(Math.max(0, total - position))}
-
- {rail(item.parentIndex ? `Season ${item.parentIndex}` : 'Episodes', season, true)} - {rail('Related shows', related, false)} +
+
); } + +/** Play next episode. While autoplay counts down, a lighter fill sweeps across it. */ +function PlayNext({ ref }: { ref: React.Ref }) { + const countdown = usePlayer((s) => s.countdown); + const total = usePlayer((s) => s.countdownTotal); + const counting = countdown !== null && total > 0; + const fill = counting ? (1 - countdown / total) * 100 : 0; + return ( + + ); +} + +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(null); + useLayoutEffect(() => { + const row = seasonRow.current?.querySelector('.shelf'); + const current = row?.querySelector('[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 ( +
+ {episodes.length > 0 && ( +
+ + {episodes.map((ep) => ( + choose(ep)} + /> + ))} + +
+ )} + {shows.length > 0 && ( + + {shows.map((show) => ( + void browse(show)} /> + ))} + + )} +
+ ); +} + +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 ( +
{ + if (e.key !== 'Enter' && e.key !== ' ') return; + e.preventDefault(); + onChoose(); + }} + > +
+ {title}} /> +
+ {episode && !current && ( +
+ +
+ )} + {progress > 0 && ( + + + + )} +
+
+
+ {title} +
+ {caption &&
{caption}
} +
+
+ ); +} diff --git a/src/screens/settings/AppSettings.tsx b/src/screens/settings/AppSettings.tsx index 4ef6f38..abfa4a5 100644 --- a/src/screens/settings/AppSettings.tsx +++ b/src/screens/settings/AppSettings.tsx @@ -188,28 +188,22 @@ export function AppSettings({ tab }: { tab: string }) { set('hdrPassthrough', v)} /> - -
- -
-
- Intros - set('skipCredits', v)} options={skipOptions} /> -
- {(s.skipIntro === 'auto' || s.skipCredits === 'auto') && ( -
- Skip delay - set('skipIntro', v)} options={skipOptions} /> + + + set('autoSkipDelay', v)} + options={[0, 3, 5, 10].map((v) => ({ value: v, label: v ? `${v} seconds` : 'Skip straight away' }))} + /> + + ({ value: s.id, label: s.title, hint: s.leafCount ? `${s.leafCount} ep` : undefined }))} - onChange={(v) => { - setSeasonId(v); - useRouter.getState().setState({ season: v }); - }} - /> - )} - {season && ( - - {season.leafCount} episodes{season.year ? ` · ${season.year}` : ''} - - )} -
- {season?.summary &&

{season.summary}

} -
- {episodes.isLoading && } - {episodes.data?.map((ep) => )} - {episodes.data && !episodes.data.length && } +
+

+ Episodes + {subtitle && {subtitle}} +

+ ); } +/** 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

{season.title}

; + const choose = (e: React.MouseEvent) => + 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 ( +

+ +

+ ); +} + +/** "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 }) { const seasons = useChildren(item.id); - const server = useServer(); const next = useServerQuery(['onDeck', item.id], (s) => api.onDeckFor(s, item), PROGRESS); const nextEp = next.data; 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 playLabel = nextEp ? (nextEp.viewOffset ? `Resume ${episodeLabel(nextEp)}` : isWatched(item, percent) ? 'Play' : item.viewedLeafCount ? `Watch ${episodeLabel(nextEp)}` : 'Play') : 'Play'; - void server; + const playLabel = nextEp ? (resumable(nextEp) ? `Resume ${episodeLabel(nextEp)}` : isWatched(item, percent) ? 'Play' : item.viewedLeafCount ? `Watch ${episodeLabel(nextEp)}` : 'Play') : 'Play'; return (
@@ -424,14 +385,16 @@ function ShowDetail({ item }: { item: Item }) {
+ {/* The button names the episode number; this adds its title, and the time left when resuming. */} {nextEp && (
- Up next: {episodeLabel(nextEp)} · {nextEp.title} + Up next: {[nextEp.title, resumable(nextEp) ? remaining(nextEp) : ''].filter(Boolean).join(' · ')}
)}
+ {seasons.isLoading && } {seasonList.length > 1 && ( {seasonList.map((s) => ( @@ -439,7 +402,7 @@ function ShowDetail({ item }: { item: Item }) { ))} )} - {seasons.isLoading ? : } + {only && } @@ -452,12 +415,21 @@ function ShowDetail({ item }: { item: Item }) { function SeasonDetail({ item }: { item: Item }) { const show = useItem(item.parentId); + const showItem = show.data; + const episodes = useChildren(item.id); const siblings = useChildren(item.parentId); 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 next = (episodes.data ?? []).find((e) => !isWatched(e, percent)) ?? episodes.data?.[0]; - const showItem = show.data; + const list = episodes.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 (
{item.parentTitle} )} -

{item.title}

+ } > - +
- @@ -489,7 +461,7 @@ function SeasonDetail({ item }: { item: Item }) {
- + {showItem && }
@@ -500,7 +472,7 @@ function SeasonDetail({ item }: { item: Item }) { function EpisodeDetail({ item }: { item: Item }) { const show = useItem(item.grandparentId); const siblings = useChildren(item.parentId); - const resume = item.viewOffset > 0 && !isWatched(item); + const resume = resumable(item); const showItem = show.data; const others = (siblings.data ?? []).filter((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 }) { } > - +
+ ) : ( + title + )}
{meta}
@@ -268,6 +292,34 @@ export const LandscapeCard = memo(function LandscapeCard({ item, continueWatchin ); }); +/** An episode with its synopsis, for a season's episode grid. `upNext` shows its resume point even when watched. */ +export const EpisodeCard = memo(function EpisodeCard({ item, upNext = false }: { item: Item; upNext?: boolean }) { + const server = useServer(); + const handlers = useCardHandlers(item); + const percent = useSettings((s) => s.watchedPercent); + const inProgress = !!item.viewOffset && (upNext || !isWatched(item, percent)); + const title = item.index ? `${item.index}. ${item.title}` : item.title; + const meta = [duration(item.duration), inProgress ? remaining(item) : date(item.originallyAvailableAt)].filter(Boolean).join(' · '); + return ( +
+
+ {title}} /> +
+ + + +
+
+
+ {title} +
+
{meta}
+ {item.summary &&

{item.summary}

} +
+
+ ); +}); + export function PersonCard({ name, role, thumb, onClick }: { name: string; role?: string; thumb?: string; onClick?: () => void }) { const server = useServer(); const initials = name @@ -290,15 +342,22 @@ export function PersonCard({ name, role, thumb, onClick }: { name: string; role? export function Shelf({ title, subtitle, onViewAll, children, className = '', kind = 'poster' }: { title: ReactNode; subtitle?: ReactNode; onViewAll?: () => void; children: ReactNode; className?: string; kind?: 'poster' | 'landscape' | 'people' | 'wide' }) { const row = useRef(null); + const atStart = useRef(true); const [edges, setEdges] = useState({ start: true, end: false }); const update = () => { const el = row.current; if (!el) return; const start = el.scrollLeft < 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. 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(() => { update(); const el = row.current; From 940fe0a6b60797be73af82be839dfffab126829c Mon Sep 17 00:00:00 2001 From: Elijah Date: Fri, 13 Nov 2026 13:49:03 -0700 Subject: [PATCH 11/16] Publish the 1.0.0 update feed (Windows) Co-Authored-By: Claude Opus 5.5 --- updates/latest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/updates/latest.json b/updates/latest.json index 5d09ac8..1086ef9 100644 --- a/updates/latest.json +++ b/updates/latest.json @@ -1,11 +1,11 @@ { - "version": "0.1.0-beta.19", - "notes": "Up Next fixes.\r\n\r\n- 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.\r\n- 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.\r\n- Click the show's logo to go to its page, with playback moving to the miniplayer.\r\n- The Play next episode countdown fills smoothly.\r\n- The episode rows are sized to fill the screen instead of leaving a gap at the bottom.\r\n- The backdrop now shows the next episode, and its description is easier to read over bright artwork.", - "pub_date": "2026-11-12T19:57:48.627Z", + "version": "1.0.0", + "notes": "Kaleido is out of beta. This release reworks the show and season pages and smooths out watching a series.\r\n\r\n- 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.\r\n- Click the season's name under the show's logo to switch to another season.\r\n- Show pages list seasons once, as a row of posters. A show with only one season shows its episodes directly.\r\n- 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.\r\n- When the next episode plays, whether automatically or with Next, it starts from the beginning instead of near the end of an earlier viewing.\r\n- Click a show's name under a Continue Watching card to go to the show.\r\n- Continue Watching starts at the first title when something new is added, instead of scrolling it off the left edge.\r\n- Season posters outside their show's page, such as New Seasons, are labelled with the show's name.\r\n- Season pages show the year the season aired, and their Play button agrees with the show page about which episode is next.\r\n- Movie and episode pages show the runtime in their details, with the time left on the Resume button.", + "pub_date": "2026-11-13T20:48:56.127Z", "platforms": { "windows-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NGJlc0gzYzRXWEVxdDZBeWI1ckRDZ3BwSGQrSTFxZm5RVSsvQi8yU3JOZFByTzBSY3VFUm1LU1U0YjRLU3l2cTZmakY5Nlg4K3Z4NnIxSjRXMW1Mb3dzPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0NTEzNDUzCWZpbGU6S2FsZWlkb18wLjEuMC1iZXRhLjE5X3g2NC1zZXR1cC5leGUJdmVyc2lvbjowLjEuMC1iZXRhLjE5CndMMnN3a28zdC92OHZ6eUVNSXNSV3dHWEJSczd5aFJ1bEpDSFVEUXRYUDRVNVhGeEw4eVIzZ014WW5CWlhIWVJzWFJYTDVFUzU4eVBwNStjZ1RmVkFnPT0K", - "url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v0.1.0-beta.19/Kaleido_0.1.0-beta.19_x64-setup.exe" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NFlVOWVicFVVeFVkT1pqM3BjblhiZlY1d1d4elZOcFZGQnoyUHVNQk9kbzlYVUhPcVBFdmNPem5vTkpJRnlUM0c5WUY4S09pQVVTM0h2MjFicmJOQUE0PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0NjAyOTEwCWZpbGU6S2FsZWlkb18xLjAuMF94NjQtc2V0dXAuZXhlCXZlcnNpb246MS4wLjAKemFVUHVaTzFjdnB5dHk5TzArMFkxM05MQm1La1UrZllGc2hmVkNkVHpkaDFjUXc5bnJqVWFweGFnV1YyNkVnWlFqWm4vNXp0UkRHeDVsbjYwR2tZQWc9PQo=", + "url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v1.0.0/Kaleido_1.0.0_x64-setup.exe" } } } From 6775d29249afca7b75c36e79968f869eeded18c0 Mon Sep 17 00:00:00 2001 From: Elijah Date: Fri, 13 Nov 2026 20:08:56 -0700 Subject: [PATCH 12/16] Shorten the startup intro to a quick facet snap Desktop startup is usually ready well before the kaleidoscope finished, so the intro took 2.3 s regardless. The six facets now spin in and lock in 0.44 s, then the fly-through follows in 0.54 s (about 1 s in all). Shards circle the mark only if startup is still going. Co-Authored-By: Claude Opus 5.5 --- src/screens/Splash.tsx | 133 ++++++++++++++--------------------------- src/styles/app.css | 5 +- 2 files changed, 48 insertions(+), 90 deletions(-) diff --git a/src/screens/Splash.tsx b/src/screens/Splash.tsx index a9a62a1..dba47ab 100644 --- a/src/screens/Splash.tsx +++ b/src/screens/Splash.tsx @@ -2,11 +2,11 @@ import { useEffect, useRef } from 'react'; import { useSettings } from '../app/settings'; /** - * The cold-start brand sequence: a kaleidoscope. A mirrored field of shards - * turns and gathers into the mark's six facets; if startup is still going, - * small shards keep circling the mark. Once startup is ready the camera flies - * through the mark's open centre, revealing the app drawn beneath (which - * settles from a slight zoom, `html.splash-arrival`). + * The cold-start brand sequence, kept short because desktop startup is quick: + * the mark's six facets spin in from a loose ring and snap together with a + * ring pulse. If startup is still going, small shards circle the mark. Once + * startup is ready the camera flies through the mark's open centre, revealing + * the app drawn beneath (which settles from a slight zoom, `html.splash-arrival`). */ type Point = { x: number; y: number }; @@ -51,7 +51,7 @@ const rad = (deg: number) => (deg * Math.PI) / 180; const PALETTE = ['#C3E8D3', '#71B9B0', '#3D7C7B', '#D0A977', '#E9D8AE', '#EEF2DD']; // The brand mark's facets, centred on its 64-unit viewport, each with the -// angle of its hexagon edge's outward normal and its centroid. +// outward normal of its hexagon edge and its centroid. const FACETS = [ [33, 4, 55.5, 17, 42.5, 24.5, 33, 19], [56.5, 19, 56.5, 45, 43.5, 37.5, 43.5, 26.5], @@ -63,48 +63,46 @@ const FACETS = [ const points: Point[] = []; for (let k = 0; k < pts.length; k += 2) points.push({ x: pts[k] - 32, y: pts[k + 1] - 32 }); const centroid = { x: points.reduce((s, p) => s + p.x, 0) / 4, y: points.reduce((s, p) => s + p.y, 0) / 4 }; - return { points, centroid, color: PALETTE[i], angle: rad(-60 + 60 * i) }; + const angle = rad(-60 + 60 * i); + return { points, centroid, color: PALETTE[i], normal: { x: Math.cos(angle), y: Math.sin(angle) } }; }); type Facet = (typeof FACETS)[number]; -// Loose shards around each facet: angle offset from the facet's normal, starting -// radius (px), size, palette offset and how far they tumble on the way in. -const SHARDS = [ - { angle: 20, radius: 170, scale: 0.42, color: 2, spin: 1.2 }, - { angle: -20, radius: 170, scale: 0.42, color: 4, spin: -1.2 }, - { angle: 36, radius: 320, scale: 0.3, color: 3, spin: 2.1 }, - { angle: -36, radius: 320, scale: 0.3, color: 1, spin: -2.1 }, - { angle: 8, radius: 420, scale: 0.2, color: 5, spin: 3 }, - { angle: -8, radius: 420, scale: 0.2, color: 5, spin: -3 }, -]; - // The inner hexagon traced by the facets' inner edges: the aperture the exit flies through. const INNER_RADIUS = 13.6; const MARK_BOX = 140; -// Timeline (ms): the mark has formed at INTRO_END; the sequence then idles until startup is ready. -const INTRO_END = 1700; -const EXIT_MS = 640; -// The mark is larger than the old lockup, so it zooms less to end the flight at the same size. +// Timeline (ms): the last facet locks at INTRO_END; the sequence then idles until startup is ready. +const FACET_STAGGER = 18; +const FACET_MS = 350; +const INTRO_END = FACET_STAGGER * 5 + FACET_MS; +// Still waiting at this point: shards start circling and a sheen crosses the mark. +const IDLE_START = 1100; +// Keep in step with the `splash-arrival` animation in app.css. +const EXIT_MS = 540; const FLIGHT_ZOOM = 30; const INK = '#090a0c'; const SEA_GLASS = [113, 185, 176]; -const LIGHT = [238, 242, 221]; const rgba = (c: number[], a: number) => `rgba(${c[0]}, ${c[1]}, ${c[2]}, ${Math.max(0, a)})`; -/** A facet turned `rot` about the mark centre, shrunk and spun about its own centroid, then offset. */ -function facetPath(ctx: CanvasRenderingContext2D, f: Facet, o: Point, unit: number, rot: number, scale: number, spin: number, offset: Point) { +/** + * Facet `f` around mark centre `o`, `unit` px per grid unit: pushed `out` along its + * normal, shrunk and spun about its own centroid, then turned `rot` about the mark centre. + */ +function facetPath(ctx: CanvasRenderingContext2D, f: Facet, o: Point, unit: number, out = 0, scale = 1, spin = 0, rot = 0) { const cr = Math.cos(rot); const sr = Math.sin(rot); 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.centroid.x; - const ry = p.y - f.centroid.y; - const x = f.centroid.x + (rx * cs - ry * ss) * scale; - const y = f.centroid.y + (rx * ss + ry * cs) * scale; - const px = o.x + (x * cr - y * sr) * unit + offset.x; - const py = o.y + (x * sr + y * cr) * unit + offset.y; + 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); }); @@ -142,9 +140,6 @@ function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number, ctx.clearRect(0, 0, w, h); const zoom = q > 0 ? Math.exp(Math.log(FLIGHT_ZOOM) * Flight(q)) : 1; const unit = (MARK_BOX / 64) * zoom; - const gather = Emphasized(phase(time, 0, 1450)); - // The whole field turns a little less than half a revolution as it gathers. - const field = rad(-150) * (1 - Emphasized(phase(time, 0, 1550))); // The surface: ink everywhere, with the aperture's centre cut away on exit. const hole = InOut(phase(q, 0.12, 0.5)); @@ -163,25 +158,7 @@ function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number, ctx.globalAlpha = 1; } - // The kaleidoscope's mirror lines, turning with the field. - const lines = InOut(phase(time, 0, 450)) * (1 - Standard(phase(time, 1100, 1700))); - if (lines > 0) { - ctx.lineWidth = 1; - for (let s = 0; s < 6; s++) { - const a = field + rad(-90 + 60 * s); - const end = { x: o.x + Math.cos(a) * 640, y: o.y + Math.sin(a) * 640 }; - const g = ctx.createLinearGradient(o.x, o.y, end.x, end.y); - g.addColorStop(0, rgba(LIGHT, 0.2 * lines)); - g.addColorStop(1, rgba(LIGHT, 0)); - ctx.strokeStyle = g; - ctx.beginPath(); - ctx.moveTo(o.x, o.y); - ctx.lineTo(end.x, end.y); - ctx.stroke(); - } - } - - const bloom = 0.09 * InOut(phase(time, 200, 1000)) * (1 - Standard(phase(time, 1500, 2600))); + const bloom = 0.09 * InOut(phase(time, 0, 260)) * (1 - Standard(phase(time, 420, 1100))); if (bloom > 0.001) { ctx.globalCompositeOperation = 'lighter'; const g = ctx.createRadialGradient(o.x, o.y, 0, o.x, o.y, 300); @@ -195,56 +172,36 @@ function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number, ctx.globalCompositeOperation = 'source-over'; } - // Shards spiral inward, faster than the field turns, and vanish into the centre. - ctx.globalCompositeOperation = 'screen'; - const inward = Emphasized(phase(time, 0, 1350)); + // The six facets spin in from a loose ring and lock into the mark. FACETS.forEach((f, s) => { - SHARDS.forEach((d, j) => { - const appear = Standard(phase(time, j * 50 + s * 25, j * 50 + s * 25 + 420)); - const vanish = Standard(phase(time, 750 + j * 45, 1350 + j * 45)); - if (appear <= 0 || vanish >= 1) return; - const a = f.angle + rad(d.angle) + field * 1.5; - const r = d.radius * (1 - 0.88 * inward); - ctx.globalAlpha = appear * (1 - vanish) * 0.9; - ctx.fillStyle = PALETTE[(s + d.color) % 6]; - ctx.beginPath(); - shardPath(ctx, f, { x: o.x + Math.cos(a) * r, y: o.y + Math.sin(a) * r }, unit * d.scale * (1 - 0.6 * vanish), field * 2 + d.spin * (1 - gather)); - ctx.fill(); - }); - }); - ctx.globalAlpha = 1; - ctx.globalCompositeOperation = 'source-over'; - - // The six facets ride in from the field and lock into the mark. - FACETS.forEach((f, s) => { - const r = 240 * (1 - gather); - const a = f.angle + field; - ctx.globalAlpha = Standard(phase(time, s * 25, s * 25 + 420)); + const start = s * FACET_STAGGER; + const p = Emphasized(phase(time, start, start + FACET_MS)); + ctx.globalAlpha = Standard(phase(time, start, start + 160)); ctx.fillStyle = f.color; ctx.beginPath(); - facetPath(ctx, f, o, unit, field, mix(0.55, 1, gather), rad(-60) * (1 - gather), { x: Math.cos(a) * r, y: Math.sin(a) * r }); + facetPath(ctx, f, o, unit, 7 * (1 - p), mix(0.5, 1, p), rad(-45) * (1 - p), rad(-60) * (1 - p)); ctx.fill(); }); ctx.globalAlpha = 1; // A ring pulses out as the facets lock. - const pulse = phase(time, 1380, 2050); + const pulse = phase(time, 340, 900); if (pulse > 0 && pulse < 1) { - ctx.strokeStyle = rgba(SEA_GLASS, 0.45 * (1 - pulse)); + ctx.strokeStyle = rgba(SEA_GLASS, 0.45 * (1 - pulse) * (1 - phase(q, 0, 0.3))); ctx.lineWidth = 1.5; ctx.beginPath(); - hexagon(ctx, o, (30 + 24 * EmphasizedDecelerate(pulse)) * unit); + hexagon(ctx, o, (30 + 22 * EmphasizedDecelerate(pulse)) * unit); ctx.stroke(); } - // Still starting: small shards keep circling the mark. - const idle = Standard(phase(time, 2300, 2900)) * (1 - phase(q, 0, 0.25)); + // Still starting: small shards circle the mark. + const idle = Standard(phase(time, IDLE_START, IDLE_START + 600)) * (1 - phase(q, 0, 0.25)); if (idle > 0) { ctx.globalCompositeOperation = 'screen'; ctx.globalAlpha = 0.4 * idle; for (let s = 0; s < 6; s++) { for (const side of [-1, 1]) { - const a = rad(-60 + 60 * s) + side * rad(11) + (time - 2300) * 0.00032; + const a = rad(-60 + 60 * s) + side * rad(11) + (time - IDLE_START) * 0.00032; ctx.fillStyle = PALETTE[(s + (side > 0 ? 2 : 4)) % 6]; ctx.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); @@ -255,12 +212,12 @@ function draw(ctx: CanvasRenderingContext2D, w: number, h: number, time: number, ctx.globalCompositeOperation = 'source-over'; } - // A band of light crosses the settled mark, then again every few seconds while it waits. - const sheen = time < 1500 ? 0 : ((time - 1500) % 3600) / 900; + // 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.beginPath(); - FACETS.forEach((f) => facetPath(ctx, f, o, unit, 0, 1, 0, { x: 0, y: 0 })); + FACETS.forEach((f) => facetPath(ctx, f, o, unit)); ctx.clip(); const reach = 40 * unit; const a = rad(36); @@ -334,7 +291,7 @@ export function Splash({ ready, onDone }: { ready: boolean; onDone: () => void } cancelAnimationFrame(raf); window.removeEventListener('resize', size); // 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]); diff --git a/src/styles/app.css b/src/styles/app.css index 63eec8e..ff3508c 100644 --- a/src/styles/app.css +++ b/src/styles/app.css @@ -270,10 +270,11 @@ html.os-macos:not(.window-fullscreen) .topbar { pointer-events: none; } /* 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 .auth-screen { - animation: splash-arrival 640ms linear both; + animation: splash-arrival 540ms linear both; } @keyframes splash-arrival { 0% { From 624f01f745b010c8940847dc2e6fd773177ddc29 Mon Sep 17 00:00:00 2001 From: Elijah Date: Tue, 17 Nov 2026 10:41:52 -0700 Subject: [PATCH 13/16] Add a stop button to the player and resume after a server outage The full player had no way to stop: Back only moved playback to the miniplayer. A stop button now sits with the right-hand controls and closes the player outright, as the miniplayer's close button does. When the server went away mid-stream, mpv played out its buffer and then took the cut-off stream for the end of the file: the title counted as ended (opening Up Next for episodes), and Play restarted it from 0. A stream ending more than 15 s before its duration is now treated as a lost connection: the player shows "Lost connection to ", checks /identity every few seconds, and reloads in place at the same position (staying in the miniplayer) once the server answers; Play tries at once. A second cut-off at the same spot counts as the real end of the file. A file left paused at its end (keep-open) re-paused as soon as it was unpaused, so the reload is unpaused again after loadfile. Co-Authored-By: Claude Opus 5.5 --- src/player/PlayerOverlay.tsx | 11 +++-- src/player/miniWindow.ts | 4 +- src/player/store.test.ts | 58 +++++++++++++++++++++-- src/player/store.ts | 90 ++++++++++++++++++++++++++++++++++-- src/ui/Icon.tsx | 1 + 5 files changed, 152 insertions(+), 12 deletions(-) diff --git a/src/player/PlayerOverlay.tsx b/src/player/PlayerOverlay.tsx index 5843ece..568bd6a 100644 --- a/src/player/PlayerOverlay.tsx +++ b/src/player/PlayerOverlay.tsx @@ -758,7 +758,7 @@ function MiniPlayer() {
- {(loading || st.buffering) && !st.error ? ( + {(loading || st.buffering || st.reconnecting) && !st.error ? ( ) : st.error ? ( Playback stopped @@ -965,10 +965,12 @@ export function PlayerOverlay() { {!st.fullscreen && }
- {(loading || st.buffering || st.seeking || preparing) && !st.error && ( + {(loading || st.buffering || st.seeking || preparing || st.reconnecting) && !st.error && (
- {preparing && ( + {st.reconnecting ? ( +

Lost connection to {server?.name ?? 'the server'}

+ ) : preparing && (

Preparing {UPSCALING[st.enhance.active].label} upscaling First time on this computer only @@ -1057,6 +1059,9 @@ export function PlayerOverlay() { )}

+ diff --git a/src/player/miniWindow.ts b/src/player/miniWindow.ts index 2f1966c..eebe2b2 100644 --- a/src/player/miniWindow.ts +++ b/src/player/miniWindow.ts @@ -30,6 +30,7 @@ interface PlayerView { duration: number; firstFrame: boolean; buffering: boolean; + reconnecting: boolean; error: string; } @@ -50,7 +51,8 @@ function view(st: PlayerView): MiniState { position: st.position, duration: st.duration, loading: !st.firstFrame && !st.error, - buffering: st.buffering, + // Waiting for the server to come back shows as buffering. + buffering: st.buffering || st.reconnecting, error: !!st.error, }; } diff --git a/src/player/store.test.ts b/src/player/store.test.ts index e129b1d..df87345 100644 --- a/src/player/store.test.ts +++ b/src/player/store.test.ts @@ -5,7 +5,7 @@ const harness = vi.hoisted(() => { const memory = new Map(); 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 }; + return { event: (_e: MpvEvent) => {}, next: [] as unknown[], focused: true, identity: vi.fn() }; }); vi.mock('../platform/native', () => ({ @@ -20,7 +20,7 @@ vi.mock('./engine', () => ({ mpv: { } })); vi.mock('../app/session', async () => { const { create } = await import('zustand'); - return { useSession: create(() => ({ server: { machineId: 'test', token: 'test-only' }, connection: { local: true } })) }; + return { useSession: create(() => ({ server: { machineId: 'test', token: 'test-only', name: 'Test', get: harness.identity }, connection: { local: true } })) }; }); vi.mock('../downloads/store', () => ({ useDownloads: { getState: () => ({ items: [] }) } })); vi.mock('../app/queries', () => ({ invalidateLibrary: vi.fn() })); @@ -42,7 +42,11 @@ const episode = (id = '1') => parseItem({ ratingKey: id, type: 'episode', title: Media: [{ Part: [{ key: '/video', Stream: [{ id: 'audio', streamType: 2 }] }] }], }); const time = (position: number) => harness.event({ type: 'property', name: 'time-pos', value: position }); -const eof = () => harness.event({ type: 'end-file', reason: 'eof' }); +/** The stream ending at `position` (by default the real end of the 100 s episode). */ +const eof = (position = 99.6) => { + usePlayer.setState({ position }); + harness.event({ type: 'end-file', reason: 'eof' }); +}; beforeEach(async () => { vi.useFakeTimers(); @@ -226,3 +230,51 @@ describe('Up Next playback lifecycle', () => { 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(); + }); +}); diff --git a/src/player/store.ts b/src/player/store.ts index bbdd4d8..0606a41 100644 --- a/src/player/store.ts +++ b/src/player/store.ts @@ -36,6 +36,8 @@ export interface PlayOptions { 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 { @@ -48,6 +50,8 @@ interface PlayerState { error: string; /** The server owner stopped this stream (error holds their message). */ terminated: boolean; + /** The stream was cut off before the end (the server went away); waiting for it to come back. */ + reconnecting: boolean; position: number; duration: number; cacheTime: number; @@ -597,7 +601,7 @@ function onEvent(e: MpvEvent) { } break; case 'eof-reached': - if (v === true) onEnded(); + if (v === true) onStreamEnd(); break; } break; @@ -618,11 +622,14 @@ function onEvent(e: MpvEvent) { // (Briefly: an unreachable server shouldn't hold up the error.) const failed = session; Promise.race([report('buffering'), new Promise((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.' }); fallbackAfterError(); }); - } else if (e.reason === 'eof') onEnded(); + } else if (e.reason === 'eof') onStreamEnd(); break; case 'log': noteMpvLog(e.level, e.prefix, e.text); @@ -655,6 +662,63 @@ function maybeCredits(pos: number) { } 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 | 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 { + 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() { const st = usePlayer.getState(); if (st.ended) return; @@ -677,6 +741,7 @@ export const usePlayer = create((set, get) => ({ firstFrame: false, error: '', terminated: false, + reconnecting: false, position: 0, duration: 0, cacheTime: 0, @@ -720,6 +785,8 @@ export const usePlayer = create((set, get) => ({ return; } 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; @@ -748,6 +815,7 @@ export const usePlayer = create((set, get) => ({ firstFrame: false, error: '', terminated: false, + reconnecting: false, position: (opts.offsetMs ?? 0) / 1000, lastSeek: 0, duration: input.duration / 1000, @@ -769,7 +837,7 @@ export const usePlayer = create((set, get) => ({ subKey: opts.tracks?.subKey ?? '__init', video: null, fullscreen: fullscreenNow, - mini: false, + mini: opts.keepMini ? previous.open && previous.mini : false, videoGamma: '', enhance: { ...previous.enhance, bypass: false, preparing: false }, }); @@ -866,6 +934,9 @@ export const usePlayer = create((set, get) => ({ offsetMs > 0 && delivery.mode !== 'transcode' ? `start=${(offsetMs / 1000).toFixed(2)}` : 'start=none', ].join(','); 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); report('buffering'); @@ -884,6 +955,8 @@ export const usePlayer = create((set, get) => ({ loadToken++; const st = get(); stopCountdown(); + stopReconnecting(); + lastCutAt = null; if (reportTimer) clearInterval(reportTimer); reportTimer = null; if (st.item && !st.error) report('stopped'); @@ -901,7 +974,7 @@ export const usePlayer = create((set, get) => ({ await mpv.command('stop').catch(() => {}); await mpv.show(false).catch(() => {}); } - set({ open: false, mini: false, postPlay: false, item: null, delivery: null, error: '', terminated: false, countdown: null, nextUp: null, prevUp: null, firstFrame: false }); + set({ open: false, mini: false, postPlay: false, item: null, delivery: null, error: '', terminated: false, reconnecting: false, countdown: null, nextUp: null, prevUp: null, firstFrame: false }); // Closing the full player hands back the window it found; closing the // miniplayer leaves browsing as it is, full screen or not. if (!st.mini) { @@ -913,6 +986,13 @@ export const usePlayer = create((set, get) => ({ togglePause() { 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) { st.seek(0); set({ ended: false }); diff --git a/src/ui/Icon.tsx b/src/ui/Icon.tsx index 04d1b54..0d94c62 100644 --- a/src/ui/Icon.tsx +++ b/src/ui/Icon.tsx @@ -13,6 +13,7 @@ const PATHS: Record = { arrowLeft: '', play: '', pause: '', + stop: '', plus: '', minus: '', check: '', From 0d423eb70887827042f94174c1be1e29396e239d Mon Sep 17 00:00:00 2001 From: Elijah Date: Tue, 17 Nov 2026 10:42:37 -0700 Subject: [PATCH 14/16] Move the stop button beside the forward controls It follows Forward 10 seconds (or Next episode), with a matching spacer on the other side so play/pause stays centred. Co-Authored-By: Claude Opus 5.5 --- src/player/PlayerOverlay.tsx | 6 ++++-- src/styles/player.css | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/player/PlayerOverlay.tsx b/src/player/PlayerOverlay.tsx index 568bd6a..5094fb2 100644 --- a/src/player/PlayerOverlay.tsx +++ b/src/player/PlayerOverlay.tsx @@ -1025,6 +1025,8 @@ export function PlayerOverlay() {
+ {/* Balances Stop on the other side, so play/pause stays centred. */} +
-
+
+
diff --git a/src/styles/player.css b/src/styles/player.css index 0ca1f70..d09a418 100644 --- a/src/styles/player.css +++ b/src/styles/player.css @@ -350,6 +350,10 @@ html.os-macos:not(.window-fullscreen) .player-top { .player-controls-center { gap: 10px; } +.player-icon-spacer { + width: 44px; + height: 44px; +} .player-icon:disabled { opacity: 0.32; pointer-events: none; From 1f9474c2fd9c58272b0a10e8b39de89e9ac122ba Mon Sep 17 00:00:00 2001 From: Elijah Date: Tue, 17 Nov 2026 10:43:02 -0700 Subject: [PATCH 15/16] Release Kaleido Desktop 1.0.1 - Shorter startup intro (Snap): about 1 s to the app instead of 2.3 s. - A stop button in the player, beside the forward controls, closes it outright. - Playback waits out a server outage and resumes at the same position instead of ending and restarting from 0. Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 8 ++++++++ package-lock.json | 4 ++-- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed4b04b..89d5b1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # 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. diff --git a/package-lock.json b/package-lock.json index ca9602e..a12cc89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kaleido-desktop", - "version": "1.0.0", + "version": "1.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kaleido-desktop", - "version": "1.0.0", + "version": "1.0.1", "dependencies": { "@fontsource-variable/inter": "^5.3.0", "@tanstack/react-query": "^5.105.0", diff --git a/package.json b/package.json index b7b7f3e..ffa1da4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "kaleido-desktop", "private": true, - "version": "1.0.0", + "version": "1.0.1", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index eca151d..fd8584e 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "kaleido" -version = "1.0.0" +version = "1.0.1" dependencies = [ "fs2", "futures-util", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 0abafd8..c879aaf 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kaleido" -version = "1.0.0" +version = "1.0.1" description = "Kaleido — a Plex client for Windows" authors = ["Elijah"] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 6f2152e..e6ecb1d 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Kaleido", - "version": "1.0.0", + "version": "1.0.1", "identifier": "tv.kaleido.desktop", "build": { "beforeDevCommand": "npm run dev", From b42f77a3aad04039317acef6f70946f509ebe4f6 Mon Sep 17 00:00:00 2001 From: Elijah Date: Tue, 17 Nov 2026 10:47:35 -0700 Subject: [PATCH 16/16] Publish the 1.0.1 update feed (Windows) Co-Authored-By: Claude Opus 5.5 --- updates/latest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/updates/latest.json b/updates/latest.json index 1086ef9..8289664 100644 --- a/updates/latest.json +++ b/updates/latest.json @@ -1,11 +1,11 @@ { - "version": "1.0.0", - "notes": "Kaleido is out of beta. This release reworks the show and season pages and smooths out watching a series.\r\n\r\n- 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.\r\n- Click the season's name under the show's logo to switch to another season.\r\n- Show pages list seasons once, as a row of posters. A show with only one season shows its episodes directly.\r\n- 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.\r\n- When the next episode plays, whether automatically or with Next, it starts from the beginning instead of near the end of an earlier viewing.\r\n- Click a show's name under a Continue Watching card to go to the show.\r\n- Continue Watching starts at the first title when something new is added, instead of scrolling it off the left edge.\r\n- Season posters outside their show's page, such as New Seasons, are labelled with the show's name.\r\n- Season pages show the year the season aired, and their Play button agrees with the show page about which episode is next.\r\n- Movie and episode pages show the runtime in their details, with the time left on the Resume button.", - "pub_date": "2026-11-13T20:48:56.127Z", + "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": { "windows-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NFlVOWVicFVVeFVkT1pqM3BjblhiZlY1d1d4elZOcFZGQnoyUHVNQk9kbzlYVUhPcVBFdmNPem5vTkpJRnlUM0c5WUY4S09pQVVTM0h2MjFicmJOQUE0PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0NjAyOTEwCWZpbGU6S2FsZWlkb18xLjAuMF94NjQtc2V0dXAuZXhlCXZlcnNpb246MS4wLjAKemFVUHVaTzFjdnB5dHk5TzArMFkxM05MQm1La1UrZllGc2hmVkNkVHpkaDFjUXc5bnJqVWFweGFnV1YyNkVnWlFqWm4vNXp0UkRHeDVsbjYwR2tZQWc9PQo=", - "url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v1.0.0/Kaleido_1.0.0_x64-setup.exe" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVST1RiNHdFVm01NFZMQVRPVll0SHZPQWJWUlIyQnZEME10bldKUnYxSkhHWEJSWWxOT3FoVHp6NlNsU0dwdlg1UmUweGlEdzNoQnduSnora0dZempZS2ZWdFZLa3BIRkFJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk0OTM3NjI5CWZpbGU6S2FsZWlkb18xLjAuMV94NjQtc2V0dXAuZXhlCXZlcnNpb246MS4wLjEKeUI5aUJ4d3hONmVlNlBBWDFxQkFkYTV4WXU0eHIzb1ZKaVZjaDhpODhpbXdvL2RWRlhTRTBwQXJGV3hJYlg2RERnMDBhSFBRWHZDekxCRTVNNCtIRFE9PQo=", + "url": "https://git.elijahkuntz.com/Elijah/Kaleido-Desktop/releases/download/v1.0.1/Kaleido_1.0.1_x64-setup.exe" } } }