diff --git a/CHANGELOG.md b/CHANGELOG.md index 89d5b1c..f811990 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,28 +1,5 @@ # Changelog -## 1.0.1 - -A quicker start, a Stop button, and recovery when the server drops out mid-video. - -- Kaleido starts faster: the opening animation is shorter, so you reach your library in about a second. -- The player has a Stop button, next to the forward controls, which closes the player completely instead of moving it to the miniplayer. -- If your Plex server goes down while you're watching, the player waits for it once the buffered video runs out, then carries on from the same spot when the server is back. Before, it treated the video as finished and Play started it again from the beginning. Pressing Play while it waits tries to reconnect straight away. - -## 1.0.0 - -Kaleido is out of beta. This release reworks the show and season pages and smooths out watching a series. - -- Season pages show their episodes as a grid of cards, each with its still, description and watched state, in place of the long episode list. -- Click the season's name under the show's logo to switch to another season. -- Show pages list seasons once, as a row of posters. A show with only one season shows its episodes directly. -- Episodes you've watched stay marked as watched when you rewatch them and stop partway through. The leftover position only shows on the episode you're up to. -- When the next episode plays, whether automatically or with Next, it starts from the beginning instead of near the end of an earlier viewing. -- Click a show's name under a Continue Watching card to go to the show. -- Continue Watching starts at the first title when something new is added, instead of scrolling it off the left edge. -- Season posters outside their show's page, such as New Seasons, are labelled with the show's name. -- Season pages show the year the season aired, and their Play button agrees with the show page about which episode is next. -- Movie and episode pages show the runtime in their details, with the time left on the Resume button. - ## 0.1.0-beta.19 Up Next fixes. diff --git a/package-lock.json b/package-lock.json index a12cc89..c2b9033 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kaleido-desktop", - "version": "1.0.1", + "version": "0.1.0-beta.19", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kaleido-desktop", - "version": "1.0.1", + "version": "0.1.0-beta.19", "dependencies": { "@fontsource-variable/inter": "^5.3.0", "@tanstack/react-query": "^5.105.0", diff --git a/package.json b/package.json index ffa1da4..db9e07a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "kaleido-desktop", "private": true, - "version": "1.0.1", + "version": "0.1.0-beta.19", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index fd8584e..c87ca4a 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "kaleido" -version = "1.0.1" +version = "0.1.0-beta.19" dependencies = [ "fs2", "futures-util", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index c879aaf..0b163b6 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kaleido" -version = "1.0.1" +version = "0.1.0-beta.19" 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 e6ecb1d..5286972 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.1", + "version": "0.1.0-beta.19", "identifier": "tv.kaleido.desktop", "build": { "beforeDevCommand": "npm run dev", diff --git a/src/app/format.ts b/src/app/format.ts index e4a7ba9..a41b82d 100644 --- a/src/app/format.ts +++ b/src/app/format.ts @@ -36,19 +36,10 @@ export function progress(item: Item): number { return Math.min(1, Math.max(0, item.viewOffset / item.duration)); } -/** - * Watched once Plex has counted a full play. A rewatch left partway through keeps the - * title watched; its position only matters for resuming (`resumable`). - */ export function isWatched(item: Item, percent = 90): boolean { if (item.type === 'show' || item.type === 'season') return item.leafCount > 0 && item.viewedLeafCount >= item.leafCount; - if (item.viewCount > 0) return true; - return item.viewOffset > 0 && item.duration > 0 && item.viewOffset / item.duration >= percent / 100; -} - -/** Has a saved position worth resuming from (not one at the very end). */ -export function resumable(item: Item): boolean { - return item.viewOffset > 0 && item.duration > 0 && item.viewOffset < item.duration * 0.97; + if (item.viewOffset > 0 && item.duration > 0) return item.viewCount > 0 && item.viewOffset / item.duration >= percent / 100; + return item.viewCount > 0; } export function remainingEpisodes(item: Item): number { diff --git a/src/app/keyboardNav.ts b/src/app/keyboardNav.ts index 4e01527..8a77535 100644 --- a/src/app/keyboardNav.ts +++ b/src/app/keyboardNav.ts @@ -1,9 +1,9 @@ /** * Arrow-key movement between titles, for keyboard users. Focus moves to the * nearest card in the pressed direction (by on-screen geometry), so it works - * the same across shelves, grids and people rows. + * the same across shelves, grids, episode lists and people rows. */ -const TARGETS = '.card, .person-card:not(:disabled), .shelf-title-link'; +const TARGETS = '.card, .person-card:not(:disabled), .episode-row, .shelf-title-link'; function center(r: DOMRect) { return { x: r.left + r.width / 2, y: r.top + r.height / 2 }; diff --git a/src/player/PlayerOverlay.tsx b/src/player/PlayerOverlay.tsx index 5094fb2..5843ece 100644 --- a/src/player/PlayerOverlay.tsx +++ b/src/player/PlayerOverlay.tsx @@ -758,7 +758,7 @@ function MiniPlayer() {
- {(loading || st.buffering || st.reconnecting) && !st.error ? ( + {(loading || st.buffering) && !st.error ? ( ) : st.error ? ( Playback stopped @@ -965,12 +965,10 @@ export function PlayerOverlay() { {!st.fullscreen && }
- {(loading || st.buffering || st.seeking || preparing || st.reconnecting) && !st.error && ( + {(loading || st.buffering || st.seeking || preparing) && !st.error && (
- {st.reconnecting ? ( -

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

- ) : preparing && ( + {preparing && (

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

- {/* Balances Stop on the other side, so play/pause stays centred. */} -
+ {p > 0 && !watched && ( + + + + )} +
+
+

+ {ep.title} + {watched && } +

+
+ {[duration(ep.duration), ep.originallyAvailableAt ? date(ep.originallyAvailableAt) : '', ep.viewOffset && !watched ? remaining(ep) : ''].filter(Boolean).join(' · ')} +
+ {ep.summary &&

{ep.summary}

} +
+ ); } -function EpisodesSection({ episodes, subtitle, upNextId }: { episodes: Item[] | undefined; subtitle?: string; upNextId?: string }) { +function Episodes({ seasons, initialSeason, showPicker = true }: { seasons: Item[]; initialSeason?: string; showPicker?: boolean }) { + const saved = useRouter((s) => s.current.state.season as string | undefined); + const [seasonId, setSeasonId] = useState(saved ?? initialSeason ?? seasons[0]?.id); + useEffect(() => { + if (!seasonId && seasons[0]) setSeasonId(initialSeason ?? seasons[0].id); + }, [seasons, initialSeason]); + const episodes = useChildren(seasonId); + const season = seasons.find((s) => s.id === seasonId); + if (!seasons.length) return null; return (
-
-

- Episodes - {subtitle && {subtitle}} -

+
+

Episodes

+ {showPicker && seasons.length > 1 && ( +