Compare commits

..

No commits in common. "8533347b516c0d31e7c7fcb18bed0cc4222e7445" and "0ee43ffa766b874338327cfd79ef86de0ad35573" have entirely different histories.

35 changed files with 213 additions and 619 deletions

View file

@ -35,11 +35,6 @@ jobs:
if test -f distribution/Kaleido.apk; then
(cd distribution && sha256sum -c Kaleido.apk.sha256)
.tools/sdk/build-tools/35.0.0/apksigner verify --verbose --print-certs distribution/Kaleido.apk
# The APK's own manifest must carry the advertised version (and, for a tag, version.properties').
case "${{ github.ref }}" in
refs/tags/v*) python3 scripts/verify_distribution.py --release ;;
*) python3 scripts/verify_distribution.py ;;
esac
fi
- name: Publish signed tag release
if: startsWith(github.ref, 'refs/tags/v')

View file

@ -35,17 +35,7 @@ Install `app/build/outputs/apk/release/app-release.apk` instead for performance/
## Testing suite
Use `& $KaleidoPython` before the Python commands below. **Never run competing device/UI tests in parallel.**
**Test in tiers; don't run every suite for every change.** Each device script cold-starts Kaleido, waits for playback and real timers, and dumps the UI per check, so a full pass takes 30+ minutes.
1. **Every change:** `.\Build.ps1 -Test` (compile, JVM unit tests, lint; about a minute). Put pure logic (ordering, parsing, fingerprints, countdown rules) in unit-testable functions with JVM tests instead of proving it on the TV.
2. **UI or device behaviour changed:** run only the one or two scripts for the area touched (map below), plus a screenshot of the changed screen. One script is usually 1–4 minutes.
3. **Before a release, or after broad navigation/playback/startup changes:** the full set: `verify_ui.py browse` and `player`, `repro_runtime.py controls episode postplay credits sections`, `verify_player_features.py`, `verify_settings.py`, then the release build with `repro_runtime.py browse` for frame pacing.
Area → checks: Home/Movies/TV rows, focus, details Back → `verify_ui.py browse` · player bar, menus, scrubbing → `verify_ui.py player` · previous/next episode, auto-skip, server picker, cross-device refresh → `verify_player_features.py <phase>` · post-play/autoplay/credits → `repro_runtime.py postplay` or `credits` · Settings rows/dialogs → `verify_settings.py` · details/cast → `verify_details_layout.py` / `verify_movie_details.py` · library A–Z/search → `verify_library_jump.py` · startup/tab loading → `repro_runtime.py sections` · scrolling smoothness → release + `repro_runtime.py browse`. Skip suites for untouched areas and say which were skipped.
Run only checks relevant to the change. Live playback tests change real Plex progress and can change playback preferences. Restore a useful final state, normally the release build on Home. After a functional debug batch, restore the signed release and its ART profile before returning the device to normal use; never judge performance from an unoptimized debug build.
Use `& $KaleidoPython` before the Python commands below. Run only checks relevant to the change; **never run competing device/UI tests in parallel**. Live playback tests change real Plex progress and can change playback preferences. Restore a useful final state, normally the release build on Home. After a functional debug batch, restore the signed release and its ART profile before returning the device to normal use; never judge performance from an unoptimized debug build.
| Command | Purpose / required build |
| --- | --- |
@ -68,8 +58,7 @@ Run only checks relevant to the change. Live playback tests change real Plex pro
| `scripts/verify_movie_details.py` | Movie safe header, related movies and Back focus restoration; debug or release |
| `scripts/verify_settings.py` | Category navigation, preference-dialog cancellation and live update check; expects Original quality / 80% test preferences |
| `scripts/verify_library_jump.py` | Scoped Movie/TV categories, A–Z jumps beyond the first page, details/Back focus and exact Silo search |
| `scripts/verify_player_features.py [phase…]` | Phases `previous_episode`, `auto_skip` (Skipping intro fill, Down/Back cancel), `server_picker` (Back/Cancel), `refresh` (resume and open-app Continue Watching sync; moves and restores Silo 1×1 progress); **debug**; restores skip preferences |
| `scripts/verify_audio_preferences.py` | Theme persistence and actual playback audio; **debug**; restores prior audio preferences |
| `scripts/verify_audio_preferences.py` | Theme/boost persistence and actual boosted playback; **debug**; restores prior audio preferences |
Live Android integration tests (currently six) cover secure persistence, library APIs, episodes, PIN, preview JPEGs/new seasons and supported HEVC remux negotiation:
@ -86,7 +75,7 @@ These require the private test session. Playback test intents (`testTitleId`, `t
## Important regression traps
- Keep initialization independent of cancellable tab requests and apply section results atomically. Cancelling initialization during a startup tab switch previously left Movies/TV blank.
- Foreground library sync polls revisions every 15 seconds with a 60-second refresh fallback, and checks within a second of returning to the foreground. The revision includes a Continue Watching fingerprint (membership, order, watch count, progress in 5% steps) so watching on another device shows up without refreshing Home on every poll; pause it for playback/background and stage updates before applying them. Preserve stable hub/card focus IDs and current library filters/range. `LibrarySyncIntegrationTest` tests the real timer against an in-memory HTTP fixture without changing Plex or the encrypted session.
- Foreground library sync polls revisions every 15 seconds with a 60-second refresh fallback; pause it for playback/background and stage updates before applying them. Preserve stable hub/card focus IDs and current library filters/range. `LibrarySyncIntegrationTest` tests the real timer against an in-memory HTTP fixture without changing Plex or the encrypted session.
- Home, Movies and TV stay composed once shown; hidden ones are unplaced, have no semantics and must never request focus (gate effects on `active`). Catalog and rails prefetch through `FramePrefetch`/`CacheWindows`, which must remain a `CacheWindowLogic` or rows stop being kept around. With any accessibility service enabled, Compose walks every composed node after each layout change: keep offscreen rows and cards without semantics (`semanticsOnScreen`). See `docs/runtime-verification.md` (frame pacing).
- Preserve explicit D-pad row/column targets and fixed card geometry. Avoid expensive beyond-bounds focus searches, per-focus catalog recomposition and full-screen gradient overdraw. Contrast is baked into cached backdrop bitmaps off the main thread.
- Give every Media3 session a unique ID: next-episode creation can overlap the old controller's disposal. Plex HLS position is absolute; **do not add the requested resume offset again**.
@ -94,9 +83,8 @@ These require the private test session. Playback test intents (`testTitleId`, `t
- A text field keeps the D-pad: route Down/IME actions out of Search's field explicitly. Give every `focusRestorer()` a fallback, or it overrides explicit focus targets. Per-card modifiers on browse rows must be `Modifier.Node`s, not `composed {}`, and must not animate per card.
- Playback has one quality preference (`StreamQuality`): **Original quality** (the default) tries the original file, then Plex HLS, then a 1080p conversion if needed; 4K/1080p/720p/480p ask Plex to convert. A nonempty audio-only track list for a declared video must trigger fallback. Earlier preferences migrate on first read. Debug `testMode` still forces a delivery mode. Augment Plex's existing HEVC target; competing targets previously forced unnecessary conversion. A server copy decision does not prove rendering. Preserve the selected Plex tracks and check actual delivered formats.
- **ADB screenshots can omit HEVC video on this onn while the actual TV displays it. The user confirmed this.** Do not force transcoding based solely on a blank capture. `scripts/check_video.py` has a pixel assertion that can falsely fail for this reason; use playback logs/rendered-frame evidence and physical TV confirmation as appropriate. Never infer universal HDR/codec support from one test.
- Preview thumbnails and intro/credit markers depend on server-generated data. Do not fabricate them. Automatic skips (Settings › Playback, 0 = button only) show "Skipping intro/credits" with a filling background rather than a number, count down only while playing, and are cancelled by any remote press (OK on the button skips now; Back only cancels).
- Theme tracks come from Plex metadata and inherit from the show for seasons/episodes. Stop music on video playback/background. Volume boost was removed because it degraded audio; keep passthrough and the normal audio path.
- A server-stopped session (Plex dashboard Stop) arrives as `terminationCode`/`terminationText` on the timeline response. Leave the player with the reason and never fall back or reconnect afterwards; timelines keep reporting `buffering` while a stream stalls so the stop is still noticed.
- Preview thumbnails and intro/credit markers depend on server-generated data. Do not fabricate them.
- Theme tracks come from Plex metadata and inherit from the show for seasons/episodes. Stop music on video playback/background. Volume boost processes decoded PCM; Off must preserve passthrough and the normal audio path.
### Performance testing

View file

@ -1,17 +1,5 @@
# Kaleido releases
## 0.7.0
- Add a Previous episode button to the player, and redesign its controls: elapsed and remaining time at the ends of the timeline, previous episode, back 10 seconds, play, forward 30 seconds and next episode grouped in the centre, and the finish time beside Exit. Previous episode also steps back through a shuffle.
- Skip intros and credits automatically after a delay you choose in Settings › Playback (3, 5, 10 or 15 seconds, or show the button only). A pending skip reads "Skipping intro" with a filling background; pressing any button on the remote cancels it, and OK skips straight away. The earlier "Automatically" setting becomes a 5-second skip.
- Show what you watch on other devices promptly: Kaleido checks Continue Watching every 15 seconds while open and as soon as you return to it.
- Keep playback paused when you leave Kaleido while a stream is still starting, and only count down to the next episode while Kaleido is on screen.
- Keep the resume point when leaving a title before its stream has started, and keep progress reports on the server the title came from.
- Close Settings › Choose server with Back or the new Cancel button, and enter Home's rows from the Home tab when there is no featured title.
- Cancel slow network requests when they are no longer needed, and connect to the best server address as soon as it answers.
- Update a title's format badges when you pick another version, keep New Seasons when one show can't be loaded, and keep focus on Continue Watching when a card is replaced while a title page is open.
- Remove Volume boost, which degraded audio, and leave the player with the server's reason when a stream is stopped from the Plex dashboard.
## 0.6.2
- New startup animation, the same as Kaleido Desktop's: a kaleidoscope of shards turns and gathers into the Kaleido mark, then the view flies through its centre into Home.

View file

@ -10,7 +10,7 @@ A Plex client for Android TV, designed for browsing from the couch. Kaleido puts
- **Home** brings together featured titles, Plex recommendations and Continue Watching. Resume a movie or get back to your current series without digging through your library.
- **Movies** starts with recent releases and recommendations. **TV Shows** leads with your next episodes, new seasons and newly added episodes.
- **Library** gives you an A–Z poster grid with watched-status and sorting controls; **Categories** browses by genre. If you have more than one movie or TV library, choose which one each section shows.
- **Library** gives you an A–Z poster grid with genre, watched-status and sorting controls. If you have more than one movie or TV library, choose which one each section shows.
- **Search** finds movies, shows, episodes and people across your libraries. Type with the remote or search by voice.
- **Title pages** include ratings, a synopsis, trailers and extras, and cast portraits with character names. Select an actor to see their available movies and shows. Series pages put seasons first. Season and episode pages show the episode you move to in the season row; select it, or Play, to watch.
- **Quick actions**: hold OK (or press Menu) on any title to play, start over, mark it watched, remove it from Continue Watching, or jump to its season or show.

View file

@ -30,14 +30,6 @@ class BrowsePolicyTest {
assertEquals(listOf("unknown1","unknown2","s1"),result.take(3).map{it.id})
assertTrue(groupRecentSeasons(emptyList()){error("Empty row")}.isEmpty())
}
@Test fun recentSeasonsSurviveOneUnavailableShow()=runBlocking {
val newest=title("s4","season").copy(parentId="gone",parentTitle="Missing",title="Season 4")
val older=title("s3","season").copy(parentId="gone",parentTitle="Missing",title="Season 3")
val other=title("s9","season").copy(parentId="show-c",parentTitle="Other",title="Season 9")
val result=groupRecentSeasons(listOf(newest,older,other)){throw PlexException("This item is no longer available.",404)}
assertEquals(listOf("s4","s9"),result.map{it.id})
assertEquals("Missing · Season 4",result.first().title)
}
@Test fun partiallyWatchedShowUsesEpisodeCountsEvenWithViewCount() {
val show=Title.parse(JSONObject("""{"type":"show","viewCount":12,"leafCount":30,"viewedLeafCount":10}"""))

View file

@ -158,6 +158,7 @@ internal fun anticipateTileMove(vm:KaleidoViewModel,items:List<Title>,index:Int,
val name=if(vm.page.kind=="movies")"Movies"else "TV Shows"
LaunchedEffect(vm.categories,vm.section?.id,vm.genres){vm.loadCategoryArtworks()}
var sortMenu by remember{mutableStateOf(false)}
var genreMenu by remember{mutableStateOf(false)}
var sectionMenu by remember{mutableStateOf(false)}
val discoverFocus=remember{FocusRequester()};val libraryFocus=remember{FocusRequester()};val categoriesFocus=remember{FocusRequester()}
val filterFocus=remember{FocusRequester()};val categoryEntryFocus=remember{FocusRequester()};val railFocus=remember{FocusRequester()};val sectionFocus=remember{FocusRequester()}
@ -206,7 +207,8 @@ internal fun anticipateTileMove(vm:KaleidoViewModel,items:List<Title>,index:Int,
Row(Modifier.fillMaxWidth().height(43.dp).padding(horizontal=Cinema.gutter),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(8.dp)) {
Text("${vm.total} titles",color=Muted,fontSize=11.sp,lineHeight=16.sp)
Spacer(Modifier.weight(1f))
TvButton(if(vm.unwatched)"Unwatched ✓"else "Unwatched",Modifier.focusRequester(filterFocus).focusProperties{left=categoriesFocus},selected=vm.unwatched){vm.filter(unwatchedValue=!vm.unwatched)}
TvButton((if(vm.genre.isBlank())"All genres"else vm.genres.firstOrNull{it.first==vm.genre}?.second ?: "Genre")+" ⌄",Modifier.focusRequester(filterFocus).focusProperties{left=categoriesFocus}){genreMenu=true}
TvButton(if(vm.unwatched)"Unwatched ✓"else "Unwatched",selected=vm.unwatched){vm.filter(unwatchedValue=!vm.unwatched)}
TvButton((sortLabels.firstOrNull{it.first==vm.sort}?.second ?: "Title: A–Z")+" ⌄",Modifier.focusProperties{right=FocusRequester.Cancel}){sortMenu=true}
}
val grid=rememberLazyGridState()
@ -247,7 +249,7 @@ internal fun anticipateTileMove(vm:KaleidoViewModel,items:List<Title>,index:Int,
val lastColumn=index%6==5||index==vm.library.lastIndex
MediaTile(vm,item,"library:${item.id}",fillWidth=true,modifier=Modifier.focusRequester(requester).then(if(lastColumn)Modifier.focusProperties{right=railFocus}else Modifier),onMove={anticipateTileMove(vm,vm.library,index,it,6)},onFocused={vm.onLibraryGridFocused()})
}
if(vm.library.isEmpty()&&!vm.busy)item(span={GridItemSpan(6)}){EmptyState("No matching titles","Try another category or watch filter.")}
if(vm.library.isEmpty()&&!vm.busy)item(span={GridItemSpan(6)}){EmptyState("No matching titles","Try another genre or watch filter.")}
if(vm.library.size<vm.total)item(span={GridItemSpan(6)}){TvButton(if(vm.busy)"Loading…"else "Load more titles"){vm.more()}}
}
LibraryJumpRail(enabledLetters,vm.libraryJumpLetter,railFocus,{scope.launch{runCatching{ returnFocusToGrid() }}},{vm.jumpToLibraryLetter(it)})
@ -255,6 +257,7 @@ internal fun anticipateTileMove(vm:KaleidoViewModel,items:List<Title>,index:Int,
}
}
if(sortMenu)ChoiceDialog("Sort by",sortLabels.map{it.second},sortLabels.indexOfFirst{it.first==vm.sort},{sortMenu=false}){vm.filter(sortValue=sortLabels[it].first);sortMenu=false}
if(genreMenu)ChoiceDialog("Genres",listOf("All genres")+vm.genres.map{it.second},vm.genres.indexOfFirst{it.first==vm.genre}+1,{genreMenu=false}){vm.filter(genreValue=if(it==0)""else vm.genres[it-1].first);genreMenu=false}
if(sectionMenu){val options=vm.sections.filter{it.type==vm.section?.type};ChoiceDialog("Libraries",options.map{it.title},options.indexOf(vm.section),{sectionMenu=false}){vm.chooseSection(options[it]);sectionMenu=false}}
}

View file

@ -9,7 +9,13 @@ import androidx.media3.exoplayer.audio.ForwardingAudioSink
/** Android rejects a center-only PCM mask; one-channel audio uses its standard mono output. */
@androidx.annotation.OptIn(UnstableApi::class)
internal class CompatibleAudioSink(sink:AudioSink):ForwardingAudioSink(sink) {
internal class CompatibleAudioSink(sink:AudioSink,private val decodedOnly:Boolean=false):ForwardingAudioSink(sink) {
override fun supportsFormat(format:Format):Boolean =
if(decodedOnly&&format.sampleMimeType!=MimeTypes.AUDIO_RAW)false else super.supportsFormat(format)
override fun getFormatSupport(format:Format):Int =
if(decodedOnly&&format.sampleMimeType!=MimeTypes.AUDIO_RAW)AudioSink.SINK_FORMAT_UNSUPPORTED else super.getFormatSupport(format)
override fun getFormatOffloadSupport(format:Format):androidx.media3.exoplayer.audio.AudioOffloadSupport =
if(decodedOnly)androidx.media3.exoplayer.audio.AudioOffloadSupport.DEFAULT_UNSUPPORTED else super.getFormatOffloadSupport(format)
@Suppress("DEPRECATION")
override fun configure(config:AudioSink.AudioSinkConfig) {
val format=compatiblePcmFormat(config.format)

View file

@ -177,15 +177,11 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
}
scrolling.join()
}
/** The first card of the first row: where Down goes when Home has no hero to hold focus. */
suspend fun enterFirstRow(){hubs.firstOrNull{it.items.isNotEmpty()}?.let{hub->val item=hub.items.first();anticipateCard(item);moveToRow(hub.id,item.id)}}
suspend fun moveToHero()=coroutineScope {
heroActive=true
val scrolling=launch{list.animateBrowseTo(0)}
focusHero();scrolling.join()
}
/** Whether focus is inside this screen; a card key in [KaleidoViewModel.focusId] alone doesn't mean it is. */
val screenFocus=remember{booleanArrayOf(false)}
LaunchedEffect(hubs) {
val old=previousHubs
if(old==hubs)return@LaunchedEffect
@ -210,19 +206,6 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
previousHubs=hubs
// A hidden screen moves no focus; it finds its card again when shown.
if(!active())return@LaunchedEffect
if(oldHub==null) {
// The card being restored (e.g. after details) was already gone from the previous rows,
// and this refresh cancelled that restoration. Finish it here instead of leaving focus
// on the top bar: the card itself if it is back, else the first card of its row.
val key=focus
val row=hubs.firstOrNull{key.startsWith("${it.id}:")&&it.items.isNotEmpty()}
if(row!=null&&!screenFocus[0]) {
val item=row.items.firstOrNull{"${row.id}:${it.id}"==key} ?: row.items.first()
columns[row.id]=item.id;pendingColumns[row.id]=item.id
navigationJob[0]=scope.launch{withFrameNanos{};moveToRow(row.id,item.id)}
}
return@LaunchedEffect
}
if(oldHub!=null&&oldTitle!=null) {
val sameHub=hubs.firstOrNull{it.id==oldHub.id}
@ -261,8 +244,6 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
// Discover is fixed above the catalog. Enter it immediately, without resetting
// or waiting for two lazy lists to lay out. The next Down explicitly enters row 0.
if(!home)runCatching{local.section.requestFocus()}
// Continue Watching and other rows can exist without an eligible featured title.
else if(activeFeature.value==null)navigationJob[0]=scope.launch{enterFirstRow()}
else {
if(heroActive)runCatching{heroFocus.requestFocus()}
navigationJob[0]=scope.launch{moveToHero()}
@ -298,6 +279,7 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
}
// Hidden, the screen keeps its state but gives up focus: an unplaced card must not take key
// events. Shown again, it focuses what a freshly composed screen would.
val screenFocus=remember{booleanArrayOf(false)}
val focusManager=LocalFocusManager.current
suspend fun reveal() {
withFrameNanos{}
@ -309,7 +291,7 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
if(key=="discovery-entry"&&!home)runCatching{local.section.requestFocus()}
return
}
if(key=="home-feature"){if(home&&feature!=null)moveToHero()else if(home)enterFirstRow();return}
if(key=="home-feature"){if(home&&feature!=null)moveToHero();return}
val card=hubs.firstNotNullOfOrNull{hub->hub.items.firstOrNull{"${hub.id}:${it.id}"==key}?.let{hub to it}}
if(card!=null){moveToRow(card.first.id,card.second.id);return}
if(requesters[key]?.let{runCatching{it.requestFocus()}.getOrDefault(false)}==true)return

View file

@ -35,10 +35,6 @@ private fun categoryArtworkHint(section:Section,genre:String):String?=when {
else->null
}
private const val SyncQuietMillis=2000L
/** The countdown an earlier "Automatically" skip setting becomes. */
internal const val AutoSkipDefaultSeconds=5
/** Returning to Kaleido checks the server almost at once, so watching elsewhere shows up promptly. */
private const val ResumeSyncDelayMillis=750L
class KaleidoViewModel(app: Application): AndroidViewModel(app) {
val application = app as KaleidoApplication
val api = application.api
@ -101,8 +97,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
var playbackReturn by mutableIntStateOf(0); private set
private var retryAction:(()->Unit)?=null
private var previousTab="home"
/** Observable, so the version button, format badges and technical line all follow a new choice. */
private val mediaChoices=androidx.compose.runtime.mutableStateMapOf<String,Int>()
private val mediaChoices=mutableMapOf<String,Int>()
/** The episode a season or episode page shows, by page id. Focus in its season row chooses it. */
val episodeSelections=androidx.compose.runtime.mutableStateMapOf<String,String>()
var query by mutableStateOf(""); private set
@ -125,9 +120,8 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
var remoteQuality by mutableStateOf(preferences.getString("remoteQuality",null)?.let{n->StreamQuality.entries.firstOrNull{it.name==n}} ?: StreamQuality.FullHD); private set
/** Seconds before the next episode starts; 0 turns autoplay off. */
var autoplaySeconds by mutableIntStateOf(preferences.getInt("autoplaySeconds",5)); private set
/** Seconds the Skip intro/credits button counts down before skipping by itself; 0 only shows the button. */
var autoSkipIntroSeconds by mutableIntStateOf(autoSkipSeconds("autoSkipIntro")); private set
var autoSkipCreditsSeconds by mutableIntStateOf(autoSkipSeconds("autoSkipCredits")); private set
var autoSkipIntro by mutableStateOf(preferences.getBoolean("autoSkipIntro",false)); private set
var autoSkipCredits by mutableStateOf(preferences.getBoolean("autoSkipCredits",false)); private set
var subtitleSize by mutableStateOf(preferences.getString("subtitleSize",null)?.let{n->SubtitleSize.entries.firstOrNull{it.name==n}} ?: SubtitleSize.Normal); private set
var subtitleStyle by mutableStateOf(preferences.getString("subtitleStyle",null)?.let{n->SubtitleStyle.entries.firstOrNull{it.name==n}} ?: SubtitleStyle.Box); private set
/** Debug test intents force a delivery mode (0 file, 1 direct stream, 2 convert); never set in release. */
@ -140,6 +134,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
var colourWash by mutableStateOf(preferences.getBoolean("colourWash",true)); private set
var themeMusic by mutableStateOf(preferences.getBoolean("themeMusic",false)); private set
var themeVolume by mutableIntStateOf(preferences.getInt("themeVolume",30).coerceIn(10,100)); private set
var volumeBoostDb by mutableIntStateOf(preferences.getInt("volumeBoostDb",0).coerceIn(0,12)); private set
var episodeQueue by mutableStateOf(emptyList<Title>());private set
var relatedShows by mutableStateOf(emptyList<Title>());private set
var transitioningEpisode by mutableStateOf(false);private set
@ -173,8 +168,6 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
Thread({android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);task.run()},"KaleidoArtworkPrefetch").apply{isDaemon=true}
}.asCoroutineDispatcher()
init {
// Volume boost was removed; drop its stored level.
if(preferences.contains("volumeBoostDb"))preferences.edit().remove("volumeBoostDb").apply()
// Development provisioning is private app data, never an APK resource or build constant.
if(BuildConfig.DEBUG) {
val seed=File(app.filesDir,"bootstrap.json")
@ -242,25 +235,20 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
librarySyncJob?.cancel();librarySyncJob=null
if(!value)return
librarySyncJob=viewModelScope.launch {
// Kept across background spells: returning compares against what was last applied,
// so Continue Watching changes made on another device show up within a second.
var interval=ResumeSyncDelayMillis
var backoff=LibrarySync.POLL_MS
var observedSession=session
var sync=newLibrarySync()
var interval=LibrarySync.POLL_MS
while(isActive) {
delay(interval);interval=backoff
val sync=librarySync?.takeIf{librarySyncSession==session} ?: newLibrarySync().also{librarySync=it;librarySyncSession=session}
delay(interval)
if(session!=observedSession){observedSession=session;sync=newLibrarySync()}
if(session==null||playing!=null||busy||markingId!=null||initializeJob?.isActive==true)continue
try{sync.check();backoff=LibrarySync.POLL_MS}
try{sync.check();interval=LibrarySync.POLL_MS}
catch(e:CancellationException){throw e}
catch(_:Exception){backoff=(backoff*2).coerceAtMost(LibrarySync.FALLBACK_MS)}
interval=backoff
catch(_:Exception){interval=(interval*2).coerceAtMost(LibrarySync.FALLBACK_MS)}
}
}
}
private var librarySyncSession:Session?=null
private var librarySync:LibrarySync?=null
/** Library contents plus Continue Watching progress, which changes when anything is watched elsewhere. */
private fun newLibrarySync()=LibrarySync({api.libraryRevision()+"#"+api.continueWatchingRevision()},::syncLibrary,android.os.SystemClock::elapsedRealtime)
private fun newLibrarySync()=LibrarySync(api::libraryRevision,::syncLibrary,android.os.SystemClock::elapsedRealtime)
private suspend fun syncLibrary():Boolean {
val expectedSession=session ?: return false
val expectedPage=page;val generation=loadGeneration
@ -292,7 +280,6 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
section!=expectedSection||sort!=expectedSort||genre!=expectedGenre||unwatched!=expectedUnwatched||categories!=expectedCategories||allTitles!=expectedAllTitles||
playing!=null||busy||markingId!=null)return false
sections=freshSections;homeHubs=freshHome.hubs;homeFeatures=freshHome.features
android.util.Log.i("KaleidoSync","APPLIED continue=${freshHome.hubs.firstOrNull{it.id=="continue"}?.items?.size ?: 0}")
sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear()
sectionStale=freshSection==null
if(freshSection!=null){section=active;discoverHubs=freshSection.hubs;genres=freshSection.genres;library=freshSection.library.items;total=freshSection.library.total}
@ -337,36 +324,23 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
fun beginAccountLink(){linkingAccount=true;linkAccount()}
fun cancelAccountLink(){authJob?.cancel();pin=null;servers=emptyList();accountToken=session?.accountToken.orEmpty();linkingAccount=false}
/** Rating keys are only unique per server: drop per-title state when the server or account changes. */
private fun clearServerState(){
searchJob?.cancel();searchJob=null;query="";searchResults=SearchResults()
episodeContextJob?.cancel();episodeContextJob=null;episodeTransitionJob?.cancel();episodeTransitionJob=null
episodeQueue=emptyList();relatedShows=emptyList();shuffleEpisodes=null;transitioningEpisode=false
mediaChoices.clear();episodeSelections.clear()
}
fun chooseServer(server: Server) = launchLoad {
sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation();clearDiscovery();clearServerState()
sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation();clearDiscovery()
val s=api.connect(server,accountToken); application.secure.save(s);api.session=s;session=s;servers=emptyList();linkingAccount=false;pages=listOf(Page());sections=api.sections();homeHubs=loadHome()
}
fun manualConnect(address: String, token: String) = launchLoad {
sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation();clearDiscovery();clearServerState()
sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation();clearDiscovery()
require(address.startsWith("https://")||address.startsWith("http://")){"Enter a complete http:// or https:// server address."}
require(token.isNotBlank()){ "Enter an access token." }
val s=api.validate(Session("",token.trim(),address.trim().trimEnd('/'),"Plex",""))
authJob?.cancel();application.secure.save(s);api.session=s;session=s;linkingAccount=false;pages=listOf(Page());sections=api.sections();homeHubs=loadHome()
}
fun signOut(){loadJob?.cancel();initializeJob?.cancel();clearServerState();application.secure.clear();api.session=null;session=null;homeHubs=emptyList();discoverHubs=emptyList();clearDiscovery();sections=emptyList();library=emptyList();sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation();pages=listOf(Page());servers=emptyList();accountToken="";linkAccount()}
/** Back or Cancel from the server picker: keep the current server, or start over with a new sign-in code. */
fun dismissServerPicker(){
loadJob?.cancel();busy=false
if(session==null){servers=emptyList();linkAccount()}else cancelAccountLink()
}
fun signOut(){loadJob?.cancel();initializeJob?.cancel();application.secure.clear();api.session=null;session=null;homeHubs=emptyList();discoverHubs=emptyList();clearDiscovery();sections=emptyList();library=emptyList();sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation();pages=listOf(Page());servers=emptyList();accountToken="";linkAccount()}
fun switchServer()=launchLoad { require(accountToken.isNotBlank()){ "This connection uses a server token. Sign out to link a Plex account." };servers=api.servers(accountToken) }
fun tab(kind: String){
if(pages.size==1&&page.kind==kind)return
// Search and Settings return to the browsing tab they were opened from.
if(kind in listOf("search","settings")&&pages.first().kind in listOf("home","movies","tv"))previousTab=pages.first().kind
if(kind!="search"){searchJob?.cancel();searchJob=null}
cancelAnticipation();loadJob?.cancel();busy=false;focusId="";if(kind in listOf("movies","tv")){allTitles=false;categories=false;genre="";libraryJumpIndex=-1;libraryJumpLetter=null};pages=listOf(Page(kind));loadPage(true)
}
fun open(item: Title){detailsCache[item.id]=item;episodeSelections.remove(item.id);pages=pages+Page(if(item.type in listOf("collection","season")) "group" else "details",item.id,item.title,focusId);loadPage()}
@ -386,7 +360,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
/** The version (Plex Media) chosen for this title in this session; the first version by default. */
fun mediaIndex(item:Title)=(mediaChoices[item.id] ?: 0).coerceIn(0,(item.media.size-1).coerceAtLeast(0))
fun chooseMedia(item:Title,index:Int){mediaChoices[item.id]=index}
fun chooseMedia(item:Title,index:Int){mediaChoices[item.id]=index;detail=detail?.let{if(it.id==item.id)it.copy()else it}}
fun openActor(actor:CastMember){
if(actor.id.isBlank())return
pages=pages+Page("actor",actor.id,actor.name,focusId,actor);focusId="";loadPage()
@ -479,11 +453,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
cancelAnticipation();focusId=if(allTitles)"library-entry"else "discovery-entry";loadSection(s)
if(keepCategories){allTitles=true;categories=true;focusId="categories-entry"}
}
fun setAll(value: Boolean){
// Genre filtering belongs to Categories; the Library grid always lists the whole section.
val hadGenre=genre.isNotBlank();focusId=if(value)"library-entry"else "discovery-entry";allTitles=value;categories=false;genre="";libraryJumpIndex=-1;libraryJumpLetter=null
if(hadGenre)refreshLibrary()
}
fun setAll(value: Boolean){focusId=if(value)"library-entry"else "discovery-entry";allTitles=value;categories=false;libraryJumpIndex=-1;libraryJumpLetter=null}
fun openCategories(){val hadGenre=genre.isNotBlank();allTitles=true;categories=true;genre="";focusId="categories-entry";libraryJumpIndex=-1;libraryJumpLetter=null;if(hadGenre)refreshLibrary()}
fun loadCategoryArtworks() {
val selectedSection=section ?: return
@ -569,7 +539,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
}
fun selectCategory(value:String){if(value.isBlank())return;categories=true;allTitles=true;genre=value;sort="titleSort:asc";focusId="category-grid";libraryJumpIndex=-1;libraryJumpLetter=null;refreshLibrary()}
fun filter(sortValue: String=sort,unwatchedValue: Boolean=unwatched){sort=sortValue;unwatched=unwatchedValue;libraryJumpIndex=-1;libraryJumpLetter=null;refreshLibrary()}
fun filter(sortValue: String=sort,genreValue: String=genre,unwatchedValue: Boolean=unwatched){sort=sortValue;genre=genreValue;unwatched=unwatchedValue;libraryJumpIndex=-1;libraryJumpLetter=null;refreshLibrary()}
private fun refreshLibrary() {
val selectedSection=section ?: return
val requestedSort=sort;val requestedGenre=genre;val requestedUnwatched=unwatched
@ -690,38 +660,11 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
}
}
/** The episode before [item]: the previous one in the show, or the previous shuffle pick. */
fun precedingEpisode(item:Title):Title? {
val shuffle=shuffleEpisodes
if(shuffle!=null)return shuffle.preceding(item.id)
val i=episodeQueue.indexOfFirst{it.id==item.id};return if(i>0)episodeQueue[i-1]else null
}
/** False only once the episode list has loaded and [item] is the show's first episode (or the shuffle's first pick). */
fun mayHavePrecedingEpisode(item:Title):Boolean {
val shuffle=shuffleEpisodes
if(shuffle!=null)return shuffle.preceding(item.id)!=null
val i=episodeQueue.indexOfFirst{it.id==item.id};return i!=0
}
fun followingEpisode(item:Title):Title? {
val shuffle=shuffleEpisodes
if(shuffle!=null)return shuffle.following(item.id)
val i=episodeQueue.indexOfFirst{it.id==item.id};return if(i>=0)episodeQueue.getOrNull(i+1)else null
}
fun previousEpisode(item: Title) {
if(episodeTransitionJob?.isActive==true)return
episodeTransitionJob=viewModelScope.launch {
transitioningEpisode=true
try {
val shuffle=shuffleEpisodes
val previous=if(shuffle!=null)shuffle.preceding(item.id) else {
val episodes=if(episodeQueue.any{it.id==item.id})episodeQueue else api.allEpisodes(item.grandparentId).sortedWith(compareBy<Title>{it.parentIndex}.thenBy{it.index})
val i=episodes.indexOfFirst{it.id==item.id};if(i>0)episodes[i-1]else null
} ?: return@launch
val metadata=api.details(previous.id)
if(playing?.id==item.id){if(shuffle!=null)shuffle.retreat(item.id,previous.id);startFromZero=true;playbackInstance++;playing=metadata}
}catch(e:CancellationException){throw e}catch(e:Exception){fail(e.message ?: "The previous episode could not be loaded."){previousEpisode(item)}}finally{transitioningEpisode=false}
}
}
fun nextEpisode(item: Title) {
if(episodeTransitionJob?.isActive==true)return
episodeTransitionJob=viewModelScope.launch {
@ -737,11 +680,6 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}catch(e:CancellationException){throw e}catch(e:Exception){fail(e.message ?: "The next episode could not be loaded."){nextEpisode(item)}}finally{transitioningEpisode=false}
}
}
/** The server ended this session: leave the player and explain, offering to resume from the saved position. */
fun playbackStoppedByServer(item:Title,message:String){
if(playing?.id!=item.id)return
stopPlayback();fail(message){play(item)}
}
fun stopPlayback(){
val finished=playing
shuffleEpisodes=null
@ -757,8 +695,6 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
}
}
// Earlier versions stored an on/off switch that skipped at once; on becomes a short, cancellable countdown.
private fun autoSkipSeconds(name:String)=preferences.getInt("${name}Seconds",if(preferences.getBoolean(name,false))AutoSkipDefaultSeconds else 0).coerceIn(0,60)
// Earlier versions stored a mode (Original/Direct stream/Transcode) and a separate transcode quality.
private fun savedStreamQuality()=preferences.getString("streamQuality",null)?.let{name->StreamQuality.entries.firstOrNull{it.name==name}}
?: if(preferences.getInt("playbackModeV2",1)==2)(if(preferences.getInt("quality",20000)>20000)StreamQuality.UltraHD else StreamQuality.FullHD)else StreamQuality.Original
@ -767,8 +703,8 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
/** The player's quality menu changes the preference for the connection in use. */
fun chooseActiveQuality(value: StreamQuality)=if(localConnection)chooseStreamQuality(value)else chooseRemoteQuality(value)
fun chooseAutoplaySeconds(value:Int){autoplaySeconds=value.coerceAtLeast(0);preferences.edit().putInt("autoplaySeconds",autoplaySeconds).apply()}
fun chooseAutoSkipIntro(seconds:Int){autoSkipIntroSeconds=seconds.coerceIn(0,60);preferences.edit().putInt("autoSkipIntroSeconds",autoSkipIntroSeconds).remove("autoSkipIntro").apply()}
fun chooseAutoSkipCredits(seconds:Int){autoSkipCreditsSeconds=seconds.coerceIn(0,60);preferences.edit().putInt("autoSkipCreditsSeconds",autoSkipCreditsSeconds).remove("autoSkipCredits").apply()}
fun chooseAutoSkipIntro(value:Boolean){autoSkipIntro=value;preferences.edit().putBoolean("autoSkipIntro",value).apply()}
fun chooseAutoSkipCredits(value:Boolean){autoSkipCredits=value;preferences.edit().putBoolean("autoSkipCredits",value).apply()}
fun chooseSubtitleSize(value:SubtitleSize){subtitleSize=value;preferences.edit().putString("subtitleSize",value.name).apply()}
fun chooseSubtitleStyle(value:SubtitleStyle){subtitleStyle=value;preferences.edit().putString("subtitleStyle",value.name).apply()}
fun chooseWatchedPercent(value:Int){watchedPercent=value.coerceIn(50,100);preferences.edit().putInt("watchedPercent",watchedPercent).apply()}
@ -776,6 +712,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
fun chooseColourWash(value:Boolean){colourWash=value;preferences.edit().putBoolean("colourWash",value).apply()}
fun chooseThemeMusic(value:Boolean){themeMusic=value;preferences.edit().putBoolean("themeMusic",value).apply()}
fun chooseThemeVolume(value:Int){themeVolume=value.coerceIn(10,100);preferences.edit().putInt("themeVolume",themeVolume).apply()}
fun chooseVolumeBoostDb(value:Int){volumeBoostDb=value.coerceIn(0,12);preferences.edit().putInt("volumeBoostDb",volumeBoostDb).apply()}
fun checkUpdate(manual: Boolean=true){viewModelScope.launch {
if(downloading||!manual&&System.currentTimeMillis()-preferences.getLong("lastUpdateCheck",0)<6*3600_000L)return@launch
updateStatus="Checking for updates…"

View file

@ -48,17 +48,16 @@ data class TimelineReport(val position: Long,val state: String,val duration: Lon
class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
private val app=vm.application
val api=vm.api
/** The server this title belongs to. Progress reports finish after close and must not follow a server change. */
private val server=api.session
val scope=CoroutineScope(SupervisorJob()+Dispatchers.Main.immediate)
val selector=DefaultTrackSelector(app)
private val sourceFactory=DefaultMediaSourceFactory(DefaultDataSource.Factory(app,OkHttpDataSource.Factory(api.http).setDefaultRequestProperties(api.headers().filterKeys{it!="Accept"})))
private val renderers=object:DefaultRenderersFactory(app) {
override fun buildAudioSink(context:android.content.Context,enableFloatOutput:Boolean,enableAudioOutputPlaybackParams:Boolean):androidx.media3.exoplayer.audio.AudioSink =
CompatibleAudioSink(androidx.media3.exoplayer.audio.DefaultAudioSink.Builder(context)
.setEnableFloatOutput(enableFloatOutput)
.setAudioProcessors(if(vm.volumeBoostDb>0)arrayOf(VolumeBoostProcessor(vm.volumeBoostDb){Log.i("KaleidoPlayback","BOOST processing PCM db=${vm.volumeBoostDb}")})else emptyArray())
.setEnableFloatOutput(enableFloatOutput&&vm.volumeBoostDb==0)
.setEnableAudioOutputPlaybackParameters(enableAudioOutputPlaybackParams)
.build())
.build(),decodedOnly=vm.volumeBoostDb>0)
}.setEnableDecoderFallback(true).forceDisableMediaCodecAsynchronousQueueing()
val player=ExoPlayer.Builder(app,renderers).setTrackSelector(selector).setMediaSourceFactory(sourceFactory).build().apply {
setAudioAttributes(AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).setContentType(C.AUDIO_CONTENT_TYPE_MOVIE).build(),true)
@ -105,27 +104,22 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
private var streamStart=0L
private var preparing=false
private var closed=false
/** False while the app is stopped (Home, another app): a pending preparation must not start playing. */
private var foreground=true
private val prepareMutex=Mutex()
private val streamSelectionMutex=Mutex()
private var fallbackPending=false
private var nativeSelectionApplied=false
private val reports=Channel<TimelineReport>(Channel.UNLIMITED)
// Trailers and other extras are not library progress.
private val synced=!validation&&item.type!="clip"
/** Set once the server ends this session (dashboard Stop); nothing may reconnect or fall back after it. */
private var serverStopped=false
private val reportJob=app.scope.launch {
val watched=WatchedProgress{api.watched(item,true,server);withContext(Dispatchers.Main){if(api.session==server)vm.refreshWatched(item)}}
val watched=WatchedProgress{api.watched(item,true);withContext(Dispatchers.Main){vm.refreshWatched(item)}}
// Trailers and other extras are not library progress.
val synced=!validation&&item.type!="clip"
for(r in reports) {
if(synced) {
runCatching {api.timeline(item,r.position,r.state,r.duration,streamSession,server)}.onFailure {Log.w("KaleidoPlayback","Timeline sync unavailable")}
.getOrNull()?.let{if(!r.final)withContext(Dispatchers.Main){stoppedByServer(it)}}
runCatching {api.timeline(item,r.position,r.state,r.duration,streamSession)}.onFailure {Log.w("KaleidoPlayback","Timeline sync unavailable")}
runCatching{watched.report(r.position,r.duration,vm.watchedPercent)}
.onFailure{Log.w("KaleidoPlayback","Watched status sync unavailable")}
}
if(r.final){if(mode>0)runCatching{api.stopTranscode(streamSession,server)};break}
if(r.final){if(mode>0)runCatching{api.stopTranscode(streamSession)};break}
}
}
init {
@ -133,7 +127,7 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
// Sparse diagnostics also survive in release logcat when an intermittent dropout occurs.
player.addAnalyticsListener(object:androidx.media3.exoplayer.analytics.AnalyticsListener {
override fun onAudioUnderrun(t:androidx.media3.exoplayer.analytics.AnalyticsListener.EventTime,size:Int,duration:Long,elapsed:Long) {
Log.w("KaleidoAudio","UNDERRUN item=${item.id} position=${t.eventPlaybackPositionMs} bufferMs=$duration sinceFeedMs=$elapsed mode=$mode")
Log.w("KaleidoAudio","UNDERRUN item=${item.id} position=${t.eventPlaybackPositionMs} bufferMs=$duration sinceFeedMs=$elapsed mode=$mode boost=${vm.volumeBoostDb}")
}
override fun onAudioSinkError(t:androidx.media3.exoplayer.analytics.AnalyticsListener.EventTime,e:Exception) {
Log.w("KaleidoAudio","SINK_ERROR item=${item.id} position=${t.eventPlaybackPositionMs} kind=${e.javaClass.simpleName}")
@ -172,39 +166,23 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
}
override fun onPlayerError(e: PlaybackException) {
Log.w("KaleidoPlayback","ERROR code=${e.errorCodeName} mode=$mode")
if(serverStopped)return
if(mode<2&&localValidationFile==null)fallback(e.errorCodeName)
else scope.launch{if(!checkServerStopped(position)){loading=false;error="Playback failed (${e.errorCodeName}). Check the server transcoder, network connection, and media availability."}}
if(mode<2&&localValidationFile==null)fallback(e.errorCodeName)else{loading=false;error="Playback failed (${e.errorCodeName}). Check the server transcoder, network connection, and media availability."}
}
})
scope.launch {prepare(mode,position)}
if(audit!=null)scope.launch{while(isActive){delay(1000);audit.sample(mode)}}
scope.launch {var ticks=0;while(isActive){delay(250);if(!preparing){position=currentPosition();bufferedPosition=(partOffset+player.bufferedPosition).coerceIn(0,duration);val d=player.duration;if(d>0&&parts.size==1)duration=if(mode>0)item.duration else d};if(++ticks%40==0&&!ended)report(if(preparing||loading)"buffering"else if(isPlaying)"playing"else "paused")}}
scope.launch {var ticks=0;while(isActive){delay(250);if(!preparing){position=currentPosition();bufferedPosition=(partOffset+player.bufferedPosition).coerceIn(0,duration);val d=player.duration;if(d>0&&parts.size==1)duration=if(mode>0)item.duration else d};if(++ticks%40==0&&!preparing&&!ended)report(if(isPlaying)"playing"else "paused")}}
}
/** Position on the title's timeline, across parts. */
private fun currentPosition() = (partOffset+player.currentPosition).coerceIn(0,duration.coerceAtLeast(0))
private fun report(state: String,final: Boolean=false){reports.trySend(TimelineReport(position,state,duration,final))}
private fun stoppedByServer(termination:PlaybackTermination) {
if(closed||serverStopped)return
serverStopped=true
Log.i("KaleidoPlayback","TERMINATED item=${item.id} code=${termination.code} mode=$mode")
seekJob?.cancel();player.stop();loading=false
vm.playbackStoppedByServer(item,termination.message)
}
/** A failed stream may be one the server stopped: ask Plex before reconnecting, so a stopped session stays stopped. */
private suspend fun checkServerStopped(offset:Long):Boolean {
if(serverStopped)return true
if(!synced)return false
val termination=withTimeoutOrNull(3000){runCatching{api.timeline(item,offset,"buffering",duration,streamSession,server)}.getOrNull()} ?: return false
stoppedByServer(termination);return true
}
private fun fallback(reason:String) {
if(closed||serverStopped||mode>=2||localValidationFile!=null||fallbackPending)return
if(closed||mode>=2||localValidationFile!=null||fallbackPending)return
fallbackPending=true
val session=streamSession;val offset=if(preparing)position else currentPosition();val resume=player.playWhenReady
scope.launch {
try {prepareMutex.withLock {
if(!closed&&session==streamSession&&!checkServerStopped(offset)) {
if(!closed&&session==streamSession) {
audit?.event("fallback",org.json.JSONObject().put("reason",reason).put("fromMode",mode).put("offset",offset))
prepareInternal(mode+1,offset,resume)
}
@ -213,14 +191,14 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
}
suspend fun prepare(newMode: Int,offset: Long,resume:Boolean=true) = prepareMutex.withLock{prepareInternal(newMode,offset,resume)}
private suspend fun prepareInternal(newMode: Int,offset: Long,resume:Boolean) {
if(closed||serverStopped)return
if(closed)return
preparing=true;loading=true;error=null;ended=false;nativeSelectionApplied=false
serverConverting=false;serverAudioConverting=false
// Empty track events from stop must not be mistaken for a missing video track.
player.stop()
selector.parameters=selector.buildUponParameters().clearOverrides().build()
try {
if(mode>0)runCatching{api.stopTranscode(streamSession,server)}
if(mode>0)runCatching{api.stopTranscode(streamSession)}
mode=newMode;streamSession=UUID.randomUUID().toString();streamStart=offset
partIndex=partFor(parts,offset)
val partOffsetMs=(offset-partOffset).coerceAtLeast(0)
@ -254,7 +232,7 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
}
// Plex HLS exposes the part's original timeline, including a seek-start offset:
// never add the requested offset again.
player.setMediaItem(builder.build(),partOffsetMs);player.prepare();player.playWhenReady=resume&&foreground;player.setPlaybackSpeed(playbackRate)
player.setMediaItem(builder.build(),partOffsetMs);player.prepare();player.playWhenReady=resume;player.setPlaybackSpeed(playbackRate)
Log.i("KaleidoPlayback","PREPARE item=${item.id} mode=$mode offset=$offset part=${partIndex+1}/${parts.size} media=${mediaIndex+1}/${item.media.size} local=$local")
}catch(e:CancellationException){throw e}catch(e:Exception){
audit?.event("prepareFailure",org.json.JSONObject().put("mode",newMode).put("kind",e.javaClass.simpleName).put("httpStatus",(e as? PlexException)?.status))
@ -275,10 +253,7 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
/** Moves the pending seek target; repeated presses accumulate into one seek after [settle] ms. */
fun scrubBy(delta:Long,settle:Long=650){scrubPosition=((scrubPosition ?: position)+delta).coerceIn(0,duration);seekJob?.cancel();seekJob=scope.launch{delay(settle);commitScrub()}}
fun commitScrub(){val target=scrubPosition ?: return;scrubPosition=null;seekTo(target)}
fun pause(){player.pause();if(!preparing)position=currentPosition();report("paused")}
/** The app left the foreground: pause, and keep any preparation still in flight paused. */
fun enterBackground(){foreground=false;pause()}
fun enterForeground(){foreground=true}
fun pause(){player.pause();position=currentPosition();report("paused")}
fun select(type:Int,groupIndex:Int,trackIndex:Int) {
val group=tracks.groups[groupIndex];selector.parameters=selector.buildUponParameters().setTrackTypeDisabled(type,false).setOverrideForType(TrackSelectionOverride(group.mediaTrackGroup,listOf(trackIndex))).build()
}
@ -330,7 +305,7 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
}
}
}
fun close(){if(closed)return;if(!preparing)position=currentPosition();closed=true;scope.cancel();audit?.finish(mode);report("stopped",true);reports.close();mediaSession.release();player.release()}
fun close(){if(closed)return;position=currentPosition();closed=true;scope.cancel();audit?.finish(mode);report("stopped",true);reports.close();mediaSession.release();player.release()}
}
/** The single playback quality preference: the original stream, then conversions from highest to lowest resolution. */
enum class StreamQuality(val label:String,val width:Int,val height:Int,val kbps:Int) {

View file

@ -19,9 +19,6 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.compose.currentStateAsState
import kotlinx.coroutines.delay
@Composable internal fun PlaybackOptions(vm:KaleidoViewModel,controller:PlaybackController,item:Title,menu:Int,open:(Int)->Unit,close:()->Unit) {
@ -52,11 +49,8 @@ internal fun speedLabel(speed:Float)=if(speed==1f)"Normal" else "${speed.toStrin
val countdown=if(vm.shuffling&&vm.autoplaySeconds==0)5 else vm.autoplaySeconds
var autoplay by remember{mutableStateOf(countdown>0)}
var seconds by remember{mutableIntStateOf(countdown)}
// The countdown runs only while Kaleido is on screen; leaving it restarts on return.
val lifecycle by LocalLifecycleOwner.current.lifecycle.currentStateAsState()
val onScreen=lifecycle.isAtLeast(Lifecycle.State.STARTED)
LaunchedEffect(autoplay,upcoming?.id,onScreen) {
if(autoplay&&onScreen&&upcoming!=null&&countdown>0){seconds=countdown;android.util.Log.i("KaleidoPlayback","AUTOPLAY countdown item=${item.id} next=${upcoming.id}");repeat(countdown){delay(1000);seconds--};android.util.Log.i("KaleidoPlayback","AUTOPLAY starting next=${upcoming.id}");next()}
LaunchedEffect(autoplay,upcoming?.id) {
if(autoplay&&upcoming!=null&&countdown>0){seconds=countdown;android.util.Log.i("KaleidoPlayback","AUTOPLAY countdown item=${item.id} next=${upcoming.id}");repeat(countdown){delay(1000);seconds--};android.util.Log.i("KaleidoPlayback","AUTOPLAY starting next=${upcoming.id}");next()}
}
val season=vm.episodeQueue.filter{it.parentId==item.parentId}
LazyColumn(Modifier.fillMaxSize().background(Color.Black.copy(alpha=.93f)),contentPadding=PaddingValues(horizontal=Cinema.gutter,vertical=29.dp),verticalArrangement=Arrangement.spacedBy(15.dp)) {

View file

@ -28,8 +28,6 @@ import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.focus.*
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Brush
@ -102,29 +100,17 @@ import kotlinx.coroutines.delay
if(marker.type=="credits"&&item.type=="episode"){controller.pause();android.util.Log.i("KaleidoPlayback","POSTPLAY item=${item.id} reason=skip-credits");postPlay=true}
else controller.seekTo(marker.end)
}
// Each marker counts down to an automatic skip once, so seeking back into it plays it.
// The countdown runs only while playing; any remote press cancels it (OK on the button skips now).
// Each marker is skipped automatically once, so seeking back into it plays it.
val autoSkipped=remember{mutableSetOf<Marker>()}
var autoSkip by remember{mutableStateOf<Marker?>(null)}
var autoSkipTotal by remember{mutableLongStateOf(0)}
var autoSkipRemaining by remember{mutableLongStateOf(0)}
fun cancelAutoSkip(){val m=autoSkip ?: return;autoSkipped+=m;autoSkip=null;android.util.Log.i("KaleidoPlayback","AUTOSKIP cancelled ${m.type} item=${item.id}")}
LaunchedEffect(marker,controller.loading,postPlay) {
val m=marker
if(m==null||controller.loading||postPlay||m in autoSkipped){if(m==null||postPlay)autoSkip=null;return@LaunchedEffect}
val seconds=when(m.type){"intro"->vm.autoSkipIntroSeconds;"credits"->vm.autoSkipCreditsSeconds;else->0}
if(seconds<=0)return@LaunchedEffect
if(autoSkip!=m){autoSkip=m;autoSkipTotal=seconds*1000L;autoSkipRemaining=autoSkipTotal;android.util.Log.i("KaleidoPlayback","AUTOSKIP countdown ${m.type} seconds=$seconds item=${item.id}")}
while(autoSkipRemaining>0){delay(50);if(autoSkip!=m)return@LaunchedEffect;if(controller.isPlaying)autoSkipRemaining-=50}
if(autoSkip!=m)return@LaunchedEffect
autoSkipped+=m;autoSkip=null;android.util.Log.i("KaleidoPlayback","AUTOSKIP ${m.type} item=${item.id}");skip(m)
LaunchedEffect(marker,controller.loading) {
val m=marker ?: return@LaunchedEffect
if(controller.loading||postPlay||m in autoSkipped)return@LaunchedEffect
if(m.type=="intro"&&vm.autoSkipIntro||m.type=="credits"&&vm.autoSkipCredits){autoSkipped+=m;android.util.Log.i("KaleidoPlayback","AUTOSKIP ${m.type} item=${item.id}");skip(m)}
}
DisposableEffect(controller) {
activity.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
val observer=LifecycleEventObserver{_,event->when(event){Lifecycle.Event.ON_STOP->controller.enterBackground();Lifecycle.Event.ON_START->controller.enterForeground();else->{}}}
val observer=LifecycleEventObserver{_,event->if(event==Lifecycle.Event.ON_STOP)controller.pause()}
owner.lifecycle.addObserver(observer)
// Created while already stopped (e.g. a next episode loading behind Home): start paused.
if(!owner.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED))controller.enterBackground()
onDispose{owner.lifecycle.removeObserver(observer);activity.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);controller.close()}
}
LaunchedEffect(controls,interaction,controller.isPlaying,trackMenu) {
@ -137,13 +123,6 @@ import kotlinx.coroutines.delay
BackHandler(onBack=::goBack)
val visible=controls&&!postPlay
Box(Modifier.fillMaxSize().background(Color.Black).focusRequester(rootFocus).onPreviewKeyEvent{event->
// A pending automatic skip yields to the remote. Back only cancels it; OK on a hidden
// player still takes the Skip button, which skips now.
val okHidden=!visible&&event.nativeKeyEvent.keyCode in listOf(android.view.KeyEvent.KEYCODE_DPAD_CENTER,android.view.KeyEvent.KEYCODE_ENTER)
if(autoSkip!=null&&event.type==KeyEventType.KeyDown&&!okHidden&&!postPlay){
cancelAutoSkip()
if(event.key==Key.Back)return@onPreviewKeyEvent true
}
if(event.key==Key.Back){if(event.type==KeyEventType.KeyDown)goBack();true}
else if(event.type!=KeyEventType.KeyDown||postPlay)false else {
interacted()
@ -154,7 +133,7 @@ import kotlinx.coroutines.delay
android.view.KeyEvent.KEYCODE_MEDIA_FAST_FORWARD->{controller.seekTo(controller.position+30000);controls=true;seekFocus=true;true}
android.view.KeyEvent.KEYCODE_MEDIA_REWIND->{controller.seekTo(controller.position-10000);controls=true;seekFocus=true;true}
// With the controls hidden, OK takes a visible Skip intro/credits; otherwise it reveals them.
android.view.KeyEvent.KEYCODE_DPAD_CENTER,android.view.KeyEvent.KEYCODE_ENTER->{if(!visible){marker?.let{autoSkip=null;autoSkipped+=it;skip(it)} ?: run{controls=true};true}else false}
android.view.KeyEvent.KEYCODE_DPAD_CENTER,android.view.KeyEvent.KEYCODE_ENTER->{if(!visible){marker?.let(::skip) ?: run{controls=true};true}else false}
android.view.KeyEvent.KEYCODE_DPAD_LEFT,android.view.KeyEvent.KEYCODE_DPAD_RIGHT->{
val delta=if(event.nativeKeyEvent.keyCode==android.view.KeyEvent.KEYCODE_DPAD_LEFT)-10000L else 10000L
when {
@ -196,42 +175,29 @@ import kotlinx.coroutines.delay
Spacer(Modifier.width(18.dp))
Text(controller.qualityLabel,color=Color.White.copy(alpha=.6f),fontSize=10.sp,lineHeight=14.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.widthIn(max=360.dp))
}
// Elapsed and remaining time sit at the timeline's ends and follow a pending scrub.
val shownPosition=controller.scrubPosition ?: controller.position
Row(Modifier.fillMaxWidth(),verticalAlignment=Alignment.CenterVertically) {
Text(clockTime(shownPosition),color=Color.White.copy(alpha=.82f),fontSize=10.sp,lineHeight=14.sp,maxLines=1,modifier=Modifier.width(58.dp))
SeekTimeline(controller,item,Modifier.weight(1f).focusRequester(timelineFocus).focusProperties{down=playFocus},::interacted)
Text("−"+clockTime(controller.duration-shownPosition),color=Color.White.copy(alpha=.62f),fontSize=10.sp,lineHeight=14.sp,maxLines=1,textAlign=TextAlign.End,modifier=Modifier.width(58.dp))
SeekTimeline(controller,item,Modifier.fillMaxWidth().focusRequester(timelineFocus).focusProperties{down=playFocus},::interacted)
Box(Modifier.fillMaxWidth().height(40.dp)) {
Row(Modifier.align(Alignment.CenterStart),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(7.dp)) {
IconControl(Icons.AutoMirrored.Outlined.ArrowBack,"Exit playback",size=30.dp,iconSize=18.dp,onFocused=::interacted){vm.stopPlayback()}
Text(clockTime(controller.position),color=Color.White.copy(alpha=.78f),fontSize=10.sp,lineHeight=14.sp)
}
Box(Modifier.fillMaxWidth().padding(top=6.dp).height(48.dp)) {
Row(Modifier.align(Alignment.CenterStart),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(10.dp)) {
IconControl(Icons.AutoMirrored.Outlined.ArrowBack,"Exit playback",size=32.dp,iconSize=19.dp,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){vm.stopPlayback()}
Text("Ends "+endsAt(controller),color=Color.White.copy(alpha=.58f),fontSize=10.sp,lineHeight=14.sp,maxLines=1)
}
// Transport: episodes step between neighbours around the seek and play controls.
// An absent previous episode keeps its space, so Play stays centred.
Row(Modifier.align(Alignment.Center),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(14.dp)) {
val up=Modifier.focusProperties{up=timelineFocus}
if(item.type=="episode") {
if(vm.mayHavePrecedingEpisode(item))IconControl(Icons.Outlined.SkipPrevious,"Previous episode",size=34.dp,iconSize=22.dp,modifier=up,onFocused=::interacted){vm.previousEpisode(item);interacted()}
else Spacer(Modifier.size(34.dp))
}
IconControl(Icons.Outlined.Replay10,"Back 10 seconds",size=34.dp,iconSize=22.dp,modifier=up,onFocused=::interacted){controller.seekTo(controller.position-10000);interacted()}
IconControl(if(controller.isPlaying)Icons.Filled.Pause else Icons.Filled.PlayArrow,if(controller.isPlaying)"Pause"else "Play",size=46.dp,iconSize=30.dp,requester=playFocus,selected=true,initialFocus=controls&&!seekFocus&&!timelineReveal,modifier=up,onFocused=::interacted){controller.toggle();controls=true;interacted()}
IconControl(Icons.Outlined.Forward30,"Forward 30 seconds",size=34.dp,iconSize=22.dp,modifier=up,onFocused=::interacted){controller.seekTo(controller.position+30000);interacted()}
if(item.type=="episode")IconControl(Icons.Outlined.SkipNext,"Next episode",size=34.dp,iconSize=22.dp,modifier=up,onFocused=::interacted){vm.nextEpisode(item);interacted()}
Row(Modifier.align(Alignment.Center),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(16.dp)) {
IconControl(Icons.Outlined.Replay10,"Back 10 seconds",size=32.dp,iconSize=22.dp,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){controller.seekTo(controller.position-10000);interacted()}
IconControl(if(controller.isPlaying)Icons.Filled.Pause else Icons.Filled.PlayArrow,if(controller.isPlaying)"Pause"else "Play",size=38.dp,iconSize=28.dp,requester=playFocus,initialFocus=controls&&!seekFocus&&!timelineReveal,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){controller.toggle();controls=true;interacted()}
IconControl(Icons.Outlined.Forward30,"Forward 30 seconds",size=32.dp,iconSize=22.dp,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){controller.seekTo(controller.position+30000);interacted()}
}
Row(Modifier.align(Alignment.CenterEnd),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(10.dp)) {
IconControl(Icons.AutoMirrored.Outlined.VolumeUp,"Audio tracks",size=32.dp,iconSize=20.dp,requester=audioFocus,selected=trackMenu==1,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=1;interacted()}
IconControl(Icons.Outlined.Subtitles,"Subtitles",size=32.dp,iconSize=20.dp,requester=subtitleFocus,selected=trackMenu==2,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=2;interacted()}
IconControl(Icons.Outlined.Settings,"Playback options",size=32.dp,iconSize=20.dp,requester=optionsFocus,selected=trackMenu>=3,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=3;interacted()}
Text("−"+clockTime(controller.duration-controller.position)+" · Ends "+endsAt(controller),color=Color.White.copy(alpha=.58f),fontSize=10.sp,lineHeight=14.sp,modifier=Modifier.padding(end=8.dp))
if(item.type=="episode")IconControl(Icons.Outlined.SkipNext,"Next episode",size=30.dp,iconSize=21.dp,onFocused=::interacted){vm.nextEpisode(item)}
IconControl(Icons.AutoMirrored.Outlined.VolumeUp,"Audio tracks",size=30.dp,iconSize=21.dp,requester=audioFocus,selected=trackMenu==1,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=1;interacted()}
IconControl(Icons.Outlined.Subtitles,"Subtitles",size=30.dp,iconSize=21.dp,requester=subtitleFocus,selected=trackMenu==2,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=2;interacted()}
IconControl(Icons.Outlined.Settings,"Playback options",size=30.dp,iconSize=21.dp,requester=optionsFocus,selected=trackMenu>=3,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=3;interacted()}
}
}
}
}
marker?.let{marker->if(!postPlay)Box(Modifier.align(Alignment.BottomEnd).padding(end=Cinema.gutter,bottom=if(visible)146.dp else 45.dp)) {
val counting=autoSkip==marker&&autoSkipTotal>0
SkipMarkerButton(marker.type=="intro",if(counting)1f-(autoSkipRemaining.toFloat()/autoSkipTotal).coerceIn(0f,1f)else null){autoSkip=null;autoSkipped+=marker;skip(marker);interacted()}
marker?.let{marker->if(!postPlay)Box(Modifier.align(Alignment.BottomEnd).padding(end=Cinema.gutter,bottom=if(visible)130.dp else 45.dp)) {
ActionButton(if(marker.type=="intro")"Skip intro"else "Skip credits",Icons.Outlined.ChevronRight,modifier=Modifier.background(Color.Black.copy(alpha=.9f),RoundedCornerShape(5.dp)).border(1.dp,Color.White.copy(alpha=.75f),RoundedCornerShape(5.dp))){skip(marker);interacted()}
}}
if(postPlay)PostPlayScreen(vm,item,{postPlay=false;controls=true},{vm.nextEpisode(item)})
controller.error?.let{ErrorDialog(it,{vm.stopPlayback()},{controller.retry()})}
@ -252,27 +218,6 @@ import kotlinx.coroutines.delay
}
}
/**
* Skip intro/credits. While an automatic skip is pending ([progress] non-null) it reads
* "Skipping intro" and a lighter fill sweeps across it until the skip happens, without numbers.
*/
@Composable private fun SkipMarkerButton(intro:Boolean,progress:Float?,onClick:()->Unit) {
var focused by remember{mutableStateOf(false)}
val shape=RoundedCornerShape(6.dp)
val label=if(progress!=null)(if(intro)"Skipping intro"else "Skipping credits")else if(intro)"Skip intro"else "Skip credits"
val foreground=if(focused)Ink else Accent
Row(Modifier.height(36.dp).navigationSound().onFocusChanged{focused=it.isFocused}.clip(shape)
.drawBehind{
drawRect(if(focused)Accent else Color(0xE6181818))
if(progress!=null&&!focused)drawRect(Color.White.copy(alpha=.2f),size=androidx.compose.ui.geometry.Size(size.width*progress,size.height))
}
.border(1.dp,Color.White.copy(alpha=if(focused)0f else .55f),shape).semantics{contentDescription=label}
.clickable(onClick=onClick).padding(horizontal=16.dp),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(10.dp)) {
Text(label,color=foreground,fontSize=12.sp,lineHeight=16.sp,fontWeight=FontWeight.SemiBold)
Icon(Icons.Filled.SkipNext,null,tint=foreground,modifier=Modifier.size(17.dp))
}
}
/** The same track selector is reachable from the speaker and from Playback options. */
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
@Composable internal fun AudioTrackPanel(controller:PlaybackController,dismiss:()->Unit,close:()->Unit) {

View file

@ -1,13 +1,10 @@
package tv.kaleido.app
import kotlinx.coroutines.CoroutineStart
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.awaitCancellation
import kotlinx.coroutines.withContext
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch
import okhttp3.FormBody
import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.OkHttpClient
@ -18,10 +15,6 @@ import java.io.IOException
import java.util.concurrent.TimeUnit
class PlexException(message: String, val status: Int = 0): IOException(message)
/** Plex's timeline answer after the server ends a playback session. */
data class PlaybackTermination(val code: Int, val reason: String) {
val message get() = listOf("The server stopped this stream.", reason.trim()).filter { it.isNotBlank() }.joinToString("\n\n")
}
class PlexApi(val clientId: String) {
val http = OkHttpClient.Builder().connectTimeout(10,TimeUnit.SECONDS).readTimeout(30,TimeUnit.SECONDS).addNetworkInterceptor { chain ->
val original=chain.call().request().url;val current=chain.request().url
@ -34,24 +27,16 @@ class PlexApi(val clientId: String) {
put("X-Plex-Client-Identifier",clientId);put("X-Plex-Platform","Android");put("X-Plex-Device","Android TV");put("X-Plex-Device-Name","Kaleido TV")
if(!token.isNullOrBlank()) put("X-Plex-Token",token)
}
suspend fun request(url: String, token: String? = session?.serverToken, method: String = "GET", form: Map<String,String> = emptyMap()): String = coroutineScope {
suspend fun request(url: String, token: String? = session?.serverToken, method: String = "GET", form: Map<String,String> = emptyMap()): String = withContext(Dispatchers.IO) {
val req=Request.Builder().url(url).apply { headers(token).forEach { (k,v) -> header(k,v) }; if(method!="GET") method(method,FormBody.Builder().apply { form.forEach { (k,v)->add(k,v) } }.build()) }.build()
val call=http.newCall(req)
// execute() blocks until the server answers; a cancelled caller (a timeout, a replaced load) aborts the call.
val abort=launch(start=CoroutineStart.UNDISPATCHED){try{awaitCancellation()}finally{call.cancel()}}
try {
withContext(Dispatchers.IO) {
call.execute().use { r -> if(!r.isSuccessful) throw PlexException(when(r.code){401,403->"Plex rejected this session. Sign in again or check server access.";404->"This item is no longer available.";else->"Plex could not complete the request (${r.code})."},r.code); r.body?.string() ?: "{}" }
http.newCall(req).execute().use { r -> if(!r.isSuccessful) throw PlexException(when(r.code){401,403->"Plex rejected this session. Sign in again or check server access.";404->"This item is no longer available.";else->"Plex could not complete the request (${r.code})."},r.code); r.body?.string() ?: "{}" }
}
} finally { abort.cancel() }
}
/** [server] pins a request to one server; by default it follows the current session. */
fun url(path: String, params: Map<String,String> = emptyMap(), server: Session? = session): String {
val s=server ?: throw PlexException("Choose a Plex server first.")
fun url(path: String, params: Map<String,String> = emptyMap()): String {
val s=session ?: throw PlexException("Choose a Plex server first.")
require(!path.startsWith("http")) { "Expected a server-relative Plex path" }
return (s.server.trimEnd('/')+"/"+path.trimStart('/')).toHttpUrl().newBuilder().apply { params.forEach { (k,v)->addQueryParameter(k,v) } }.build().toString()
}
suspend fun container(path: String, params: Map<String,String> = emptyMap(), server: Session? = session): JSONObject = withContext(Dispatchers.Default){JSONObject(request(url(path,params,server),server?.serverToken).ifBlank{"{}"}).optJSONObject("MediaContainer") ?: JSONObject()}
suspend fun container(path: String, params: Map<String,String> = emptyMap()): JSONObject = withContext(Dispatchers.Default){JSONObject(request(url(path,params)).ifBlank{"{}"}).optJSONObject("MediaContainer") ?: JSONObject()}
suspend fun validate(s: Session): Session {
val j=JSONObject(request(s.server.trimEnd('/')+"/",s.serverToken)).getJSONObject("MediaContainer")
if(j.optString("machineIdentifier").isBlank()) throw PlexException("This address is not a Plex Media Server.")
@ -70,12 +55,9 @@ class PlexApi(val clientId: String) {
// Try TLS connections first; local HTTP remains available for servers without TLS.
var last: Throwable? = null
for (group in server.connections.partition { it.startsWith("https://") }.toList()) {
// Probe together, but accept in preference order (local first, relay last): the best
// answering address wins without waiting for slower, less preferred probes to time out.
val attempts=group.map { address -> async { runCatching { validate(Session(account,server.token,address,server.name,server.id)) } } }
try {
for (attempt in attempts) attempt.await().onSuccess { return@coroutineScope it }.onFailure { last=it }
} finally { attempts.forEach { it.cancel() } }
val results=group.map { address -> async { runCatching { validate(Session(account,server.token,address,server.name,server.id)) } } }.awaitAll()
results.firstOrNull { it.isSuccess }?.getOrNull()?.let { return@coroutineScope it }
last=results.lastOrNull()?.exceptionOrNull() ?: last
}
throw PlexException("Cannot reach ${server.name}. Check that the server is online and reachable from this TV.")
}
@ -87,12 +69,6 @@ class PlexApi(val clientId: String) {
suspend fun hubs(section: String? = null): List<Hub> = withContext(Dispatchers.Default){container(if(section==null) "/hubs" else "/hubs/sections/$section", mapOf("count" to "18","includeExternalMetadata" to "1")).optJSONArray("Hub").objects().map { Hub(it.optString("hubIdentifier",it.optString("key",it.optString("title"))),it.optString("title"),it.optJSONArray("Metadata").objects().map(Title::parse),it.optString("key"),it.opt("more").let{v->v==true||v==1||v=="1"||v=="true"}) }.filter { it.items.isNotEmpty() && it.items.first().type in listOf("movie","show","episode","season","collection") }}
/** A hub's complete list, for "View all". Plex keys may already carry query parameters. */
suspend fun hubItems(key:String):List<Title> = withContext(Dispatchers.Default){container(key,mapOf("X-Plex-Container-Start" to "0","X-Plex-Container-Size" to "500","includeExternalMetadata" to "1")).optJSONArray("Metadata").objects().map(Title::parse)}
/**
* Continue Watching as a fingerprint. Watching on another device changes it without changing the
* library revision above: new, finished or reordered titles at once, progress in 5% steps (so
* a title playing elsewhere doesn't rebuild Home on every poll).
*/
suspend fun continueWatchingRevision():String = continueWatchingFingerprint(container("/library/onDeck",mapOf("X-Plex-Container-Size" to "30")).optJSONArray("Metadata").objects())
suspend fun onDeck(): List<Title> = container("/library/onDeck",mapOf("X-Plex-Container-Size" to "30")).optJSONArray("Metadata").objects().map(Title::parse)
suspend fun recentSeasons(section:String):List<Title> = withContext(Dispatchers.Default){
// Fetch beyond the display limit so one large series import doesn't fill the row.
@ -151,11 +127,9 @@ class PlexApi(val clientId: String) {
}
/** Removes an in-progress title from Continue Watching without changing its watched state. */
suspend fun removeFromContinueWatching(item:Title){request(url("/actions/removeFromContinueWatching",mapOf("ratingKey" to item.id)),method="PUT")}
suspend fun watched(item: Title, watched: Boolean, server: Session? = session) { container(if(watched) "/:/scrobble" else "/:/unscrobble",mapOf("key" to item.id,"identifier" to "com.plexapp.plugins.library"),server) }
/** Reports progress; a stream the server stopped (Plex dashboard "Stop", or shutdown) comes back as a termination. */
suspend fun timeline(item: Title, position: Long, state: String, duration: Long, sessionId: String, server: Session? = session): PlaybackTermination? {
val c=container("/:/timeline",mapOf("ratingKey" to item.id,"key" to item.key,"state" to state,"time" to position.coerceAtLeast(0).toString(),"duration" to duration.coerceAtLeast(0).toString(),"identifier" to "com.plexapp.plugins.library","session" to sessionId),server)
return if(c.has("terminationCode"))PlaybackTermination(c.optInt("terminationCode",-1),c.optString("terminationText"))else null
suspend fun watched(item: Title, watched: Boolean) { container(if(watched) "/:/scrobble" else "/:/unscrobble",mapOf("key" to item.id,"identifier" to "com.plexapp.plugins.library")) }
suspend fun timeline(item: Title, position: Long, state: String, duration: Long, sessionId: String) {
container("/:/timeline",mapOf("ratingKey" to item.id,"key" to item.key,"state" to state,"time" to position.coerceAtLeast(0).toString(),"duration" to duration.coerceAtLeast(0).toString(),"identifier" to "com.plexapp.plugins.library","session" to sessionId))
}
suspend fun selectStreams(part: Part, audio: String? = null, subtitle: String? = null) {
request(url("/library/parts/${part.id}",buildMap { put("allParts","1");audio?.let {put("audioStreamID",it)};subtitle?.let {put("subtitleStreamID",it)} }),method="PUT")
@ -173,7 +147,7 @@ class PlexApi(val clientId: String) {
val hevcAvailable=android.media.MediaCodecList(android.media.MediaCodecList.REGULAR_CODECS).codecInfos.any{!it.isEncoder&&it.supportedTypes.any{type->type.equals("video/hevc",true)}}
put("X-Plex-Client-Profile-Extra",if(mode==1&&hevcAvailable)"append-transcode-target-codec(type=videoProfile&context=streaming&protocol=hls&videoCodec=hevc)"else "")
}
suspend fun stopTranscode(sessionId: String, server: Session? = session) { container("/video/:/transcode/universal/stop",mapOf("session" to sessionId),server) }
suspend fun stopTranscode(sessionId: String) { container("/video/:/transcode/universal/stop",mapOf("session" to sessionId)) }
}
/** Index of the part containing [time] on the title's combined timeline. */
@ -183,8 +157,3 @@ internal fun partFor(parts:List<Part>,time:Long):Int {
return 0
}
internal fun partStart(parts:List<Part>,index:Int):Long = parts.take(index.coerceAtLeast(0)).sumOf{it.duration.coerceAtLeast(0)}
internal fun continueWatchingFingerprint(items:List<JSONObject>):String = items.joinToString("|"){j->
val duration=j.optLong("duration");val offset=j.optLong("viewOffset")
val step=if(duration>0)(offset*20/duration).toString()else (offset/120_000).toString()
"${j.optString("ratingKey")}:${j.optString("viewCount")}:$step"
}

View file

@ -1,19 +1,14 @@
package tv.kaleido.app
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
/**
* Preserve newest-first order. A multi-season addition opens the real show's season list; if that
* show can't be loaded, its newest season stands in rather than discarding the whole row.
*/
/** Preserve newest-first order. A multi-season addition opens the real show's season list. */
internal suspend fun groupRecentSeasons(seasons:List<Title>,loadShow:suspend (String)->Title):List<Title> = coroutineScope {
seasons.distinctBy{it.id}.groupBy{it.parentId.ifBlank{"season:${it.id}"}}.values.take(18).map { group->async {
val season=group.first()
val single=season.copy(title=listOf(season.parentTitle,season.title).filter{it.isNotBlank()}.joinToString(" · "))
if(group.size>1&&season.parentId.isNotBlank())try{loadShow(season.parentId)}catch(e:CancellationException){throw e}catch(_:Exception){single}
else single
if(group.size>1&&season.parentId.isNotBlank())loadShow(season.parentId)
else season.copy(title=listOf(season.parentTitle,season.title).filter{it.isNotBlank()}.joinToString(" · "))
}}.awaitAll()
}

View file

@ -118,9 +118,8 @@ import java.io.File
splashExit.animateTo(1f,tween(StartupExitMillis,easing=LinearEasing));startup=false
}
}
// The server picker covers every page, so Back closes it before navigating underneath.
BackHandler(enabled=vm.servers.isNotEmpty()||vm.linkingAccount||vm.playing!=null||vm.pages.size>1||vm.page.kind!="home"){
if(vm.servers.isNotEmpty())vm.dismissServerPicker()else if(vm.linkingAccount)vm.cancelAccountLink()else vm.back()
BackHandler(enabled=vm.linkingAccount||vm.playing!=null||vm.pages.size>1||vm.page.kind!="home"){
if(vm.linkingAccount)vm.cancelAccountLink()else vm.back()
}
NavigationSounds(vm.navigationSounds&&!startup) {
Box(Modifier.fillMaxSize().background(Ink).onPreviewKeyEvent{vm.lastInteraction=android.os.SystemClock.uptimeMillis();startup}) {
@ -198,7 +197,7 @@ val sortLabels=listOf("titleSort:asc" to "Title: A–Z","titleSort:desc" to "Tit
Spacer(Modifier.height(14.dp));OutlinedTextField(address,{address=it},label={Text("Server URL")},singleLine=true,modifier=Modifier.fillMaxWidth());Spacer(Modifier.height(10.dp));OutlinedTextField(token,{token=it},label={Text("Access token")},singleLine=true,visualTransformation=PasswordVisualTransformation(),modifier=Modifier.fillMaxWidth());Spacer(Modifier.height(18.dp));TvButton("Connect",primary=true,onClick={vm.manualConnect(address,token)});Spacer(Modifier.height(10.dp));TvButton("Use Plex account",onClick=back)
}
@Composable fun ServerPicker(vm: KaleidoViewModel) {
Column(Modifier.fillMaxSize().padding(60.dp),verticalArrangement=Arrangement.spacedBy(18.dp)){Brand();Spacer(Modifier.height(20.dp));Text("Choose your Plex server",color=Color.White,fontSize=32.sp,fontWeight=FontWeight.Bold);vm.servers.forEachIndexed{i,s->TvButton(s.name,initialFocus=i==0,onClick={vm.chooseServer(s)})};if(vm.session!=null){Spacer(Modifier.height(6.dp));TvButton("Cancel",onClick={vm.dismissServerPicker()})}}
Column(Modifier.fillMaxSize().padding(60.dp),verticalArrangement=Arrangement.spacedBy(18.dp)){Brand();Spacer(Modifier.height(20.dp));Text("Choose your Plex server",color=Color.White,fontSize=32.sp,fontWeight=FontWeight.Bold);vm.servers.forEachIndexed{i,s->TvButton(s.name,initialFocus=i==0,onClick={vm.chooseServer(s)})}}
}
@Composable fun EmptyState(title: String,message: String){Column(Modifier.padding(52.dp),verticalArrangement=Arrangement.spacedBy(12.dp)){Text(title,color=Color.White,fontSize=26.sp,fontWeight=FontWeight.Bold);Text(message,color=Muted,fontSize=14.sp)}}
@Composable fun ErrorDialog(message: String,dismiss: ()->Unit,retry: ()->Unit) {Dialog(onDismissRequest=dismiss){Column(Modifier.width(390.dp).clip(RoundedCornerShape(12.dp)).background(Panel).padding(23.dp)){Text("Something needs attention",color=Accent,fontSize=20.sp,lineHeight=26.sp,fontWeight=FontWeight.SemiBold);Text(message,color=Muted,fontSize=12.sp,lineHeight=19.sp,modifier=Modifier.padding(vertical=17.dp));Row(horizontalArrangement=Arrangement.spacedBy(9.dp)){TvButton("Try again",primary=true,initialFocus=true,onClick=retry);TvButton("Dismiss",onClick=dismiss)}}}}

View file

@ -44,11 +44,10 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
var watchedDialog by remember { mutableStateOf(false) }
var remoteDialog by remember { mutableStateOf(false) }
var autoplayDialog by remember { mutableStateOf(false) }
var introDialog by remember { mutableStateOf(false) }
var creditsDialog by remember { mutableStateOf(false) }
var subtitleSizeDialog by remember { mutableStateOf(false) }
var subtitleStyleDialog by remember { mutableStateOf(false) }
var themeVolumeDialog by remember { mutableStateOf(false) }
var volumeBoostDialog by remember { mutableStateOf(false) }
val remoteFocus = remember { FocusRequester() }
val autoplayFocus = remember { FocusRequester() }
val introFocus = remember { FocusRequester() }
@ -57,6 +56,7 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
val themeMusicFocus = remember { FocusRequester() }
val colourWashFocus = remember { FocusRequester() }
val themeVolumeFocus = remember { FocusRequester() }
val volumeBoostFocus = remember { FocusRequester() }
val categoryFocus = remember { List(categories.size) { FocusRequester() } }
val entryFocus = remember { List(categories.size) { FocusRequester() } }
@ -74,8 +74,8 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
delay(140)
runCatching { entryFocus[selectedCategory].requestFocus() }
}
val anyDialogOpen = confirmSignOut || qualityDialog || watchedDialog || remoteDialog || autoplayDialog || introDialog || creditsDialog ||
subtitleSizeDialog || subtitleStyleDialog || themeVolumeDialog
val anyDialogOpen = confirmSignOut || qualityDialog || watchedDialog || remoteDialog || autoplayDialog ||
subtitleSizeDialog || subtitleStyleDialog || themeVolumeDialog || volumeBoostDialog
LaunchedEffect(anyDialogOpen, dialogRestoreFocus) {
if (!anyDialogOpen) {
dialogRestoreFocus?.let { requester ->
@ -244,19 +244,27 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
)
SettingsValueRow(
title = "Skip intros",
description = "Uses intro markers from your Plex server. Any remote press cancels an automatic skip.",
value = autoSkipLabel(vm.autoSkipIntroSeconds),
description = "Uses intro markers from your Plex server.",
value = if (vm.autoSkipIntro) "Automatically" else "Show button",
requester = introFocus,
leftTarget = categoryFocus[1],
onClick = { dialogRestoreFocus = introFocus; introDialog = true }
onClick = { vm.chooseAutoSkipIntro(!vm.autoSkipIntro) }
)
SettingsValueRow(
title = "Skip credits",
description = "Episodes go straight to Up Next; movies skip past the credits. Any remote press cancels an automatic skip.",
value = autoSkipLabel(vm.autoSkipCreditsSeconds),
description = "Episodes go straight to Up Next; movies skip past the credits.",
value = if (vm.autoSkipCredits) "Automatically" else "Show button",
requester = creditsFocus,
leftTarget = categoryFocus[1],
onClick = { dialogRestoreFocus = creditsFocus; creditsDialog = true }
onClick = { vm.chooseAutoSkipCredits(!vm.autoSkipCredits) }
)
SettingsValueRow(
title = "Volume boost",
description = "Raise quiet titles. Higher boosts can distort loud peaks. Uses decoded audio instead of passthrough.",
value = volumeBoostLabel(vm.volumeBoostDb),
requester = volumeBoostFocus,
leftTarget = categoryFocus[1],
onClick = { dialogRestoreFocus = volumeBoostFocus; volumeBoostDialog = true }
)
Text(
"Completed titles keep their Plex watched status.",
@ -407,18 +415,6 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
remoteDialog = false
}
}
if (introDialog) {
ChoiceDialog("Skip intros", AutoSkipChoices.map(::autoSkipLabel), AutoSkipChoices.indexOf(vm.autoSkipIntroSeconds).coerceAtLeast(0), { introDialog = false }) {
vm.chooseAutoSkipIntro(AutoSkipChoices[it])
introDialog = false
}
}
if (creditsDialog) {
ChoiceDialog("Skip credits", AutoSkipChoices.map(::autoSkipLabel), AutoSkipChoices.indexOf(vm.autoSkipCreditsSeconds).coerceAtLeast(0), { creditsDialog = false }) {
vm.chooseAutoSkipCredits(AutoSkipChoices[it])
creditsDialog = false
}
}
if (autoplayDialog) {
val choices = listOf(0, 5, 10, 15, 30)
ChoiceDialog("Autoplay next episode", choices.map(::autoplayLabel), choices.indexOf(vm.autoplaySeconds), { autoplayDialog = false }) {
@ -451,12 +447,17 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
themeVolumeDialog = false
}
}
if (volumeBoostDialog) {
val choices = listOf(0, 3, 6, 9, 12)
ChoiceDialog("Volume boost", choices.map(::volumeBoostLabel), choices.indexOf(vm.volumeBoostDb).coerceAtLeast(0), { volumeBoostDialog = false }) {
vm.chooseVolumeBoostDb(choices[it])
volumeBoostDialog = false
}
}
}
private fun autoplayLabel(seconds: Int) = if (seconds <= 0) "Off" else "After $seconds seconds"
/** 0 only shows the Skip button; otherwise the button counts down this long before skipping. */
private val AutoSkipChoices = listOf(0, 3, 5, 10, 15)
private fun autoSkipLabel(seconds: Int) = if (seconds <= 0) "Show button" else "Automatically after $seconds s"
private fun volumeBoostLabel(db: Int) = if (db == 0) "Off (+0 dB)" else "+$db dB"
/** A sample line in the chosen subtitle look, rendered by the player's own subtitle view. */
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)

View file

@ -22,19 +22,6 @@ internal class ShuffleEpisodes<T>(
return nextCycle?.firstOrNull() ?: makeNextCycle(order[currentIndex]).also { nextCycle = it }.firstOrNull()
}
/** The item played before [currentId] in this bag, or null at the bag's start. */
fun preceding(currentId: String): T? {
if (order.getOrNull(currentIndex)?.let(id) != currentId) return null
return order.getOrNull(currentIndex - 1)
}
/** Steps back only when [previousId] is the item returned by [preceding]. */
fun retreat(currentId: String, previousId: String): Boolean {
if (preceding(currentId)?.let(id) != previousId) return false
currentIndex--
return true
}
/** Advances only when [nextId] is the next item returned by [following]. */
fun advance(currentId: String, nextId: String): Boolean {
if (following(currentId)?.let(id) != nextId) return false

View file

@ -0,0 +1,29 @@
package tv.kaleido.app
import androidx.media3.common.C
import androidx.media3.common.audio.AudioProcessor.AudioFormat
import androidx.media3.common.audio.AudioProcessor.UnhandledAudioFormatException
import androidx.media3.common.audio.BaseAudioProcessor
import java.nio.ByteBuffer
import kotlin.math.pow
import kotlin.math.roundToInt
/** Applied after decoding, for every channel and delivery mode; passthrough is disabled when on. */
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
internal class VolumeBoostProcessor(db:Int,private val onProcessing:(()->Unit)?=null):BaseAudioProcessor() {
private val gain=boostGain(db)
private var reported=false
override fun onConfigure(inputAudioFormat:AudioFormat):AudioFormat {
if(inputAudioFormat.encoding!=C.ENCODING_PCM_16BIT)throw UnhandledAudioFormatException(inputAudioFormat)
return if(gain>1.0)inputAudioFormat else AudioFormat.NOT_SET
}
override fun queueInput(inputBuffer:ByteBuffer) {
if(!reported&&inputBuffer.hasRemaining()) { reported=true;onProcessing?.invoke() }
val output=replaceOutputBuffer(inputBuffer.remaining())
while(inputBuffer.remaining()>=2)output.putShort(boostSample(inputBuffer.short,gain))
output.flip()
}
}
internal fun boostGain(db:Int):Double=10.0.pow(db.coerceIn(0,12)/20.0)
internal fun boostSample(sample:Short,gain:Double):Short=(sample*gain).roundToInt().coerceIn(Short.MIN_VALUE.toInt(),Short.MAX_VALUE.toInt()).toShort()

View file

@ -2,8 +2,31 @@ package tv.kaleido.app
import org.junit.Assert.*
import org.junit.Test
import java.nio.ByteBuffer
import java.nio.ByteOrder
import androidx.media3.common.C
import androidx.media3.common.audio.AudioProcessor.AudioFormat
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
class AudioPreferencesTest {
@Test fun boostProcessesEveryChannelAndSaturatesWithoutWrapping() {
val processor=VolumeBoostProcessor(6)
processor.configure(AudioFormat(48000,2,C.ENCODING_PCM_16BIT))
val input=ByteBuffer.allocateDirect(12).order(ByteOrder.nativeOrder())
listOf(1000,-1000,30000,-30000,0,Short.MIN_VALUE.toInt()).forEach { input.putShort(it.toShort()) }
input.flip();processor.queueInput(input)
val output=processor.output.order(ByteOrder.nativeOrder())
val samples=generateSequence { if(output.remaining()>=2)output.short.toInt()else null }.toList()
assertEquals(listOf(1995,-1995,32767,-32768,0,-32768),samples)
assertFalse(input.hasRemaining())
}
@Test fun boostOffPreservesSamplesAndBoundsGain() {
assertEquals(1.0,boostGain(0),0.0)
assertEquals(1.0,boostGain(-30),0.0)
assertEquals(boostGain(12),boostGain(99),0.0)
assertEquals(1234.toShort(),boostSample(1234,boostGain(0)))
assertEquals((-1234).toShort(),boostSample(-1234,boostGain(0)))
}
@Test fun themesUseOnlyServerRelativePaths() {
assertEquals("/library/metadata/6115/theme/1",safeThemePath("/library/metadata/6115/theme/1"))
assertEquals("",safeThemePath("https://elsewhere.example/theme.mp3"))

View file

@ -1,13 +0,0 @@
package tv.kaleido.app
import org.junit.Assert.assertEquals
import org.junit.Test
class PlaybackTerminationTest {
@Test fun serverReasonFollowsTheExplanation() {
assertEquals("The server stopped this stream.\n\nMaintenance tonight",PlaybackTermination(2006," Maintenance tonight ").message)
}
@Test fun blankReasonLeavesOnlyTheExplanation() {
assertEquals("The server stopped this stream.",PlaybackTermination(2006,"").message)
}
}

View file

@ -9,19 +9,6 @@ import org.junit.Test
import kotlin.random.Random
class ShuffleEpisodesTest {
@Test fun previousEpisodeReturnsToTheEarlierPickOnly() {
val shuffle=ShuffleEpisodes(listOf("e1","e2","e3","e4"),{it},Random(7))
val first=shuffle.first!!
assertNull(shuffle.preceding(first))
val second=shuffle.following(first)!!
assertTrue(shuffle.advance(first,second))
assertEquals(first,shuffle.preceding(second))
assertTrue(!shuffle.retreat(second,"not-played"))
assertTrue(shuffle.retreat(second,first))
// Stepping back keeps the bag: the same episode follows again.
assertEquals(second,shuffle.following(first))
assertNull(shuffle.preceding(second))
}
@Test fun eachBagContainsEveryEpisodeOnceAndBoundaryDoesNotRepeat() {
val episodes=listOf("e1","e2","e3","e4","e5")
val shuffle=ShuffleEpisodes(episodes,{it},Random(42))

Binary file not shown.

View file

@ -1 +1 @@
2d4fada001103d337515a05bec9a6edae01a33744fd4e36049a4fce149e11be6 Kaleido.apk
16ca9909181a434dad1f946a089c7cf719f328af101bd5b740ededc635ecc7b4 Kaleido.apk

View file

@ -1,7 +1,7 @@
{
"version": "0.7.0",
"versionCode": 23,
"url": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.7.0/distribution/Kaleido.apk",
"checksumUrl": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.7.0/distribution/Kaleido.apk.sha256",
"notes": "- Add a Previous episode button to the player, and redesign its controls: elapsed and remaining time at the ends of the timeline, previous episode, back 10 seconds, play, forward 30 seconds and next episode grouped in the centre, and the finish time beside Exit. Previous episode also steps back through a shuffle.\n- Skip intros and credits automatically after a delay you choose in Settings \u203a Playback (3, 5, 10 or 15 seconds, or show the button only). A pending skip reads \"Skipping intro\" with a filling background; pressing any button on the remote cancels it, and OK skips straight away. The earlier \"Automatically\" setting becomes a 5-second skip.\n- Show what you watch on other devices promptly: Kaleido checks Continue Watching every 15 seconds while open and as soon as you return to it.\n- Keep playback paused when you leave Kaleido while a stream is still starting, and only count down to the next episode while Kaleido is on screen.\n- Keep the resume point when leaving a title before its stream has started, and keep progress reports on the server the title came from.\n- Close Settings \u203a Choose server with Back or the new Cancel button, and enter Home's rows from the Home tab when there is no featured title.\n- Cancel slow network requests when they are no longer needed, and connect to the best server address as soon as it answers.\n- Update a title's format badges when you pick another version, keep New Seasons when one show can't be loaded, and keep focus on Continue Watching when a card is replaced while a title page is open.\n- Remove Volume boost, which degraded audio, and leave the player with the server's reason when a stream is stopped from the Plex dashboard."
"version": "0.6.2",
"versionCode": 22,
"url": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.6.2/distribution/Kaleido.apk",
"checksumUrl": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.6.2/distribution/Kaleido.apk.sha256",
"notes": "- New startup animation, the same as Kaleido Desktop's: a kaleidoscope of shards turns and gathers into the Kaleido mark, then the view flies through its centre into Home."
}

View file

@ -4,9 +4,6 @@ ROOT=pathlib.Path(__file__).resolve().parents[1]
version=dict(l.split('=',1) for l in (ROOT/'version.properties').read_text(encoding='utf-8').splitlines() if '=' in l)
apk=ROOT/'app/build/outputs/apk/release/app-release.apk'
if not apk.exists():raise SystemExit('Run Build.ps1 -Release first.')
# The APK left by an earlier build must not be published under this version's name.
from verify_distribution import check_apk
check_apk(apk,version['versionName'],int(version['versionCode']))
out=ROOT/'distribution';out.mkdir(exist_ok=True)
shutil.copyfile(apk,out/'Kaleido.apk')
digest=hashlib.sha256(apk.read_bytes()).hexdigest()

View file

@ -1,4 +1,4 @@
"""Validate optional themes and the normal audio path on the authorized onn; restore the prior audio preferences."""
"""Validate optional themes and PCM boost on the authorized onn; restore the prior audio preferences."""
import re,time,sys,xml.etree.ElementTree as ET
from device import adb,OUT,screenshot
from verify_ui import launch,key,text,focused,focus,snapshot,labels,wait,passed
@ -38,7 +38,7 @@ if __name__=='__main__':
original_xml=adb('shell','run-as','tv.kaleido.app','cat','shared_prefs/preferences.xml')
(OUT/'030-audio-original-preferences.xml').write_bytes(original_xml)
tree=ET.fromstring(original_xml)
for name,kind,value in [('themeMusic','boolean','true'),('themeVolume','int','20')]:
for name,kind,value in [('themeMusic','boolean','true'),('themeVolume','int','20'),('volumeBoostDb','int','6')]:
node=next((n for n in tree if n.get('name')==name),None)
if node is None:node=ET.SubElement(tree,kind,{'name':name})
node.set('value',value)
@ -51,10 +51,14 @@ if __name__=='__main__':
key(20);focused('Theme music volume')
original_volume=re.search(r'(\d+)%$',focus(snapshot())).group(1)+'%'
choose([str(n)+'%' for n in range(10,101,10)],'20%');focused('Theme music volume')
settings(1);focused('Playback quality');key(20,6);focused('Volume boost')
current=focus(snapshot());original_boost='Off (+0 dB)' if current.endswith('Off (+0 dB)') else re.search(r'\+\d+ dB$',current).group()
choose(['Off (+0 dB)','+3 dB','+6 dB','+9 dB','+12 dB'],'+6 dB');focused('Volume boost')
screenshot('030-volume-boost')
settings(3);key(20);focused('Theme music');assert focus(snapshot()).endswith('On')
key(20);focused('Theme music volume');assert focus(snapshot()).endswith('20%')
screenshot('030-theme-settings')
passed('Theme toggle and theme volume persist through cold starts; dialogs restore focus')
passed('Theme toggle, theme volume and boost persist through cold starts; dialogs restore focus')
try:
adb('logcat','-c');open_silo();wait_log('KaleidoTheme: READY volume=20%')
screenshot('030-silo-theme')
@ -72,24 +76,24 @@ if __name__=='__main__':
# Actual video uses validation mode, which avoids changing Plex progress.
adb('logcat','-c')
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity','--es','testTitleId','7599','--el','testOffset','90000','--ei','testMode','0','--ez','testValidation','true')
wait_log('STOP');wait_log('READY item=7599')
wait_log('STOP');wait_log('BOOST processing PCM db=6');wait_log('READY item=7599')
time.sleep(4)
audit=adb('shell','run-as','tv.kaleido.app','cat','files/playback-validation.jsonl')
(OUT/'030-audio-validation.jsonl').write_bytes(audit)
(OUT/'030-boost-validation.jsonl').write_bytes(audit)
import json
events=[json.loads(line) for line in audit.decode().splitlines()]
assert any(e.get('event')=='audioAdvancing' for e in events),'Decoded audio must advance'
assert any(e.get('event')=='firstFrame' for e in events),'Video must render'
passed('Theme stops for actual video; audio and video advance')
passed('Theme stops for actual video; +6 dB processor receives decoded PCM and audio/video advance')
adb('shell','am','force-stop','tv.kaleido.app');adb('logcat','-c')
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity','--es','testTitleId','9776','--el','testOffset','90000','--ei','testMode','2','--ez','testValidation','true')
wait_log('READY item=9776');time.sleep(4)
wait_log('BOOST processing PCM db=6');wait_log('READY item=9776');time.sleep(4)
movie_audit=adb('shell','run-as','tv.kaleido.app','cat','files/playback-validation.jsonl')
(OUT/'030-audio-movie-validation.jsonl').write_bytes(movie_audit)
(OUT/'030-boost-movie-validation.jsonl').write_bytes(movie_audit)
movie_events=[json.loads(line) for line in movie_audit.decode().splitlines()]
assert any(e.get('event')=='audioAdvancing' for e in movie_events)
assert any(e.get('event')=='firstFrame' for e in movie_events)
passed('A real Plex-converted movie renders audio and video')
passed('Volume boost also processes a real Plex-converted movie with rendered audio/video')
adb('shell','am','force-stop','tv.kaleido.app')
finally:
if playback_only:
@ -97,9 +101,11 @@ if __name__=='__main__':
adb('shell','run-as','tv.kaleido.app','sh','-c','"cat > shared_prefs/preferences.xml"',data=original_xml)
assert adb('shell','run-as','tv.kaleido.app','cat','shared_prefs/preferences.xml')==original_xml
else:
settings(1);key(20,6);focused('Volume boost')
choose(['Off (+0 dB)','+3 dB','+6 dB','+9 dB','+12 dB'],original_boost)
settings(3);key(20);focused('Theme music')
if focus(snapshot()).endswith('On')!=original_on:key(23)
key(20);focused('Theme music volume');choose([str(n)+'%' for n in range(10,101,10)],original_volume)
launch()
(OUT/'030-audio.log').write_text(logs())
passed('Prior theme preferences restored; device returned to Home')
passed('Prior theme and boost preferences restored; device returned to Home')

View file

@ -45,7 +45,7 @@ def main():
screenshot('details-cast-restored')
results.append('Actor titles match both Plex libraries; title and cast focus restore');print('PASS '+results[-1],flush=True)
key(4);key(4);focused('Home');key(22,2);focused('TV Shows');key(20);focused('Discover');key(22);focused('Library');key(23)
wait(lambda r:any(x.startswith('Unwatched') for x in labels(r)),'Show library filters loaded');focused('Library');key(20)
wait(lambda r:any(x.startswith('All genres') for x in labels(r)),'Show library filters loaded');focused('Library');key(20)
if show['title'] not in focus(snapshot()):key(21)
focused(show['title']);key(23)
text('Seasons');focused('Watch next');text('Mark watched');key(22);focused('Mark watched');touched.add(SHOW);key(23);focused('Mark unwatched')

View file

@ -4,9 +4,9 @@ from device import screenshot
from verify_ui import launch,key,focused,wait,focus,labels,snapshot
launch();key(22,2);focused('TV Shows');key(20);focused('Discover');key(22);focused('Library');key(23)
wait(lambda r:any(x.startswith('Unwatched') for x in labels(r)),'Show library loaded');focused('Library');key(20)
wait(lambda r:any(x.startswith('All genres') for x in labels(r)),'Show library loaded');focused('Library');key(20)
# The genre/sort filters sit between the section tabs and the grid.
if focus(snapshot()).startswith('Unwatched'):key(20)
if 'All genres' in focus(snapshot()):key(20)
# The grid is entered beneath the filter that held focus; walk back to the first column.
for _ in range(6):
if '3 Body Problem' in focus(snapshot()):break

View file

@ -1,56 +0,0 @@
"""Check that an APK really is the release it is published as.
Used by package_release.py before staging, and by CI against the checked-in distribution:
a stale or debug APK must not pass because its checksum and manifest were regenerated around it.
"""
import argparse, hashlib, json, os, pathlib, re, shutil, subprocess, sys
ROOT=pathlib.Path(__file__).resolve().parents[1]
PACKAGE='tv.kaleido.app'
def properties():
return dict(l.split('=',1) for l in (ROOT/'version.properties').read_text(encoding='utf-8').splitlines() if '=' in l)
def aapt2():
names=['aapt2.exe','aapt2'] if os.name=='nt' else ['aapt2']
roots=[ROOT/'.tools/sdk']+[pathlib.Path(os.environ[k]) for k in ('ANDROID_HOME','ANDROID_SDK_ROOT') if os.environ.get(k)]
for root in roots:
tools=sorted((root/'build-tools').glob('*'),key=lambda p:[int(x) if x.isdigit() else 0 for x in p.name.split('.')],reverse=True) if (root/'build-tools').is_dir() else []
for folder in tools:
for name in names:
if (folder/name).is_file():return str(folder/name)
found=shutil.which('aapt2')
if found:return found
raise SystemExit('aapt2 was not found. Install Android build-tools or set ANDROID_HOME.')
def badging(apk):
"""(package, versionName, versionCode, debuggable) from the APK's own manifest."""
out=subprocess.run([aapt2(),'dump','badging',str(apk)],capture_output=True,text=True,check=True).stdout
m=re.search(r"^package: name='([^']+)' versionCode='(\d+)' versionName='([^']+)'",out,re.M)
if not m:raise SystemExit(f'Could not read the version of {apk}.')
return m.group(1),m.group(3),int(m.group(2)),'application-debuggable' in out
def check_apk(apk,version_name,version_code):
package,name,code,debuggable=badging(apk)
problems=[]
if package!=PACKAGE:problems.append(f'package is {package}, expected {PACKAGE}')
if (name,code)!=(version_name,version_code):problems.append(f'APK is {name} ({code}), expected {version_name} ({version_code}); rebuild it')
if debuggable:problems.append('APK is a debuggable build, not the release')
if problems:raise SystemExit(f'{apk}: '+'; '.join(problems)+'.')
def main():
parser=argparse.ArgumentParser(description=__doc__)
parser.add_argument('--release',action='store_true',help='also require the distribution to match version.properties (tag builds)')
args=parser.parse_args()
out=ROOT/'distribution';apk=out/'Kaleido.apk'
if not apk.exists():print('No distribution to verify.');return
digest=hashlib.sha256(apk.read_bytes()).hexdigest()
if (out/'Kaleido.apk.sha256').read_text().split()[0]!=digest:raise SystemExit('Kaleido.apk does not match Kaleido.apk.sha256.')
manifest=json.loads((out/'latest.json').read_text(encoding='utf-8'))
check_apk(apk,manifest['version'],int(manifest['versionCode']))
if args.release:
version=properties()
if (manifest['version'],int(manifest['versionCode']))!=(version['versionName'],int(version['versionCode'])):
raise SystemExit('distribution/latest.json does not match version.properties; run scripts/package_release.py.')
print('Distribution verified:',manifest['version'],f"({manifest['versionCode']})",'SHA-256',digest)
if __name__=='__main__':main()

View file

@ -58,7 +58,7 @@ def section_check(tab,media_type):
for _ in range(8):
if focus(snapshot())=='Animation':break
key(22)
focused('Animation');key(23);text('Z')
focused('Animation');key(23);text('Animation ⌄');text('Z')
expected,offset=first_at_letter('',media_type,'S','Animation')
jump('S',expected)
screenshot('030-'+media_type+'-animation-jump')

View file

@ -4,11 +4,11 @@ from device import screenshot
from verify_ui import launch,key,focused,wait,focus,labels,snapshot
launch();key(22);focused('Movies');key(20);focused('Discover');key(22);focused('Library');key(23)
wait(lambda r:any(x.startswith('Unwatched') for x in labels(r)),'Movie library loaded')
wait(lambda r:any(x.startswith('All genres') for x in labels(r)),'Movie library loaded')
key(20)
# The genre/sort filters sit between the section tabs and the grid.
if focus(snapshot()).startswith('Unwatched'):key(20)
wait(lambda r:bool(focus(r)) and focus(r) not in ('Library','Discover') and not focus(r).startswith('Unwatched'),'Movie card focus')
if 'All genres' in focus(snapshot()):key(20)
wait(lambda r:bool(focus(r)) and focus(r) not in ('Library','Discover') and 'All genres' not in focus(r),'Movie card focus')
selected=focus(snapshot());key(23)
wait(lambda r:focus(r)=='Play' or focus(r).startswith('Resume'),'Movie play action')
root=snapshot();screenshot('movie-details-0.1.11')

View file

@ -1,132 +0,0 @@
"""Previous episode, timed auto-skip with remote cancellation, server-picker Back and resume refresh.
Requires the **debug** build (test intents and run-as). Playback runs as validation, so it reports no
Plex progress. The refresh check moves one Continue Watching offset and restores it; the auto-skip
preferences are restored as found.
"""
import json,pathlib,re,sys,time,urllib.request,urllib.parse
sys.path.insert(0,str(pathlib.Path(__file__).resolve().parent))
from device import adb,ROOT,screenshot
from verify_ui import key,snapshot,focus,labels,wait,focused,text,launch
from repro_runtime import await_ready
PREFS='shared_prefs/preferences.xml'
INTRO_EPISODE=11621 # The Big Bang Theory 10x24: intro marker 117.4-146.7 s
SILO_FIRST,SILO_SECOND=7599,8594
def logs(tag='KaleidoPlayback'):return adb('logcat','-d','-s',f'{tag}:I','AndroidRuntime:E','*:S').decode(errors='replace')
def wait_log(needle,timeout=30,tag='KaleidoPlayback'):
deadline=time.monotonic()+timeout
while time.monotonic()<deadline:
if needle in logs(tag):return
time.sleep(.3)
raise AssertionError(f'Log never showed {needle!r}')
def start(item,offset):
adb('shell','am','force-stop','tv.kaleido.app');adb('logcat','-c')
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity','--es','testTitleId',str(item),'--el','testOffset',str(offset),'--ei','testMode','1','--ez','testValidation','true')
await_ready(item)
def read_prefs():return adb('shell','run-as','tv.kaleido.app','cat',PREFS).decode()
def write_prefs(xml):
adb('shell','am','force-stop','tv.kaleido.app')
adb('shell','run-as','tv.kaleido.app','sh','-c','"cat > '+PREFS+'"',data=xml.encode())
def with_int(xml,name,value):
entry=f'<int name="{name}" value="{value}" />'
pattern=re.compile(r'<int name="'+name+r'" value="-?\d+" />')
return pattern.sub(entry,xml) if pattern.search(xml) else xml.replace('</map>',f' {entry}\n</map>')
def auto_skip():
start(INTRO_EPISODE,112000)
wait_log('AUTOSKIP countdown intro seconds=5')
root=wait(lambda r:'Skipping intro' in labels(r),'Pending skip reads "Skipping intro", without a number')
assert not any(re.search(r'Skip(ping)? intro.*\d',l) for l in labels(root)),'Skip button shows a numeric countdown'
screenshot('auto-skip-pending')
wait_log(f'AUTOSKIP intro item={INTRO_EPISODE}',timeout=15)
assert 'AUTOSKIP cancelled' not in logs()
print('PASS intro skips itself after the countdown, shown as a fill rather than a number',flush=True)
for code,name in ((20,'Down'),(4,'Back')):
start(INTRO_EPISODE,112000)
wait_log('AUTOSKIP countdown intro')
key(code);wait_log('AUTOSKIP cancelled intro',timeout=5)
time.sleep(7)
assert f'AUTOSKIP intro item={INTRO_EPISODE}' not in logs(),f'{name} did not cancel the automatic skip'
root=wait(lambda r:'Skip intro' in labels(r),'Manual Skip intro stays available after cancelling')
assert adb('shell','pidof','tv.kaleido.app').strip(),'Player process exited'
assert 'Skipping intro' not in labels(root)
print(f'PASS {name} cancels the automatic skip and leaves the player open',flush=True)
screenshot('auto-skip-cancelled')
key(4);key(4)
def previous_episode():
start(SILO_SECOND,90000)
key(127);focused('Play');screenshot('player-bar-episode')
key(21);focused('Back 10 seconds');key(21);focused('Previous episode');key(23)
await_ready(SILO_FIRST)
assert 'FATAL EXCEPTION' not in logs(),'Previous episode crashed'
print('PASS Previous episode replaced the player with the earlier episode',flush=True)
time.sleep(2);key(127);focused('Play')
# The series' first episode has no previous one once its season list has loaded.
wait(lambda r:'Next episode' in labels(r) and 'Previous episode' not in labels(r),'No Previous episode on the first episode')
key(21);focused('Back 10 seconds');key(21)
assert 'Back 10 seconds' in focus(snapshot()) or 'Exit playback' in focus(snapshot())
print('PASS first episode offers Next but not Previous',flush=True)
key(4);key(4)
def server_picker():
launch();key(22,4);focused('Settings');key(23);focused('Switch account');key(22)
if 'Choose server' not in focus(snapshot()):print('SKIP no account-linked server list (server-token session)');key(4);return
key(23);text('Choose your Plex server');screenshot('server-picker')
key(4)
wait(lambda r:'Choose your Plex server' not in labels(r) and 'Choose server' in labels(r),'Back closes the server picker over Settings')
assert adb('shell','pidof','tv.kaleido.app').strip()
key(22) # Choose server again, now via the Cancel button
if 'Choose server' not in focus(snapshot()):key(21)
focused('Choose server');key(23);text('Choose your Plex server')
for _ in range(12):
if focus(snapshot())=='Cancel':break
key(20)
focused('Cancel');key(23)
wait(lambda r:'Choose your Plex server' not in labels(r) and 'Choose server' in labels(r),'Cancel closes the server picker')
print('PASS Back and Cancel close Settings > Choose server',flush=True)
key(4)
def plex(path,params):
env=dict(l.strip().split('=',1) for l in (ROOT/'.env').read_text().splitlines() if '=' in l and not l.startswith('#'))
url=env['PLEX_SERVER_URL'].strip('"\'').rstrip('/')+path+'?'+urllib.parse.urlencode(params)
req=urllib.request.Request(url,headers={'X-Plex-Token':env['PLEX_TOKEN'].strip('"\''),'Accept':'application/json','X-Plex-Client-Identifier':'kaleido-development','X-Plex-Product':'Kaleido'})
with urllib.request.urlopen(req,timeout=20) as r:return r.read()
def offset(item,field='viewOffset'):
from inspect_server import get
return int(get(f'/library/metadata/{item}')['Metadata'][0].get(field,0))
def set_offset(item,ms):plex('/:/progress',{'key':str(item),'identifier':'com.plexapp.plugins.library','time':str(ms),'state':'stopped'})
def refresh():
original=offset(SILO_FIRST)
# Continue Watching progress is compared in 5% steps; move by more than one step each time.
step=offset(SILO_FIRST,'duration')*6//100
try:
launch();time.sleep(4);adb('logcat','-c')
# Watched elsewhere while Kaleido is in the background: shown promptly on return.
key('KEYCODE_HOME');time.sleep(3)
set_offset(SILO_FIRST,original+step)
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity')
began=time.monotonic();wait_log('APPLIED',timeout=10,tag='KaleidoSync')
print(f'PASS returning to Kaleido applied Continue Watching changes in {time.monotonic()-began:.1f}s',flush=True)
# Watched elsewhere while Kaleido stays open: the background poll picks it up.
time.sleep(3);adb('logcat','-c');set_offset(SILO_FIRST,original+2*step);began=time.monotonic()
wait_log('APPLIED',timeout=25,tag='KaleidoSync')
print(f'PASS open Kaleido applied a progress change from another device in {time.monotonic()-began:.1f}s',flush=True)
finally:
set_offset(SILO_FIRST,original)
assert offset(SILO_FIRST)==original,'Fixture progress was not restored'
if __name__=='__main__':
phases=sys.argv[1:] or ['previous_episode','auto_skip','server_picker','refresh']
original=read_prefs()
try:
if 'auto_skip' in phases:
write_prefs(with_int(with_int(original,'autoSkipIntroSeconds',5),'autoSkipCreditsSeconds',0))
for phase in phases:globals()[phase]()
finally:
write_prefs(original)
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity')

View file

@ -10,10 +10,7 @@ key(20);focused('Remote quality');key(23)
wait(lambda r:any(q in focus(r) for q in ('Original quality','4K','1080p','720p','480p')),'Remote quality choices');key(4);focused('Remote quality')
key(20);focused('Watched status');key(23);focused('80%');key(4);focused('Watched status')
key(20);focused('Autoplay next episode');key(23);focused('After 5 seconds');key(4);focused('Autoplay next episode')
key(20);focused('Skip intros');key(23)
wait(lambda r:any(q in focus(r) for q in ('Show button','Automatically after')),'Skip intro delay choices');key(4);focused('Skip intros')
key(20);focused('Skip credits');key(23)
wait(lambda r:any(q in focus(r) for q in ('Show button','Automatically after')),'Skip credits delay choices');key(4);focused('Skip credits')
key(20);focused('Skip intros');key(20);focused('Skip credits')
print('PASS playback dialogs cancel back to their controls',flush=True)
screenshot('settings-playback-current')
key(21);focused('Playback');key(20);focused('Subtitles');key(22);focused('Size');key(23);focused('Normal');key(4);focused('Size')

View file

@ -47,7 +47,7 @@ def browse():
key(4);focused(selected);passed('Discovery details returns to the same focused card')
key(19);wait(lambda r:focus(r) in ('Play','Resume'),'Return to Home hero');key(19);focused('Home');key(22);text('Recently released');focused('Movies')
capture('movies-discover');key(20);focused('Discover');key(22);focused('Library');key(23)
wait(lambda r:any(x.startswith('Unwatched') for x in labels(r)),'Library filters');focused('Library');capture('movies-library')
text('All genres ⌄');focused('Library');capture('movies-library')
passed('Movies prioritizes recent releases and retains a separate filtered A-Z grid')
key(20);wait(lambda r:bool(focus(r)) and 'Library' not in focus(r),'Library content or filter focus')
key(4);focused('Discover');key(19);focused('Movies');key(22)

View file

@ -1,2 +1,2 @@
versionName=0.7.0
versionCode=23
versionName=0.6.2
versionCode=22