diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 98f03a3a..49c0c66d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -133,13 +133,6 @@ configure { isDebuggable = true applicationIdSuffix = ".debug" } - - create("optimized") { - initWith(getByName("release")) - signingConfig = signingConfigs.getByName("debug") - applicationIdSuffix = ".opt" - matchingFallbacks += "release" - } } flavorDimensions += "version" productFlavors { @@ -206,10 +199,6 @@ configure { kotlin.directories += "$buildDir/generated/seerr_api/src/main/kotlin" kotlin.directories += "src/wolfskin/java" } - getByName("optimized") { - kotlin.directories += "src/release/java" - baselineProfiles.directories += "src/optimized/baselineProfiles" - } } testOptions { @@ -239,11 +228,6 @@ androidComponents { "Wholphin-${variant.flavorName}-${variant.buildType}-${output.versionName.get()}-${output.versionCode.get()}$abi.apk" output.outputFileName = outputFileName } - if (variant.name == "defaultOptimized") { - tasks.withType().configureEach { - systemProperty("wolfskin.optimizedVersionName", variant.outputs.first().versionName.get()) - } - } if (variant.name == "defaultDebug") { val packagedApks = variant.artifacts.get(SingleArtifact.APK) val artifactLoader = variant.artifacts.getBuiltArtifactsLoader() diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 20fc0df0..aad5c5b5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -40,7 +40,6 @@ = coroutineScope { - val system = async { - try { - val info by apiClient.systemApi.getPublicSystemInfo() - server.copy(name = info.serverName, version = info.version) - } catch (exception: Exception) { - if (exception is kotlinx.coroutines.CancellationException) throw exception - Timber.w(exception, "Exception fetching public system info") - server - } - } - val user by apiClient.userApi.getCurrentUser() - system.await() to user - } - /** * Try to restore the most recent session * diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/NavigationManager.kt b/app/src/main/java/com/github/damontecres/wholphin/services/NavigationManager.kt index 87095f8b..3208f4ec 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/services/NavigationManager.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/services/NavigationManager.kt @@ -24,13 +24,6 @@ class NavigationManager log() } - /** Replace only the current page, preserving every parent entry. */ - fun replaceTop(destination: Destination) { - if (backStack.isEmpty()) backStack.add(destination) - else backStack[backStack.lastIndex] = destination - log() - } - /** * Go to the specified [Destination], but reset the back stack to Home first */ diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/hilt/AppModule.kt b/app/src/main/java/com/github/damontecres/wholphin/services/hilt/AppModule.kt index 0591f4a1..3a114017 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/services/hilt/AppModule.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/services/hilt/AppModule.kt @@ -26,9 +26,6 @@ import org.jellyfin.sdk.api.okhttp.OkHttpFactory import org.jellyfin.sdk.createJellyfin import org.jellyfin.sdk.model.ClientInfo import org.jellyfin.sdk.model.DeviceInfo -import org.justinvisser.wolfskin.conductarr.PersistentDns -import org.justinvisser.wolfskin.conductarr.DnsConnectionRetry -import java.io.File import javax.inject.Qualifier import javax.inject.Singleton @@ -94,14 +91,12 @@ object AppModule { @StandardOkHttpClient @Provides @Singleton - fun okHttpClient(dns: PersistentDns) = - DnsConnectionRetry.configure(OkHttpClient.Builder(), dns).build() - - /** Resolve noBackupFilesDir lazily: Android may create it and lookup always runs off main. */ - @Provides - @Singleton - fun dns(@ApplicationContext context: Context): PersistentDns = - PersistentDns(file = { File(context.noBackupFilesDir, "wolfskin-dns.json") }) + fun okHttpClient() = + OkHttpClient + .Builder() + .apply { + // TODO user agent, timeouts, logging, etc + }.build() @AuthOkHttpClient @Provides diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/CoilConfig.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/CoilConfig.kt index 3c32c8ab..703182ba 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/CoilConfig.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/CoilConfig.kt @@ -15,8 +15,7 @@ import coil3.network.NetworkResponse import coil3.network.cachecontrol.CacheControlCacheStrategy import coil3.network.okhttp.OkHttpNetworkFetcherFactory import coil3.request.Options -import coil3.request.transitionFactory -import org.justinvisser.wolfskin.design.NetworkArtTransition +import coil3.request.crossfade import coil3.util.DebugLogger import com.github.damontecres.wholphin.preferences.AppPreference import com.github.damontecres.wholphin.preferences.AppPreferences @@ -90,7 +89,7 @@ fun CoilConfig( memoryCache(null) diskCache(null) } - }.transitionFactory(NetworkArtTransition) + }.crossfade(false) .logger(if (debugLogging) DebugLogger() else null) .components { add( diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlayExternalPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlayExternalPage.kt index 421cc279..b17036b8 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlayExternalPage.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlayExternalPage.kt @@ -82,11 +82,9 @@ class PlayExternalViewModel ) : ViewModel() { val launched = savedStateHandle.getMutableStateFlow("launched", false) val state = MutableStateFlow(PlayExternalState()) - private var watchScope: String? = null fun init(destination: Destination) { Timber.v("init called: %s", destination) - watchScope = "${serverRepository.currentServer?.id}:${serverRepository.currentUser?.id}" state.update { it.copy(loading = LoadingState.Loading) } viewModelScope.launchDefault { val prefs = userPreferencesService.getCurrent() @@ -360,7 +358,6 @@ class PlayExternalViewModel failed = false, ), ) - watchScope?.let { com.github.damontecres.wholphin.util.PlaybackWatchState.stopped(context, it) } } } else { Timber.w( diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt index 9cbbe551..24bd8ee9 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt @@ -830,12 +830,10 @@ class PlaybackViewModel } val playbackItemState = PlaybackItemState(playback) - val watchScope = "${serverRepository.currentServer?.id}:${serverRepository.currentUser?.id}" val activityListener = TrackActivityPlaybackListener( api = api, player = player, - onStopped = { com.github.damontecres.wholphin.util.PlaybackWatchState.stopped(context, watchScope) }, getState = { playbackItemState }, ) player.addListener(activityListener) diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/seerr/SwitchSeerrViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/seerr/SwitchSeerrViewModel.kt index e7ec173a..2fde3eae 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/seerr/SwitchSeerrViewModel.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/seerr/SwitchSeerrViewModel.kt @@ -52,9 +52,6 @@ class SwitchSeerrViewModel _state.update { it.copy(loading = LoadingState.Success) } } } - } else { - // Nothing to check so set success - _state.update { it.copy(loading = LoadingState.Success) } } } diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/CrashReportSenderFactory.kt b/app/src/main/java/com/github/damontecres/wholphin/util/CrashReportSenderFactory.kt index e0c8005f..d83ae269 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/util/CrashReportSenderFactory.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/util/CrashReportSenderFactory.kt @@ -4,11 +4,6 @@ import android.content.Context import com.github.damontecres.wholphin.data.MostRecentServer import com.github.damontecres.wholphin.services.hilt.AppModule import com.github.damontecres.wholphin.services.hilt.DeviceModule -import com.github.damontecres.wholphin.services.hilt.StandardOkHttpClient -import dagger.hilt.EntryPoint -import dagger.hilt.InstallIn -import dagger.hilt.android.EntryPointAccessors -import dagger.hilt.components.SingletonComponent import com.google.auto.service.AutoService import kotlinx.coroutines.runBlocking import okhttp3.OkHttpClient @@ -78,7 +73,10 @@ class CrashReportSender : ReportSender { private fun MostRecentServer.createApi(context: Context): ApiClient? = (this as? MostRecentServer.ServerAndUser)?.let { - val okHttpClient = EntryPointAccessors.fromApplication(context.applicationContext, CrashNetwork::class.java).client() + val okHttpClient = + OkHttpClient + .Builder() + .build() val okHttpFactory = OkHttpFactory(okHttpClient) val api = createJellyfin { @@ -91,11 +89,3 @@ private fun MostRecentServer.createApi(context: Context): ApiClient? = }.createApi(baseUrl = serverUrl, accessToken = accessToken) api } - -/** Crash reporting shares the application's DNS hints without borrowing authenticated headers. */ -@EntryPoint -@InstallIn(SingletonComponent::class) -interface CrashNetwork { - @StandardOkHttpClient - fun client(): OkHttpClient -} diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/PlaybackWatchState.kt b/app/src/main/java/com/github/damontecres/wholphin/util/PlaybackWatchState.kt deleted file mode 100644 index 3306ca18..00000000 --- a/app/src/main/java/com/github/damontecres/wholphin/util/PlaybackWatchState.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.github.damontecres.wholphin.util - -import android.content.Context -import org.justinvisser.wolfskin.conductarr.FileCacheStore -import java.io.File -import java.io.IOException -import timber.log.Timber -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.asStateFlow -import kotlinx.coroutines.flow.update - -/** Only an acknowledged stop invalidates the captured server/user's watch projections. */ -object PlaybackWatchState { - private val mutableRevisions = MutableStateFlow>(emptyMap()) - val revisions = mutableRevisions.asStateFlow() - - /** Remove persisted watch grids before publishing the captured user's acknowledgement. */ - fun stopped(context: Context, scope: String) { - try { - FileCacheStore(File(context.filesDir, "wolfskin-library-cache")).clear(scope) - } catch (exception: IOException) { - Timber.w(exception, "Could not invalidate playback watch snapshots") - } - val time = System.currentTimeMillis() - mutableRevisions.update { previous -> previous + (scope to maxOf(time, (previous[scope] ?: 0L) + 1L)) } - } -} diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/TrackActivityPlaybackListener.kt b/app/src/main/java/com/github/damontecres/wholphin/util/TrackActivityPlaybackListener.kt index 859a04aa..2ab4c2f7 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/util/TrackActivityPlaybackListener.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/util/TrackActivityPlaybackListener.kt @@ -7,8 +7,6 @@ import com.github.damontecres.wholphin.ui.launchIO import com.github.damontecres.wholphin.ui.playback.CurrentPlayback import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.withContext -import kotlinx.coroutines.sync.Mutex -import kotlinx.coroutines.sync.withLock import org.jellyfin.sdk.api.client.ApiClient import org.jellyfin.sdk.api.client.extensions.playStateApi import org.jellyfin.sdk.model.api.PlayMethod @@ -33,12 +31,9 @@ import kotlin.time.Duration.Companion.seconds class TrackActivityPlaybackListener( private val api: ApiClient, private val player: Player, - private val onStopped: () -> Unit = {}, private val getState: () -> PlaybackItemState?, ) : Player.Listener { private val coroutineScope = CoroutineScope(WholphinDispatchers.Main) - private val reports = Mutex() - @Volatile private var released = false private val task: TimerTask = object : TimerTask() { override fun run() { @@ -75,23 +70,19 @@ class TrackActivityPlaybackListener( val delay = 5.seconds.inWholeMilliseconds // Every x seconds, check if the video is playing - if (!released) { - TIMER.schedule(task, delay, delay) - initialized = true - } + TIMER.schedule(task, delay, delay) + initialized = true } } } fun release() { - if (released) return - released = true +// player.removeListener(this) task.cancel() TIMER.purge() val position = player.currentPosition.milliseconds - val stoppedState = getState.invoke() launch("reportPlaybackStopped") { - stoppedState?.let { state -> + getState.invoke()?.let { state -> Timber.v("reportPlaybackStopped for ${state.itemId} at $position") if (position < Duration.ZERO) { Timber.w("Negative position when reporting playback stopped: %s", position) @@ -105,7 +96,6 @@ class TrackActivityPlaybackListener( liveStreamId = state.liveStreamId, ), ) - onStopped() } } } @@ -127,7 +117,6 @@ class TrackActivityPlaybackListener( private fun saveActivity(position: Long) { launch("saveActivity") { - if (released) return@launch getState.invoke()?.let { state -> val calcPosition = withContext(WholphinDispatchers.Main) { @@ -163,7 +152,7 @@ class TrackActivityPlaybackListener( ) { coroutineScope.launchIO { try { - reports.withLock { block.invoke(this) } + block.invoke(this) } catch (ex: Exception) { Timber.w(ex, "Exception during %s", name) } diff --git a/app/src/optimized/baselineProfiles/baseline-prof.txt b/app/src/optimized/baselineProfiles/baseline-prof.txt deleted file mode 100644 index ad4df0ae..00000000 --- a/app/src/optimized/baselineProfiles/baseline-prof.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Hand-maintained startup/shell seed; supplement with device-recorded navigation profiles. -Lcom/github/damontecres/wholphin/WholphinApplication; -HSPLcom/github/damontecres/wholphin/WholphinApplication;->onCreate()V -Lcom/github/damontecres/wholphin/MainActivity; -HSPLcom/github/damontecres/wholphin/MainActivity;->onCreate(Landroid/os/Bundle;)V -Lorg/justinvisser/wolfskin/tv/WolfskinAppKt; -Lorg/justinvisser/wolfskin/tv/WolfskinScreenPreference; -Lorg/justinvisser/wolfskin/tv/ConductarrPreference; diff --git a/app/src/optimized/res/values/strings.xml b/app/src/optimized/res/values/strings.xml deleted file mode 100644 index fa4e585f..00000000 --- a/app/src/optimized/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Wolfskin (Opt) - diff --git a/app/src/test/java/com/github/damontecres/wholphin/TestMainActivityViewModel.kt b/app/src/test/java/com/github/damontecres/wholphin/TestMainActivityViewModel.kt index d8fe5695..1de5becd 100644 --- a/app/src/test/java/com/github/damontecres/wholphin/TestMainActivityViewModel.kt +++ b/app/src/test/java/com/github/damontecres/wholphin/TestMainActivityViewModel.kt @@ -32,8 +32,6 @@ import io.mockk.mockkStatic import io.mockk.slot import io.mockk.unmockkStatic import io.mockk.verify -import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.flow @@ -118,6 +116,9 @@ class TestMainActivityViewModel { signInAutomatically = true } every { serverRepository.current } returns MutableStateFlow(currentUser) +// coEvery { serverRepository.tryRestoreSession(serverId, userId) } returns currentUser +// coEvery { serverRepository.restoreLastSession() } returns +// RestoredSession.Success(currentUser) viewModel.handleAppStart() @@ -131,7 +132,7 @@ class TestMainActivityViewModel { destination as SetupDestination.AppContent Assert.assertEquals(currentUser, destination.current) } - coVerify(exactly = 0) { serverRepository.restoreSavedSession() } + coVerify(exactly = 0) { serverRepository.restoreLastSession() } coVerify(exactly = 0) { serverRepository.getMostRecentServer() } } @@ -149,7 +150,7 @@ class TestMainActivityViewModel { viewModel.handleAppStart() coVerify(exactly = 0) { serverRepository.tryChangeUser(any(), any()) } - coVerify(exactly = 0) { serverRepository.restoreSavedSession() } + coVerify(exactly = 0) { serverRepository.restoreLastSession() } coVerify(exactly = 1) { serverRepository.getMostRecentServer() } val args = mutableListOf() verify { setupNavigationManager.navigateTo(capture(args)) } @@ -164,20 +165,6 @@ class TestMainActivityViewModel { } } - @Test - fun savedColdLaunchNavigatesBeforeSessionRevalidationCompletes() = runTest(testDispatcher) { - setupPreferences { signInAutomatically = true } - every { serverRepository.current } returns MutableStateFlow(null) - coEvery { serverRepository.restoreSavedSession() } returns RestoredSession.Success(currentUser) - val release = CompletableDeferred() - coEvery { serverRepository.revalidateSession(currentUser) } coAnswers { release.await() } - viewModel.handleAppStart() - runCurrent() - verify { setupNavigationManager.navigateTo(SetupDestination.AppContent(currentUser)) } - assertFalse(release.isCompleted) - release.complete(Unit) - } - @Test fun `Test auto sign in, hot load, with protected profile`() = runTest { @@ -191,7 +178,7 @@ class TestMainActivityViewModel { coEvery { serverRepository.tryChangeUser(serverId, userId) } returns null - coEvery { serverRepository.restoreSavedSession() } returns + coEvery { serverRepository.restoreLastSession() } returns RestoredSession.ServerOnly(server) viewModel.handleAppStart() @@ -217,7 +204,7 @@ class TestMainActivityViewModel { signInAutomatically = true } every { serverRepository.current } returns MutableStateFlow(null) - coEvery { serverRepository.restoreSavedSession() } returns + coEvery { serverRepository.restoreLastSession() } returns RestoredSession.ServerOnly(server) coEvery { serverRepository.tryChangeUser(serverId, userId) @@ -225,7 +212,7 @@ class TestMainActivityViewModel { viewModel.handleAppStart() - coVerify(exactly = 1) { serverRepository.restoreSavedSession() } + coVerify(exactly = 1) { serverRepository.restoreLastSession() } val slot = slot() verify { setupNavigationManager.navigateTo(capture(slot)) } slot.captured.let { destination -> @@ -245,11 +232,11 @@ class TestMainActivityViewModel { signInAutomatically = true } every { serverRepository.current } returns MutableStateFlow(null) - coEvery { serverRepository.restoreSavedSession() } returns RestoredSession.None + coEvery { serverRepository.restoreLastSession() } returns RestoredSession.None viewModel.handleAppStart() - coVerify(exactly = 1) { serverRepository.restoreSavedSession() } + coVerify(exactly = 1) { serverRepository.restoreLastSession() } val slot = slot() verify { setupNavigationManager.navigateTo(capture(slot)) } slot.captured.let { destination -> @@ -267,7 +254,7 @@ class TestMainActivityViewModel { signInAutomatically = true } every { serverRepository.current } returns MutableStateFlow(currentUser) - coEvery { serverRepository.restoreSavedSession() } returns + coEvery { serverRepository.restoreLastSession() } returns RestoredSession.Success(currentUser) coEvery { intentService.parseIntent(any()) } returns IntentResult.NoOp @@ -284,7 +271,7 @@ class TestMainActivityViewModel { // destination as SetupDestination.AppContent // Assert.assertEquals(currentUser, destination.current) // } - coVerify(exactly = 0) { serverRepository.restoreSavedSession() } + coVerify(exactly = 0) { serverRepository.restoreLastSession() } coVerify(exactly = 0) { serverRepository.getMostRecentServer() } } diff --git a/app/src/test/java/com/github/damontecres/wholphin/services/ServerSavedSessionTest.kt b/app/src/test/java/com/github/damontecres/wholphin/services/ServerSavedSessionTest.kt deleted file mode 100644 index 2724cc61..00000000 --- a/app/src/test/java/com/github/damontecres/wholphin/services/ServerSavedSessionTest.kt +++ /dev/null @@ -1,136 +0,0 @@ -package com.github.damontecres.wholphin.services - -import android.app.Application -import androidx.room.Room -import androidx.test.core.app.ApplicationProvider -import android.content.Context -import com.github.damontecres.wholphin.data.* -import com.github.damontecres.wholphin.data.model.* -import com.github.damontecres.wholphin.ui.successResponse -import io.mockk.* -import java.util.UUID -import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.async -import kotlinx.coroutines.test.StandardTestDispatcher -import kotlinx.coroutines.test.runCurrent -import kotlinx.coroutines.test.runTest -import org.jellyfin.sdk.api.client.ApiClient -import org.jellyfin.sdk.api.client.extensions.systemApi -import org.jellyfin.sdk.api.client.extensions.userApi -import org.jellyfin.sdk.api.operations.SystemApi -import org.jellyfin.sdk.api.operations.UserApi -import org.jellyfin.sdk.model.api.PublicSystemInfo -import org.jellyfin.sdk.model.api.UserDto -import org.junit.Assert.* -import org.junit.After -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config - -/** Saved identities can paint offline without unlocking protected logins or accepting a late identity. */ -@OptIn(ExperimentalCoroutinesApi::class) -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [34], application = Application::class) -class ServerSavedSessionTest { - private val dispatcher = StandardTestDispatcher() - private val server = JellyfinServer(UUID.randomUUID(), "Saved server", "https://jellyfin.test", "12.1.0") - private var user = JellyfinUser(id = UUID.randomUUID(), serverId = server.id, name = "Saved name", accessToken = "saved-token") - private val users = mockk() - private val system = mockk() - private val api = mockk(relaxed = true) - private val recent = mockk() - private val database by lazy { - Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java) - .allowMainThreadQueries().build() - } - private val dao by lazy { database.serverDao() } - private val dto = UserDto(id = user.id, name = "Refreshed name", - hasPassword = false, hasConfiguredPassword = false, hasConfiguredEasyPassword = false) - private val info = PublicSystemInfo(serverName = "Refreshed server", version = "12.1.0") - private val repository by lazy { ServerRepository(mockk(), mockk(), dao, api, dispatcher, recent) } - - @Before fun savedLogin() { - every { recent.get() } returns MostRecentServer.from(CurrentUser(server, user)) - dao.addOrUpdateServer(server) - user = dao.addOrUpdateUser(user) - every { api.userApi } returns users - every { api.systemApi } returns system - coEvery { users.getCurrentUser() } returns successResponse(dto) - coEvery { system.getPublicSystemInfo() } returns successResponse(info) - } - - @After fun closeDatabase() { database.close() } - - @Test fun savedSessionIsUsableWhileUserRevalidationWaitsAndSystemInfoRunsInParallel() = runTest(dispatcher) { - val pendingUser = CompletableDeferred() - val systemStarted = CompletableDeferred() - coEvery { users.getCurrentUser() } coAnswers { pendingUser.await(); successResponse(dto) } - coEvery { system.getPublicSystemInfo() } coAnswers { systemStarted.complete(Unit); successResponse(info) } - val restored = repository.restoreSavedSession() as RestoredSession.Success - assertEquals(user, restored.currentUser.user) - assertEquals(restored.currentUser, repository.current.value) - val refresh = async { repository.revalidateSession(restored.currentUser) } - runCurrent() - systemStarted.await() - assertFalse(refresh.isCompleted) - pendingUser.complete(Unit) - refresh.await() - assertEquals("Refreshed name", repository.current.value!!.user.name) - assertEquals("Refreshed server", repository.current.value!!.server.name) - } - - @Test fun savedProtectedPeopleRemainLocked() = runTest(dispatcher) { - for (protected in listOf(user.copy(pin = "1234"), user.copy(requireLogin = true))) { - dao.updateUser(protected) - assertTrue(repository.restoreSavedSession() is RestoredSession.ServerOnly) - assertNull(repository.current.value) - } - } - - @Test fun lateLaunchRefreshCannotReplaceTheSelectedPerson() = runTest(dispatcher) { - val first = (repository.restoreSavedSession() as RestoredSession.Success).currentUser - val entered = CompletableDeferred() - val pending = CompletableDeferred() - coEvery { users.getCurrentUser() } coAnswers { entered.complete(Unit); pending.await(); successResponse(dto) } - val refresh = async { repository.revalidateSession(first) } - entered.await() - val selected = dao.addOrUpdateUser(user.copy(rowId = 0, id = UUID.randomUUID(), name = "Other person")) - every { recent.get() } returns MostRecentServer.from(CurrentUser(server, selected)) - repository.restoreSavedSession() - pending.complete(Unit) - refresh.await() - assertEquals(selected, repository.current.value!!.user) - assertNull(repository.currentUserDto) - } - - @Test fun launchNameRefreshPreservesSettingsAndPinChangedWhileTheRequestWaits() = runTest(dispatcher) { - val first = (repository.restoreSavedSession() as RestoredSession.Success).currentUser - val entered = CompletableDeferred() - val pending = CompletableDeferred() - coEvery { users.getCurrentUser() } coAnswers { entered.complete(Unit); pending.await(); successResponse(dto) } - val refresh = async { repository.revalidateSession(first) } - entered.await() - val edited = user.copy( - pin = "4567", - appPreferences = user.appPreferences.copy(preferredAudioLanguage = "nld"), - config = user.config.copy(homeSettingsSource = HomePageSettingsSource.LOCAL), - ) - dao.updateUser(edited) - pending.complete(Unit) - refresh.await() - val expected = edited.copy(name = dto.name) - assertEquals(expected, dao.getUser(server.id, user.id)) - assertEquals(expected, repository.current.value!!.user) - } - - @Test fun anotherUsersResponseCannotRenameTheSavedPerson() = runTest(dispatcher) { - val first = (repository.restoreSavedSession() as RestoredSession.Success).currentUser - coEvery { users.getCurrentUser() } returns successResponse(dto.copy(id = UUID.randomUUID())) - repository.revalidateSession(first) - assertEquals(user, repository.current.value!!.user) - assertNull(repository.currentUserDto) - } -} diff --git a/app/src/test/java/com/github/damontecres/wholphin/test/VersionCompareTests.kt b/app/src/test/java/com/github/damontecres/wholphin/test/VersionCompareTests.kt index fdd45e6a..e7e63acd 100644 --- a/app/src/test/java/com/github/damontecres/wholphin/test/VersionCompareTests.kt +++ b/app/src/test/java/com/github/damontecres/wholphin/test/VersionCompareTests.kt @@ -1,6 +1,5 @@ package com.github.damontecres.wholphin.test -import com.github.damontecres.wholphin.BuildConfig import com.github.damontecres.wholphin.util.Version import org.junit.Assert import org.junit.Test @@ -19,12 +18,6 @@ class VersionCompareTests { val V_0_1_1_5 = Version.fromString("v0.1.1-5-gabc1234") } - @Test - fun optimizedVersionRemainsCompatibleWithUpgradeAndUpdateChecks() { - val optimizedVersion = Version.fromString(requireNotNull(System.getProperty("wolfskin.optimizedVersionName"))) - Assert.assertEquals(Version.fromString(BuildConfig.VERSION_NAME), optimizedVersion) - } - @Test fun testIsAtLeast() { Assert.assertTrue(V_0_2_0.isAtLeast(V_0_2_0)) diff --git a/app/src/test/java/com/github/damontecres/wholphin/ui/TestModule.kt b/app/src/test/java/com/github/damontecres/wholphin/ui/TestModule.kt index 3b4d3efa..b266bb96 100644 --- a/app/src/test/java/com/github/damontecres/wholphin/ui/TestModule.kt +++ b/app/src/test/java/com/github/damontecres/wholphin/ui/TestModule.kt @@ -62,7 +62,6 @@ import org.jellyfin.sdk.api.okhttp.OkHttpFactory import org.jellyfin.sdk.model.ClientInfo import org.jellyfin.sdk.model.DeviceInfo import timber.log.Timber -import org.justinvisser.wolfskin.conductarr.PersistentDns import javax.inject.Singleton @Module @@ -92,11 +91,12 @@ object TestModule { @StandardOkHttpClient @Provides @Singleton - fun okHttpClient(dns: PersistentDns) = AppModule.okHttpClient(dns) - - @Provides - @Singleton - fun dns(@ApplicationContext context: Context): PersistentDns = AppModule.dns(context) + fun okHttpClient() = + OkHttpClient + .Builder() + .apply { + // TODO user agent, timeouts, logging, etc + }.build() @AuthOkHttpClient @Provides diff --git a/app/src/test/java/com/github/damontecres/wholphin/ui/playback/PlayExternalViewModelTest.kt b/app/src/test/java/com/github/damontecres/wholphin/ui/playback/PlayExternalViewModelTest.kt index c6bc32f0..511dbaa2 100644 --- a/app/src/test/java/com/github/damontecres/wholphin/ui/playback/PlayExternalViewModelTest.kt +++ b/app/src/test/java/com/github/damontecres/wholphin/ui/playback/PlayExternalViewModelTest.kt @@ -114,7 +114,6 @@ class PlayExternalViewModelTest { every { api.subtitleApi } returns subtitleApi every { api.playStateApi } returns playStateApi every { serverRepository.currentUser } returns null - every { serverRepository.currentServer } returns null coEvery { userLibraryApi.getItem(movie.id) } returns successResponse(movie) coEvery { streamChoiceService.chooseSource(any(), any()) } returns mediaSource coEvery { streamChoiceService.chooseSubtitleStream(any(), any(), any(), any(), any(), any()) } returns diff --git a/app/src/test/java/com/github/damontecres/wholphin/util/PlaybackWatchStateTest.kt b/app/src/test/java/com/github/damontecres/wholphin/util/PlaybackWatchStateTest.kt deleted file mode 100644 index 73791251..00000000 --- a/app/src/test/java/com/github/damontecres/wholphin/util/PlaybackWatchStateTest.kt +++ /dev/null @@ -1,95 +0,0 @@ -package com.github.damontecres.wholphin.util - -import android.app.Application -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment -import org.robolectric.annotation.Config -import androidx.media3.common.Player -import io.mockk.* -import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.test.* -import org.jellyfin.sdk.api.client.ApiClient -import org.jellyfin.sdk.api.client.extensions.playStateApi -import org.jellyfin.sdk.api.operations.PlayStateApi -import org.jellyfin.sdk.model.api.PlayMethod -import com.github.damontecres.wholphin.ui.successResponse -import org.junit.Assert.* -import org.junit.Test -import java.util.UUID -import org.justinvisser.wolfskin.conductarr.FileCacheStore -import org.justinvisser.wolfskin.conductarr.CacheEntry -import java.io.File - -/** Return refresh waits for the stop write rather than racing its acknowledgement. */ -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [34], application = Application::class) -@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class) -class PlaybackWatchStateTest { - @Test fun revisionAppearsOnlyAfterTheCapturedUsersStopIsAcknowledged() = runTest { - val dispatcher = StandardTestDispatcher(testScheduler) - val previous = WholphinDispatchers.IO - Dispatchers.setMain(dispatcher) - WholphinDispatchers.IO = dispatcher - val api = mockk() - val reports = mockk() - every { api.playStateApi } returns reports - val player = mockk { every { currentPosition } returns 751_246L } - val scope = "server:${UUID.randomUUID()}" - val another = "server:${UUID.randomUUID()}" - val context = RuntimeEnvironment.getApplication() - val cache = FileCacheStore(File(context.filesDir, "wolfskin-library-cache")) - val saved = CacheEntry("old progress", null, 1L, 1L, group = "library") - cache.write(scope, "library:movies", saved) - cache.write(another, "library:movies", saved) - val acknowledgement = CompletableDeferred() - coEvery { reports.reportPlaybackStopped(any()) } coAnswers { - acknowledgement.await() - successResponse(Unit) - } - val state = PlaybackItemState(UUID.randomUUID(), PlayMethod.DIRECT_PLAY) - val listener = TrackActivityPlaybackListener(api, player, onStopped = { PlaybackWatchState.stopped(RuntimeEnvironment.getApplication(), scope) }, getState = { state }) - try { - listener.release() - runCurrent() - assertNull(PlaybackWatchState.revisions.value[scope]) - assertNotNull(cache.read(scope, "library:movies")) - acknowledgement.complete(Unit) - advanceUntilIdle() - assertNotNull(PlaybackWatchState.revisions.value[scope]) - assertNull(PlaybackWatchState.revisions.value[another]) - assertNull(cache.read(scope, "library:movies")) - assertEquals(saved, cache.read(another, "library:movies")) - coVerify(exactly = 1) { reports.reportPlaybackStopped(match { it.itemId == state.itemId && it.positionTicks == 7_512_460_000L }) } - listener.release() - advanceUntilIdle() - coVerify(exactly = 1) { reports.reportPlaybackStopped(any()) } - } finally { - WholphinDispatchers.IO = previous - Dispatchers.resetMain() - } - } - - @Test fun failedStopDoesNotPublishAFictitiousAcknowledgement() = runTest { - val dispatcher = StandardTestDispatcher(testScheduler) - val previous = WholphinDispatchers.IO - Dispatchers.setMain(dispatcher) - WholphinDispatchers.IO = dispatcher - val api = mockk() - val reports = mockk() - every { api.playStateApi } returns reports - coEvery { reports.reportPlaybackStopped(any()) } throws java.io.IOException("Stop rejected") - val scope = "server:${UUID.randomUUID()}" - val listener = TrackActivityPlaybackListener(api, mockk { every { currentPosition } returns 751_246L }, - onStopped = { PlaybackWatchState.stopped(RuntimeEnvironment.getApplication(), scope) }, getState = { PlaybackItemState(UUID.randomUUID(), PlayMethod.DIRECT_PLAY) }) - try { - listener.release() - advanceUntilIdle() - assertNull(PlaybackWatchState.revisions.value[scope]) - } finally { - WholphinDispatchers.IO = previous - Dispatchers.resetMain() - } - } -} diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/ActivityTruthProjectionTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/ActivityTruthProjectionTest.kt deleted file mode 100644 index 89afd29e..00000000 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/ActivityTruthProjectionTest.kt +++ /dev/null @@ -1,74 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -package org.justinvisser.wolfskin.tv - -import kotlinx.serialization.json.Json -import org.junit.Assert.assertFalse -import org.junit.Assert.assertNull -import org.justinvisser.wolfskin.conductarr.model.ReadinessStage -import org.justinvisser.wolfskin.design.ComingInStage -import org.justinvisser.wolfskin.design.ShellPerson -import org.junit.Assert.assertEquals -import org.junit.Test -import org.justinvisser.wolfskin.conductarr.model.ActivityFeed - -/** Recorded history separates acquisition, visibility proof, entitlement and file health. */ -class ActivityTruthProjectionTest { - private val rows = Json { ignoreUnknownKeys = true }.decodeFromString( - javaClass.getResourceAsStream("/conductarr/activity-history.json")!!.bufferedReader().use { it.readText() }).items.orEmpty().associateBy { it.id } - @Test fun recordedHistoryDoesNotClaimActiveWorkOrFailedDownloadsWithoutEvidence() { - val viewer = ShellPerson("justin", "Justin", "J", false) - val expected = mapOf( - "request-2" to "Check needed", // Steins;Gate: represented file, failed visibility proof. - "request-1" to "Check needed", // Yu Yu Hakusho: represented files, failed visibility proof. - "dispatch-732" to "Check needed", // Love is Blind: same proof failure, not failed acquisition. - "dispatch-750" to "In another library", // Spider-Man: Homecoming: held elsewhere. - "dispatch-725" to "Removed", // One Hour Photo: deleted, absent actor. - "dispatch-723" to "Removed", // A historical play is not a current holding. - "dispatch-728" to "Not out yet", // The Body: unreleased. - "dispatch-721" to "File health needs attention", // Avatar: playback fault despite a holding. - "request-8" to "Waiting for a file", // Partition: no active transfer is established. - "dispatch-755" to "Waiting for a file", // Netherlands: primary import not observed. - ) - assertNull(rows.getValue("dispatch-725").comingIn().actor(viewer)) - expected.forEach { (id, label) -> assertEquals(rows.getValue(id).title, label, rows.getValue(id).comingIn().stage.label) } - listOf("request-2", "request-1", "dispatch-732", "dispatch-721").forEach { id -> - val source = rows.getValue(id) - val projected = source.comingIn() - val affected = source.stages.orEmpty().first { it.state == ReadinessStage.State.FAILED } - assertEquals(affected.summary, projected.summary) - assertFalse(projected.readiness[1] == "Failed") - } - } - - @Test fun currentHealthSummaryKeepsEpisodeAndSourceScopeEvenWhenVisibilityIsDone() { - val row = rows.getValue("dispatch-721") - val summary = "S01E15 · primary source: unreadable; S02E08 · mirror source: unreadable." - val projected = row.copy(stages = row.stages.orEmpty().map { - when (it.name) { - ReadinessStage.Name.PLAYBACK -> it.copy(summary = summary) - ReadinessStage.Name.VISIBILITY -> it.copy(state = ReadinessStage.State.DONE) - else -> it - } - }).comingIn() - assertEquals(ComingInStage.FileHealth, projected.stage) - assertEquals(summary, projected.summary) - } - - @Test fun absentTransferEvidenceNeverTurnsInProgressIntoDownloading() { - val row = rows.getValue("request-8") - val projected = row.copy(stages = row.stages.orEmpty().map { - if (it.name == ReadinessStage.Name.ACQUISITION) it.copy(summary = "Dispatch accepted.") else it - }).comingIn() - assertEquals(ComingInStage.Waiting, projected.stage) - } - - @Test fun missingMembershipIsNeutralButProvenReadinessStaysReady() { - val row = rows.getValue("dispatch-725") - val absent = row.copy(stages = row.stages.orEmpty().map { - if (it.name == ReadinessStage.Name.ACQUISITION) it.copy(state = ReadinessStage.State.UNKNOWN, summary = "No current observation.") else it - }) - assertEquals(ComingInStage.NotInLibrary, absent.comingIn().stage) - val ready = rows.values.first { it.stages.orEmpty().any { stage -> stage.name == ReadinessStage.Name.VISIBILITY && stage.state == ReadinessStage.State.DONE } } - assertEquals(ComingInStage.Ready, ready.comingIn().stage) - } -} diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrHomeSurfaceTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrHomeSurfaceTest.kt index 7842289d..c4e63d27 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrHomeSurfaceTest.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrHomeSurfaceTest.kt @@ -52,9 +52,8 @@ class ConductarrHomeSurfaceTest { session.select("${server.id}:${user.id}", SHARED_TOKEN, fake.url) runBlocking { session.authenticate() } val home = mockk() - coEvery { home.readWatch(user.id) } returns HomeLibrary(resume = listOf( + coEvery { home.read(user.id) } returns HomeLibrary(resume = listOf( HomeTitle("00000000-0000-0000-0000-000000000010", "Jellyfin held item", "movie", held = true))) - coEvery { home.readLibrary(user.id) } returns HomeLibrary() val cache = mockk(relaxed = true) every { cache.read(any()) } returns null val model = WolfskinHomeViewModel(rule.activity, home, cache, NavigationManager(), WolfskinSeeAllLists(), session) diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrProjectionTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrProjectionTest.kt index 7fcdf8c4..b5be3c2b 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrProjectionTest.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrProjectionTest.kt @@ -41,6 +41,7 @@ class ConductarrProjectionTest { assertEquals(ComingInStage.Downloading, request.stage) assertEquals("Mindel", request.requesterName) assertEquals("Shared", request.actor(ShellPerson("shared", "Shared", "S", true))) + assertEquals(1, requests.openCount) } } } diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrTruthCaptureTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrTruthCaptureTest.kt deleted file mode 100644 index 41d4fffb..00000000 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/ConductarrTruthCaptureTest.kt +++ /dev/null @@ -1,105 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -package org.justinvisser.wolfskin.tv - -import android.app.Application -import android.view.View -import android.view.WindowManager -import androidx.activity.ComponentActivity -import androidx.compose.foundation.layout.requiredSize -import androidx.compose.ui.Modifier -import androidx.compose.ui.test.junit4.createAndroidComposeRule -import androidx.compose.ui.test.onRoot -import androidx.compose.ui.test.assertCountEquals -import androidx.compose.ui.test.assertIsDisplayed -import androidx.compose.ui.test.onAllNodesWithText -import androidx.compose.ui.test.onNodeWithText -import com.github.takahirom.roborazzi.captureRoboImage -import java.io.File -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.last -import kotlinx.coroutines.runBlocking -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith -import org.justinvisser.wolfskin.conductarr.ConductarrClient -import org.justinvisser.wolfskin.conductarr.MemoryCacheStore -import org.justinvisser.wolfskin.design.* -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config -import org.robolectric.annotation.GraphicsMode - -/** Native frames exercise recorded activity and Mindel's feed through the shipped provider. */ -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [34], application = Application::class, qualifiers = "w960dp-h540dp-xhdpi") -@GraphicsMode(GraphicsMode.Mode.NATIVE) -class ConductarrTruthCaptureTest { - @get:Rule val rule = createAndroidComposeRule() - private val people = listOf(ShellPerson("justin", "Justin", "J", false), ShellPerson("mindel", "Mindel", "M", false)) - - @Before fun fullscreen() { - rule.activity.window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN) - @Suppress("DEPRECATION") - rule.activity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY - } - - @Test fun requestHistory() = requests("requests-history", "request-2") - @Test fun requestHealth() = requests("requests-health", "dispatch-721", expanded = true) - @Test fun requestProofDetails() = requests("requests-proof", "request-2", expanded = true) - @Test fun requestRemoved() = requests("requests-removed", "dispatch-725") - @Test fun discoverMovies() = discover("movie") - @Test fun discoverSeries() = discover("tv") - - private fun requests(name: String, focused: String, expanded: Boolean = false) { - FakeConductarr().use { fake -> - fake.activityBody = resource("activity-history.json") - ConductarrClient(fake.url, JUSTIN_TOKEN, MemoryCacheStore()).use { client -> - val snapshot = runBlocking { ConductarrProvider(client).requests().last() }.let { it.copy(items = it.items.map { row -> row.copy(poster = null) }) } - val shell = ShellState(people, "justin").apply { - pickerVisible = false - enterDestination("settings") - requests.update(snapshot) - openRequests() - requests.focus(focused) - if (expanded) requests.key(ShellKey.Right) - } - rule.setContent { WolfskinTheme { ShellSurface(shell, Modifier.requiredSize(WolfskinTokens.Shell.stageWidth, WolfskinTokens.Shell.stageHeight)) } } - capture(name) - rule.onAllNodesWithText("by Unknown", substring = true).assertCountEquals(0) - rule.onNodeWithText("Requests · 56 requests").assertExists() - if (expanded) rule.onNodeWithText(snapshot.items.first { it.id == focused }.summary!!).assertIsDisplayed() - } - } - } - - private fun discover(type: String) { - FakeConductarr().use { fake -> - fake.feedBody = resource("mindel-feed.json") - ConductarrClient(fake.url, MINDEL_TOKEN, MemoryCacheStore()).use { client -> - val provider = ConductarrProvider(client) - val snapshot = runBlocking { provider.discover("mindel").last() }.let { original -> - fun noArt(title: DiscoverTitle) = title.copy(poster = null, backdrop = null) - original.copy(picks = original.picks.map(::noArt), seeds = original.seeds.map { it.copy(items = it.items.map(::noArt)) }) - } - val shell = ShellState(people, "mindel").apply { pickerVisible = false; enterDestination("discover") } - val operator = runBlocking { (client.read(org.justinvisser.wolfskin.conductarr.TvRoutes.operator()).last() as org.justinvisser.wolfskin.conductarr.ReadResult.Value).saved.value } - val state = DiscoverState(shell, snapshot, provider.operations(requireNotNull(operator)), CoroutineScope(Dispatchers.Main.immediate)) - state.filter = type - state.focus(state.firstShelf + state.lanes.indexOfFirst { it.title.startsWith("Because you watched") }, 0) - rule.setContent { WolfskinTheme { ShellSurface(shell, Modifier.requiredSize(WolfskinTokens.Shell.stageWidth, WolfskinTokens.Shell.stageHeight)) { DiscoverScreen(state, it) } } } - capture("discover-$type") - rule.onNodeWithText(if (type == "tv") "Because you watched Gilmore Girls" else "Because you watched Locke").assertIsDisplayed() - } - } - } - - private fun capture(name: String) { - rule.mainClock.advanceTimeBy(1000) - rule.waitForIdle() - val directory = File(requireNotNull(System.getProperty("wolfskin.captureDirectory")), "truth").apply { mkdirs() } - rule.onRoot().captureRoboImage(File(directory, "$name.png").absolutePath) - } - - private fun resource(name: String) = javaClass.getResourceAsStream("/conductarr/$name")!!.bufferedReader().use { it.readText() } -} diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/DiscoverSeedProjectionTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/DiscoverSeedProjectionTest.kt deleted file mode 100644 index 0bd5e342..00000000 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/DiscoverSeedProjectionTest.kt +++ /dev/null @@ -1,37 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -package org.justinvisser.wolfskin.tv - -import kotlinx.coroutines.flow.last -import kotlinx.coroutines.runBlocking -import kotlinx.serialization.json.* -import org.junit.Assert.* -import org.junit.Test -import org.justinvisser.wolfskin.conductarr.ConductarrClient -import org.justinvisser.wolfskin.conductarr.MemoryCacheStore - -/** Equal captions are not equal seed identities; repeated contributions union their evidence. */ -class DiscoverSeedProjectionTest { - @Test fun seedIdentitySurvivesTitleCollisionsAndWatchEvidenceAcrossCandidates() = runBlocking { - FakeConductarr().use { fake -> - val feed = fake.wire.getValue("feed").jsonObject - val candidate = feed.getValue("movies").jsonArray.first().jsonObject - val first = JsonObject(candidate + ("contributions" to Json.parseToJsonElement("""[ - {"media_type":"movie","tmdb_id":1,"title":"Same title","watched":true,"added":false}, - {"media_type":"tv","tmdb_id":1,"title":"Same title","watched":false,"added":true}, - {"media_type":"movie","tmdb_id":2,"watched":true,"added":false} - ]"""))) - val second = JsonObject(candidate + mapOf("tmdb_id" to JsonPrimitive(43), "contributions" to Json.parseToJsonElement("""[ - {"media_type":"movie","tmdb_id":1,"title":"Renamed seed","watched":false,"added":true} - ]"""))) - fake.feedBody = JsonObject(feed + ("movies" to JsonArray(listOf(first, second)))).toString() - ConductarrClient(fake.url, MINDEL_TOKEN, MemoryCacheStore()).use { client -> - val seeds = ConductarrProvider(client).discover("mindel").last().seeds - assertEquals(listOf("movie:1", "tv:1"), seeds.map { it.key }) - assertEquals(listOf(42L, 43L), seeds.first().items.map { it.tmdb }) - assertTrue(seeds.first().watched && seeds.first().added) - assertFalse(seeds.last().watched) - assertTrue(seeds.last().added) - } - } - } -} diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/DiscoverSkeletonKeysTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/DiscoverSkeletonKeysTest.kt deleted file mode 100644 index 9dc1786b..00000000 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/DiscoverSkeletonKeysTest.kt +++ /dev/null @@ -1,51 +0,0 @@ -package org.justinvisser.wolfskin.tv - -import android.app.Application -import androidx.activity.ComponentActivity -import androidx.compose.ui.input.key.Key -import androidx.compose.ui.test.junit4.createAndroidComposeRule -import androidx.compose.ui.test.onNodeWithTag -import androidx.compose.ui.test.performKeyInput -import androidx.compose.ui.test.pressKey -import io.mockk.mockk -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import org.junit.Assert.* -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith -import org.justinvisser.wolfskin.design.* -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config - -/** A pending shelf cannot capture the D-pad or break the shell's Back ladder. */ -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [34], application = Application::class, qualifiers = "w960dp-h540dp-xhdpi") -class DiscoverSkeletonKeysTest { - @get:Rule val rule = createAndroidComposeRule() - - @Test fun downAndUpSkipPendingLanesAndBackReturnsToNavWhenOnlySkeletonsRemain() { - val shell = ShellState(listOf(ShellPerson("justin", "Justin", "J", false)), "justin").apply { - pickerVisible = false; pickerLaunch = false; enterDestination("discover") - } - val pending = DiscoverLane("pending", "Pending", emptyList(), pending = true) - val ready = DiscoverLane("ready", "Available", listOf(DiscoverTitle(1, "movie", "A real title"))) - val snapshot = DiscoverSnapshot(status = DiscoverStatus.Ready, lanes = listOf(pending, ready)) - val state = DiscoverState(shell, snapshot, mockk(relaxed = true), CoroutineScope(Dispatchers.Main.immediate), {}, {}) - state.focus(1) - rule.setContent { WolfskinTheme { ShellSurface(shell) { DiscoverScreen(state, it) } } } - press(Key.DirectionDown) - rule.runOnIdle { assertEquals("ready", state.focusedLane?.id); assertEquals("ready:0", state.cardKey) } - press(Key.DirectionUp) - rule.runOnIdle { - assertEquals(1, state.focusedRow) - state.updateSnapshot(snapshot.copy(lanes = listOf(pending))) - } - press(Key.DirectionDown) - rule.runOnIdle { assertEquals(1, state.focusedRow); assertNull(state.cardKey) } - press(Key.Back) - rule.runOnIdle { assertTrue(shell.navFocused); assertFalse(shell.pickerVisible); assertEquals("discover", shell.route) } - } - - private fun press(key: Key) { rule.onNodeWithTag("wolfskin-shell").performKeyInput { pressKey(key) } } -} diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/FakeConductarr.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/FakeConductarr.kt index 647b0388..f741223e 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/FakeConductarr.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/FakeConductarr.kt @@ -29,8 +29,6 @@ internal class FakeConductarr : Closeable { @Volatile var localArt = false @Volatile var beforeResponse: ((String) -> Unit)? = null @Volatile var audiencesBody: String? = null - @Volatile var feedBody: String? = null - @Volatile var activityBody: String? = null private val imageBytes = java.util.Base64.getDecoder().decode( "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+jYioAAAAASUVORK5CYII=") @@ -71,8 +69,6 @@ internal class FakeConductarr : Closeable { if (key == "ratings" && ratingsStatus != 200) return response("", ratingsStatus) if (key == "audiences" && audiencesStatus != 200) return response("", audiencesStatus) if (key == "audiences") audiencesBody?.let { return response(it) } - if (key == "feed") feedBody?.let { return response(it) } - if (key == "activity") activityBody?.let { return response(it) } if (notModified && request.headers["If-None-Match"] != null) return response("", 304) if (key == "requests" && !existingRequests) return response("{\"requests\":[]}") var body = wire.getValue(key).jsonObject diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/FirstSignInNavigationTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/FirstSignInNavigationTest.kt index 07cd1e37..aa1faf95 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/FirstSignInNavigationTest.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/FirstSignInNavigationTest.kt @@ -84,7 +84,7 @@ class FirstSignInNavigationTest { coEvery { views.getUserViews(userId = user.id) } returns successQueryResult(listOf(movies, shows)) for ((library, kind, count) in listOf(Triple(movies, BaseItemKind.MOVIE, 6), Triple(shows, BaseItemKind.SERIES, 29))) { coEvery { items.getItems(userId = user.id, parentId = library.id, recursive = true, - includeItemTypes = listOf(kind), fields = listOf(ItemFields.PROVIDER_IDS, ItemFields.DATE_CREATED), + includeItemTypes = listOf(kind), fields = listOf(ItemFields.PROVIDER_IDS, ItemFields.SORT_NAME, ItemFields.DATE_CREATED), sortBy = listOf(ItemSortBy.SORT_NAME), startIndex = 0, limit = 200) } returns successQueryResult( List(count) { BaseItemDto(id = UUID.randomUUID(), name = "${library.name} title $it", type = kind) }) } diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/HomeRecoveryTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/HomeRecoveryTest.kt index 128dae1e..dc0b780d 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/HomeRecoveryTest.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/HomeRecoveryTest.kt @@ -43,13 +43,11 @@ class HomeRecoveryTest { val started = CompletableDeferred() val response = CompletableDeferred() val facade = mockk() - coEvery { facade.readWatch(personA.id) } coAnswers { started.complete(Unit); response.await() } - coEvery { facade.readLibrary(any()) } returns HomeLibrary() + coEvery { facade.read(personA.id) } coAnswers { started.complete(Unit); response.await() } val model = WolfskinHomeViewModel(context, facade, cache, NavigationManager(), WolfskinSeeAllLists(), ConductarrSession(org.justinvisser.wolfskin.conductarr.MemoryCacheStore())) val refresh = async(Dispatchers.IO) { model.loadLibrary(server, personA, viewerA, retry = true) } started.await() assertEquals(film.id, model.snapshot.rows.first().cards.first().id) - assertFalse(model.snapshot.rows.first().watchReady) response.completeExceptionally(IOException("fixture offline")) refresh.await() assertFalse(model.snapshot.jellyfinAvailable) @@ -64,9 +62,8 @@ class HomeRecoveryTest { cache.write("${server.id}:${personA.id}", library, 1000L) val startedA = CompletableDeferred() val responseA = CompletableDeferred() - coEvery { facade.readWatch(personA.id) } coAnswers { startedA.complete(Unit); responseA.await() } - coEvery { facade.readWatch(personB.id) } throws IOException("fixture offline") - coEvery { facade.readLibrary(any()) } returns HomeLibrary() + coEvery { facade.read(personA.id) } coAnswers { startedA.complete(Unit); responseA.await() } + coEvery { facade.read(personB.id) } throws IOException("fixture offline") val model = WolfskinHomeViewModel(context, facade, cache, NavigationManager(), WolfskinSeeAllLists(), ConductarrSession(org.justinvisser.wolfskin.conductarr.MemoryCacheStore())) val requestA = async(Dispatchers.IO) { model.loadLibrary(server, personA, viewerA) } startedA.await() @@ -83,8 +80,7 @@ class HomeRecoveryTest { @Test fun readableJellyfinDoesNotBecomeAnOutageWhenLocalCacheCannotBeWritten() = runBlocking { val facade = mockk() - coEvery { facade.readWatch(personA.id) } returns library - coEvery { facade.readLibrary(any()) } returns HomeLibrary() + coEvery { facade.read(personA.id) } returns library val cache = mockk() every { cache.read(any()) } returns null every { cache.write(any(), any(), any()) } throws IOException("fixture disk full") @@ -97,8 +93,7 @@ class HomeRecoveryTest { @Test fun renamedHouseholdProfileKeepsItsOwnJellyfinLibraryWithoutAConductarrIdentity() = runBlocking { val facade = mockk() - coEvery { facade.readWatch(personA.id) } returns library - coEvery { facade.readLibrary(any()) } returns HomeLibrary() + coEvery { facade.read(personA.id) } returns library val cache = mockk(relaxed = true) every { cache.read(any()) } returns null val model = WolfskinHomeViewModel(context, facade, cache, NavigationManager(), WolfskinSeeAllLists(), ConductarrSession(org.justinvisser.wolfskin.conductarr.MemoryCacheStore())) diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/LibraryReadFacadeTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/LibraryReadFacadeTest.kt index a2fb8b0d..92afbe07 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/LibraryReadFacadeTest.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/LibraryReadFacadeTest.kt @@ -51,7 +51,7 @@ class LibraryReadFacadeTest { val offsets = mutableListOf() coEvery { items.getItems(userId = user, parentId = library.id, recursive = true, includeItemTypes = listOf(BaseItemKind.MOVIE), - fields = listOf(ItemFields.PROVIDER_IDS, ItemFields.DATE_CREATED), + fields = listOf(ItemFields.PROVIDER_IDS, ItemFields.SORT_NAME, ItemFields.DATE_CREATED), sortBy = listOf(ItemSortBy.SORT_NAME), startIndex = capture(offsets), limit = 200) } coAnswers { if (offsets.last() == 0) successQueryResult(firstChunk, 202) else { assertEquals(200, offsets.last()) diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/LibrarySnapshotStoreTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/LibrarySnapshotStoreTest.kt index 4e2917c3..279c3966 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/LibrarySnapshotStoreTest.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/LibrarySnapshotStoreTest.kt @@ -48,21 +48,6 @@ class LibrarySnapshotStoreTest { assertFalse(reads.last().unreachable) } - @Test fun acknowledgedPlaybackInvalidatesOnlyOlderWatchSnapshotsBeforeTheTtl() = runBlocking { - var now = 1000L - val store = LibrarySnapshotStore(MemoryCacheStore()) { now } - val old = listOf(LibraryTitle("film", "Film", "movie", progress = .1f)) - store.read("server:justin", "movies") { flowOf(old) }.toList() - store.read("server:mindel", "movies") { flowOf(old) }.toList() - now = 1002L - val updated = listOf(old.single().copy(progress = .6f)) - val reads = store.read("server:justin", "movies", invalidatedAtMillis = 1001L) { flowOf(updated) }.toList() - assertEquals(.1f, reads.first().items.single().progress) - assertEquals(.6f, reads.last().items.single().progress) - assertEquals(updated, store.read("server:justin", "movies", invalidatedAtMillis = 1001L) { error("Already revalidated") }.toList().single().items) - assertEquals(old, store.read("server:mindel", "movies") { error("Other viewer stays cached") }.toList().single().items) - } - @Test fun failedLaterChunkKeepsTheCompleteSavedCopyOrTheColdPartialWithoutSavingIt() = runBlocking { val partial = listOf(LibraryTitle("partial", "First film", "movie")) val complete = partial + LibraryTitle("last", "Last film", "movie") diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/PersonPickerSessionTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/PersonPickerSessionTest.kt deleted file mode 100644 index 95fcbb52..00000000 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/PersonPickerSessionTest.kt +++ /dev/null @@ -1,159 +0,0 @@ -package org.justinvisser.wolfskin.tv - -import android.app.Application -import android.os.Looper -import androidx.activity.ComponentActivity -import androidx.compose.runtime.* -import androidx.compose.ui.input.key.Key -import androidx.compose.ui.test.* -import androidx.compose.ui.test.junit4.createAndroidComposeRule -import androidx.lifecycle.viewModelScope -import com.github.damontecres.wholphin.data.CurrentUser -import com.github.damontecres.wholphin.data.ServerRepository -import com.github.damontecres.wholphin.data.model.* -import com.github.damontecres.wholphin.preferences.AppPreferences -import com.github.damontecres.wholphin.preferences.UserPreferences -import com.github.damontecres.wholphin.services.NavigationManager -import com.github.damontecres.wholphin.services.SetupDestination -import com.github.damontecres.wholphin.services.SetupNavigationManager -import io.mockk.* -import java.util.UUID -import kotlinx.coroutines.Job -import kotlinx.coroutines.cancel -import org.junit.After -import org.junit.Assert.* -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith -import org.justinvisser.wolfskin.conductarr.MemoryCacheStore -import org.justinvisser.wolfskin.design.* -import org.justinvisser.wolfskin.tv.read.LibraryReadFacade -import org.robolectric.RobolectricTestRunner -import org.robolectric.Shadows -import org.robolectric.annotation.Config - -/** A selected identity gets a new app ViewModel without opening a second launch picker. */ -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [34], application = Application::class, qualifiers = "w960dp-h540dp-xhdpi") -class PersonPickerSessionTest { - @get:Rule val rule = createAndroidComposeRule() - private lateinit var previousUrl: String - private var previousFixtures = false - private var previousScreens = true - private val models = mutableListOf() - private lateinit var session: WolfskinSession - - @Before fun capturePreferences() { - ConductarrPreference.initialize(rule.activity) - WolfskinScreenPreference.initialize(rule.activity) - previousUrl = ConductarrPreference.baseUrl - previousFixtures = ConductarrPreference.fixtures - previousScreens = WolfskinScreenPreference.enabled - ConductarrPreference.updateFixtures(false) - WolfskinScreenPreference.enabled = true - } - - @After fun restorePreferences() { - models.forEach { it.viewModelScope.cancel() } - ConductarrPreference.updateBaseUrl(previousUrl) - ConductarrPreference.updateFixtures(previousFixtures) - WolfskinScreenPreference.enabled = previousScreens - } - - private fun select(initial: Int, selected: Int, fromAvatar: Boolean = false, fast: Boolean = false, moves: List = emptyList()) { - FakeConductarr().use { fake -> - ConductarrPreference.updateBaseUrl(fake.url) - ConductarrSession(MemoryCacheStore()).use { conductarr -> - val server = JellyfinServer(UUID.randomUUID(), "Jellyfin", fake.url, null) - val users = listOf("Justin" to JUSTIN_TOKEN, "Mindel" to MINDEL_TOKEN, "Shared" to SHARED_TOKEN).map { (name, token) -> - JellyfinUser(id = UUID.randomUUID(), serverId = server.id, name = name, accessToken = token) - } - var current by mutableStateOf(CurrentUser(server, users[initial])) - val repository = mockk(relaxed = true) - coEvery { repository.serverDao.getServer(server.id) } returns JellyfinServerUsers(server, users) - coEvery { repository.changeUser(server, any()) } coAnswers { CurrentUser(server, secondArg()) } - val setup = mockk(relaxed = true) - every { setup.navigateTo(any()) } answers { current = (firstArg() as SetupDestination.AppContent).current } - val libraries = mockk(relaxed = true) - coEvery { libraries.readDestinations(any()) } returns emptyMap() - coEvery { libraries.hasAnimeTitles(any()) } returns false - session = WolfskinSession() - try { - rule.setContent { - key(current.user.id) { - val navigation = remember { NavigationManager() } - val model = remember { - WolfskinShellViewModel(rule.activity, session, repository, navigation, setup, mockk(relaxed = true), - libraries, WolfskinSeeAllLists(), conductarr, mockk(relaxed = true)).also { models.add(it) } - } - DisposableEffect(model) { onDispose { model.viewModelScope.cancel() } } - WolfskinApp(server, current.user, navigation, UserPreferences(AppPreferences.getDefaultInstance(), null), - viewModel = model, homeContent = { _, _, user, modifier -> - androidx.tv.material3.Text("Home for ${user.name}", modifier) - }) - } - } - awaitLoaded(users[initial]) - if (fromAvatar) { - press(listOf(Key.DirectionCenter)) - press(listOf(Key.DirectionUp, Key.DirectionLeft, Key.DirectionCenter)) - } - val actions = mutableListOf() - rule.runOnIdle { - val dispatch = session.onAction - session.onAction = { action -> - if (action is ShellAction.Person) actions.add(action) - dispatch(action) - } - } - if (fast) press(moves + Key.DirectionCenter) else { - press(moves) - press(listOf(Key.DirectionCenter)) - } - awaitLoaded(users[selected]) - rule.runOnIdle { - assertFalse("The replacement app must not reopen the picker after one OK", session.state!!.pickerVisible) - assertEquals("home", session.state!!.route) - assertEquals(users[selected].id.toString(), session.state!!.person.jellyfinUserId) - assertEquals(listOf(users[selected].id.toString()), actions.map { it.person.jellyfinUserId }) - assertEquals(if (initial == selected) 1 else 2, models.size) - } - rule.onNodeWithText("Home for ${users[selected].name}").assertIsDisplayed() - } finally { models.forEach { it.viewModelScope.cancel() } } - } - } - } - - private fun awaitLoaded(user: JellyfinUser) { - try { - rule.waitUntil(10_000) { - // Setup navigation writes Compose state asynchronously; publish it before pumping replacement composition. - androidx.compose.runtime.snapshots.Snapshot.sendApplyNotifications() - Shadows.shadowOf(Looper.getMainLooper()).idle() - models.lastOrNull()?.signedInPerson == user.name!!.lowercase() && - models.last().conductarr.identity.value?.signedIn == true && - models.last().conductarr.identity.value?.person?.endsWith(":${user.id}") == true && - session.state?.people?.size == 3 && - models.last().viewModelScope.coroutineContext[Job]!!.children.none { it.isActive } - } - } catch (timeout: ComposeTimeoutException) { - throw AssertionError("Expected ${user.name}; models=${models.size}, signedIn=${models.last().signedInPerson}, " + - "identity=${models.last().conductarr.identity.value?.person}, picker=${session.state?.pickerVisible}, " + - "person=${session.state?.person}, people=${session.state?.people?.size}", timeout) - } - rule.waitForIdle() - } - - private fun press(keys: List) { - rule.onNodeWithTag("wolfskin-shell").performKeyInput { keys.forEach { pressKey(it) } } - } - - @Test fun launchRightThenOneOkKeepsPickerClosed() = select(0, 1, moves = listOf(Key.DirectionRight)) - @Test fun launchLeftThenOneOkKeepsPickerClosed() = select(1, 0, moves = listOf(Key.DirectionLeft)) - @Test fun avatarRightThenOneOkKeepsPickerClosed() = select(0, 1, fromAvatar = true, moves = listOf(Key.DirectionRight)) - @Test fun avatarLeftThenOneOkKeepsPickerClosed() = select(1, 0, fromAvatar = true, moves = listOf(Key.DirectionLeft)) - @Test fun initialPersonNeedsOnlyOneOk() = select(0, 0) - @Test fun gearAndBackThenOneOkKeepsPickerClosed() = select(0, 2, moves = listOf(Key.DirectionRight, Key.DirectionRight, Key.DirectionDown, Key.DirectionUp)) - @Test fun fastLeftLeftOkKeepsPickerClosed() = select(2, 0, fast = true, moves = listOf(Key.DirectionLeft, Key.DirectionLeft)) -} diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/PersonSwitchThreadingTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/PersonSwitchThreadingTest.kt index 6a5936f8..20ea6d9b 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/PersonSwitchThreadingTest.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/PersonSwitchThreadingTest.kt @@ -214,9 +214,8 @@ class PersonSwitchThreadingTest { every { repository.currentUser } returns user every { repository.currentServer } returns server val home = mockk() - coEvery { home.readWatch(user.id) } returns org.justinvisser.wolfskin.design.HomeLibrary(resume = listOf( + coEvery { home.read(user.id) } returns org.justinvisser.wolfskin.design.HomeLibrary(resume = listOf( org.justinvisser.wolfskin.design.HomeTitle("justin-film", "Justin film", "movie", held = true))) - coEvery { home.readLibrary(user.id) } returns org.justinvisser.wolfskin.design.HomeLibrary() val cache = mockk(relaxed = true) every { cache.read(any()) } returns null val homeModel = WolfskinHomeViewModel(context, home, cache, mockk(relaxed = true), WolfskinSeeAllLists(), conductarr) diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/PlaybackUserData.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/PlaybackUserData.kt deleted file mode 100644 index b8e86ca0..00000000 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/PlaybackUserData.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.justinvisser.wolfskin.tv - -import org.jellyfin.sdk.model.api.UserItemDataDto -import java.util.UUID - -/** Checkpoints use the SDK's required identity and watch fields. */ -internal fun playbackUserData(itemId: UUID, ticks: Long, played: Boolean = false, playCount: Int = 0): UserItemDataDto = - UserItemDataDto(playbackPositionTicks = ticks, playCount = playCount, isFavorite = false, - lastPlayedDate = null, played = played, key = "", itemId = itemId) diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/PlayerHandoffTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/PlayerHandoffTest.kt index dca356a7..92c0a248 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/PlayerHandoffTest.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/PlayerHandoffTest.kt @@ -58,7 +58,7 @@ class PlayerHandoffTest { @Test fun failedPlaybackReadLeavesSavedHomeFocusedAndDrawsTheExactOfflineToast() { val snapshot = HomeFixture(rule.activity).snapshot("mindel", "offline") val title = snapshot.rows.first().cards.first() - coEvery { facade.preparePlayback(user.id, title) } throws IOException("fixture offline") + coEvery { facade.playableId(user.id, title) } throws IOException("fixture offline") rule.setContent { WolfskinTheme { ShellSurface(shell, Modifier.requiredSize(WolfskinTokens.Shell.stageWidth, WolfskinTokens.Shell.stageHeight)) { modifier -> HomeScreen(shell, snapshot, modifier) { model.act(it, shell, server, user) } @@ -80,16 +80,14 @@ class PlayerHandoffTest { @Test fun successfulPlaybackUsesTheRealFullscreenDestinationAndBackKeepsTheResumeCard() { val title = HomeFixture(rule.activity).snapshot("mindel").rows.first().cards.first() val id = UUID.fromString("00000000-0000-0000-0000-000000000003") - coEvery { facade.preparePlayback(user.id, title) } returns org.jellyfin.sdk.model.api.BaseItemDto( - id = id, type = org.jellyfin.sdk.model.api.BaseItemKind.EPISODE, - userData = playbackUserData(id, 11_362_740_000L, playCount = 2)) + coEvery { facade.playableId(user.id, title) } returns id val view = shell.view view.cards["hero"] = 0 - rule.runOnIdle { model.act(HomeAction.Play(title), shell, server, user) } + rule.runOnIdle { model.act(HomeAction.Play(title, resume = true), shell, server, user) } awaitModel { navigation.backStack.last() is Destination.Playback } val destination = navigation.backStack.last() as Destination.Playback assertEquals(id, destination.itemId) - assertEquals(1_136_274L, destination.positionMs) + assertEquals((title.resumeSeconds * 1000).toLong(), destination.positionMs) assertTrue(destination.fullScreen) navigation.goBack() assertTrue(navigation.backStack.single() is Destination.Home) @@ -101,11 +99,11 @@ class PlayerHandoffTest { @Test fun anotherPersonsSessionCannotResolveOrStartPlayback() { val title = HomeFixture(rule.activity).snapshot("mindel").rows.first().cards.first() val otherUser = user.copy(name = "Justin") - rule.runOnIdle { model.act(HomeAction.Play(title), shell, server, otherUser) } + rule.runOnIdle { model.act(HomeAction.Play(title, resume = true), shell, server, otherUser) } awaitModel { model.toast != null } assertEquals(RecoveryMessage.PlaybackUnavailable, model.toast) assertTrue(navigation.backStack.single() is Destination.Home) - coVerify(exactly = 0) { facade.preparePlayback(any(), any()) } + coVerify(exactly = 0) { facade.playableId(any(), any()) } } private fun awaitModel(condition: () -> Boolean) { rule.waitUntil(5000) { diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/SavedPeoplePickerTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/SavedPeoplePickerTest.kt deleted file mode 100644 index 1fb29d31..00000000 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/SavedPeoplePickerTest.kt +++ /dev/null @@ -1,92 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -package org.justinvisser.wolfskin.tv - -import android.app.Application -import androidx.activity.ComponentActivity -import androidx.compose.ui.test.assertIsDisplayed -import androidx.compose.ui.test.junit4.createAndroidComposeRule -import androidx.compose.ui.test.onNodeWithText -import androidx.compose.ui.test.onRoot -import com.github.takahirom.roborazzi.captureRoboImage -import java.io.File -import androidx.lifecycle.viewModelScope -import com.github.damontecres.wholphin.data.ServerRepository -import com.github.damontecres.wholphin.data.model.JellyfinServer -import com.github.damontecres.wholphin.data.model.JellyfinServerUsers -import com.github.damontecres.wholphin.data.model.JellyfinUser -import com.github.damontecres.wholphin.preferences.AppPreferences -import com.github.damontecres.wholphin.preferences.UserPreferences -import com.github.damontecres.wholphin.services.NavigationManager -import io.mockk.coEvery -import io.mockk.mockk -import java.util.UUID -import java.util.concurrent.CountDownLatch -import java.util.concurrent.atomic.AtomicBoolean -import kotlinx.coroutines.cancel -import org.junit.Assert.* -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith -import org.justinvisser.wolfskin.conductarr.MemoryCacheStore -import org.justinvisser.wolfskin.design.PeopleStatus -import org.justinvisser.wolfskin.tv.read.LibraryReadFacade -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config -import org.robolectric.annotation.GraphicsMode - -/** The actual picker displays every saved login while household revalidation has no response. */ -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [34], application = Application::class, qualifiers = "w960dp-h540dp-xhdpi") -@GraphicsMode(GraphicsMode.Mode.NATIVE) -class SavedPeoplePickerTest { - @get:Rule val rule = createAndroidComposeRule() - - @Test fun savedPeopleAreVisibleBeforeTheFirstNetworkResponse() { - ConductarrPreference.initialize(rule.activity) - val previousUrl = ConductarrPreference.baseUrl - val previousFixtures = ConductarrPreference.fixtures - val release = CountDownLatch(1) - val entered = AtomicBoolean(false) - FakeConductarr().use { fake -> - fake.beforeResponse = { entered.set(true); release.await() } - ConductarrPreference.updateBaseUrl(fake.url) - ConductarrPreference.updateFixtures(false) - ConductarrSession(MemoryCacheStore()).use { conductarr -> - val server = JellyfinServer(UUID.randomUUID(), "Saved server", fake.url, null) - val users = listOf("Justin" to JUSTIN_TOKEN, "Mindel" to MINDEL_TOKEN, "Shared" to SHARED_TOKEN).map { (name, token) -> - JellyfinUser(id = UUID.randomUUID(), serverId = server.id, name = name, accessToken = token) - } - val repository = mockk(relaxed = true) - coEvery { repository.serverDao.getServer(server.id) } returns JellyfinServerUsers(server, users) - val libraries = mockk(relaxed = true) - coEvery { libraries.readDestinations(any()) } returns emptyMap() - val session = WolfskinSession() - val navigation = NavigationManager() - val model = WolfskinShellViewModel(rule.activity, session, repository, navigation, mockk(relaxed = true), - mockk(relaxed = true), libraries, WolfskinSeeAllLists(), conductarr, mockk(relaxed = true)) - try { - rule.setContent { - WolfskinApp(server, users.first(), navigation, UserPreferences(AppPreferences.getDefaultInstance(), null), - viewModel = model, homeContent = { _, _, _, _ -> }) - } - rule.waitUntil(5_000) { entered.get() && session.state?.people?.size == 3 } - users.forEach { rule.onNodeWithText(it.name!!).assertIsDisplayed() } - rule.runOnIdle { - assertTrue(session.state!!.pickerVisible) - assertEquals(PeopleStatus.Ready, session.state!!.peopleStatus) - assertEquals(users.map { it.id.toString() }, session.state!!.people.map { it.jellyfinUserId }) - assertEquals(listOf("justin", "mindel", "shared"), session.state!!.people.map { it.key }) - assertEquals(1L, release.count) - } - val captures = File(requireNotNull(System.getProperty("wolfskin.captureDirectory"))).apply { mkdirs() } - rule.onRoot().captureRoboImage(File(captures, "saved-people-before-network.png")) - } finally { - release.countDown() - model.viewModelScope.cancel() - ConductarrPreference.updateBaseUrl(previousUrl) - ConductarrPreference.updateFixtures(previousFixtures) - } - } - } - } -} diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/TitleKeysTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/TitleKeysTest.kt index 0b6dac33..6df8426d 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/TitleKeysTest.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/TitleKeysTest.kt @@ -11,9 +11,6 @@ import androidx.compose.ui.test.pressKey import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performMouseInput import androidx.compose.ui.test.onNodeWithText -import androidx.compose.ui.test.assertIsDisplayed -import androidx.compose.ui.test.hasClickAction -import androidx.compose.ui.test.hasText import androidx.compose.ui.test.performSemanticsAction import androidx.compose.ui.semantics.SemanticsActions import androidx.compose.ui.text.TextLayoutResult @@ -65,27 +62,6 @@ class TitleKeysTest { } } } - @Test fun downFocusesThePlayableLaterSeasonAndScrollsItIntoViewWithoutLosingBrowsingMemory() { - render("Andor") { page -> - page.copy(item = page.item.copy(seasons = 30), seasonNumbers = (1..30).toList(), selectedSeason = 29, - playTarget = page.playTarget!!.copy(season = 29)) - } - press(Key.DirectionDown) - assertEquals("seasons", state.row) - assertEquals(28, state.column) - rule.onNode(hasText("Season 29") and hasClickAction()).assertIsDisplayed() - press(Key.DirectionLeft) - assertEquals(27, state.column) - rule.onNode(hasText("Season 28") and hasClickAction()).assertIsDisplayed() - press(Key.DirectionUp) - press(Key.DirectionDown) - assertEquals(27, state.column) - press(Key.DirectionCenter) - assertEquals(28, state.season) - assertEquals(28, state.requestedSeason) - assertEquals(TitleAction.Season(28), effects.last()) - } - private fun press(key: Key) { rule.onRoot().performKeyInput { pressKey(key) } } private fun replay(end: String): Int { val path = paths.single { it.getString("end") == end } @@ -336,6 +312,11 @@ class TitleKeysTest { assertEquals(553f, rule.onNodeWithTag("title-actions").fetchSemanticsNode().boundsInRoot.top, 1f) } + @GraphicsMode(GraphicsMode.Mode.NATIVE) + @Test fun episodeProgressReclaimsItsNegativeMarginBeforeTheActionRow() { + render("Andor") + assertEquals(603f, rule.onNodeWithTag("title-actions").fetchSemanticsNode().boundsInRoot.top, 1f) + } @Test fun everyLongTrackChoiceAndDoneRemainInsideTheVisibleSheet() { render(transform = { data -> diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/TitlePlaybackNavigationTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/TitlePlaybackNavigationTest.kt deleted file mode 100644 index 75c92ed5..00000000 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/TitlePlaybackNavigationTest.kt +++ /dev/null @@ -1,136 +0,0 @@ -package org.justinvisser.wolfskin.tv - -import android.app.Application -import androidx.lifecycle.viewModelScope -import com.github.damontecres.wholphin.data.ServerRepository -import com.github.damontecres.wholphin.preferences.AppPreferences -import com.github.damontecres.wholphin.preferences.UserPreferences -import com.github.damontecres.wholphin.services.NavigationManager -import com.github.damontecres.wholphin.ui.nav.Destination -import io.mockk.coEvery -import io.mockk.coVerify -import io.mockk.mockk -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.cancel -import kotlinx.coroutines.test.StandardTestDispatcher -import kotlinx.coroutines.test.advanceUntilIdle -import kotlinx.coroutines.test.resetMain -import kotlinx.coroutines.test.runTest -import kotlinx.coroutines.test.setMain -import org.jellyfin.sdk.model.api.BaseItemDto -import org.jellyfin.sdk.model.api.BaseItemKind -import org.junit.Assert.* -import org.junit.Test -import org.junit.runner.RunWith -import org.justinvisser.wolfskin.conductarr.MemoryCacheStore -import org.justinvisser.wolfskin.design.* -import org.justinvisser.wolfskin.tv.read.TitleReadFacade -import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment -import org.robolectric.annotation.Config -import java.util.UUID - -/** Production title actions preserve parents and resolve live playback instead of cached offsets. */ -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [34], application = Application::class) -@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class) -class TitlePlaybackNavigationTest { - private val seriesId = UUID.fromString("00000000-0000-0000-0000-000000000001") - private val firstId = UUID.fromString("00000000-0000-0000-0000-000000000002") - private val secondId = UUID.fromString("00000000-0000-0000-0000-000000000003") - private val person = ShellPerson("justin", "Justin", "J", false) - private val preferences = UserPreferences(AppPreferences.getDefaultInstance(), null) - private val series = TitleItem(seriesId.toString(), "Series", "tv", seasons = 5, held = true) - private val first = TitleItem(firstId.toString(), "First episode", "episode", held = true, season = 3, episode = 1, resumeSeconds = 12) - private val second = first.copy(id = secondId.toString(), name = "Second episode", episode = 2) - - @Test fun repeatedEpisodeChoicesReplaceOnlyEpisodesAndBackPreservesTheirSeriesParent() = runTest { - Dispatchers.setMain(StandardTestDispatcher(testScheduler)) - val navigation = NavigationManager() - val facade = mockk() - coEvery { facade.readSaved(any(), any()) } returns null - coEvery { facade.read(any(), any(), any()) } coAnswers { - val id = firstArg() - TitlePageData(series, playTarget = first, watchTarget = if (id == seriesId) series else first.copy(id = id.toString()), - episodes = listOf(first, second), related = listOf(series), cast = listOf(TitlePerson("actor", "Actor"))) - } - val session = ConductarrSession(MemoryCacheStore()) - val model = WolfskinTitleViewModel(RuntimeEnvironment.getApplication(), facade, mockk(), navigation, session, mockk(relaxed = true)) - fun open(id: UUID) = model.load(titleRoute(id.toString()), person, preferences, fixtures = false, force = true) - try { - navigation.navigateTo(Destination.Wolfskin(titleRoute(seriesId.toString()))) - open(seriesId) - advanceUntilIdle() - model.title!!.click("episodes", 0) - assertEquals(3, navigation.backStack.size) - assertEquals(firstId, (navigation.backStack.last() as Destination.MediaItem).itemId) - open(firstId) - advanceUntilIdle() - for (id in listOf(secondId, firstId, secondId)) { - model.title!!.click("episodes", if (id == firstId) 0 else 1) - assertEquals(3, navigation.backStack.size) - assertEquals(id, (navigation.backStack.last() as Destination.MediaItem).itemId) - open(id) - advanceUntilIdle() - } - model.title!!.click("related", 0) - assertEquals(4, navigation.backStack.size) - navigation.goBack() - model.title!!.click("cast", 0) - assertEquals(4, navigation.backStack.size) - navigation.goBack() - model.title!!.back(ShellState(listOf(person), person.key).apply { pickerVisible = false; pickerLaunch = false }) - assertEquals(listOf(Destination.Home(), Destination.Wolfskin(titleRoute(seriesId.toString()))), navigation.backStack.toList()) - navigation.goBack() - assertEquals(listOf(Destination.Home()), navigation.backStack.toList()) - navigation.navigateTo(Destination.Wolfskin(titleRoute(firstId.toString()))) - open(firstId) - advanceUntilIdle() - model.title!!.click("episodes", 1) - navigation.goBack() - assertEquals(listOf(Destination.Home()), navigation.backStack.toList()) - } finally { - model.viewModelScope.cancel() - session.close() - Dispatchers.resetMain() - } - } - - @Test fun primarySeriesActionReResolvesNextUpButRestartAndExplicitEpisodesKeepTheirIdentity() = runTest { - Dispatchers.setMain(StandardTestDispatcher(testScheduler)) - val navigation = NavigationManager() - val facade = mockk() - coEvery { facade.readSaved(any(), any()) } returns null - coEvery { facade.read(any(), any(), any()) } coAnswers { - TitlePageData(series, first, watchTarget = if (firstArg() == seriesId) series else first) - } - coEvery { facade.preparePlayback(seriesId) } returns BaseItemDto(id = secondId, type = BaseItemKind.EPISODE, - userData = playbackUserData(secondId, 11_362_740_000L, playCount = 2)) - coEvery { facade.preparePlayback(firstId) } returns BaseItemDto(id = firstId, type = BaseItemKind.EPISODE, - userData = playbackUserData(firstId, 960_780_000L, playCount = 1)) - val session = ConductarrSession(MemoryCacheStore()) - val model = WolfskinTitleViewModel(RuntimeEnvironment.getApplication(), facade, mockk(), navigation, session, mockk(relaxed = true)) - try { - model.load(titleRoute(seriesId.toString()), person, preferences, fixtures = false) - advanceUntilIdle() - model.title!!.click("header", 0) - advanceUntilIdle() - assertEquals(Destination.Playback(secondId, 1_136_274L), navigation.backStack.last()) - navigation.goBack() - model.title!!.click("header", model.title!!.options.indexOfFirst { it.id == "restart" }) - advanceUntilIdle() - assertEquals(Destination.Playback(firstId, 0L), navigation.backStack.last()) - navigation.goBack() - model.load(titleRoute(firstId.toString()), person, preferences, fixtures = false) - advanceUntilIdle() - model.title!!.click("header", 0) - advanceUntilIdle() - assertEquals(Destination.Playback(firstId, 96_078L), navigation.backStack.last()) - coVerify(exactly = 1) { facade.preparePlayback(seriesId) } - } finally { - model.viewModelScope.cancel() - session.close() - Dispatchers.resetMain() - } - } -} diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/TitleReadFacadeTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/TitleReadFacadeTest.kt index 7ea534e6..fde2ff9c 100644 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/TitleReadFacadeTest.kt +++ b/app/src/test/java/org/justinvisser/wolfskin/tv/TitleReadFacadeTest.kt @@ -33,8 +33,6 @@ import com.github.damontecres.wholphin.test.TestTracks import org.jellyfin.sdk.model.api.MediaStreamType import org.jellyfin.sdk.model.api.request.GetEpisodesRequest import org.jellyfin.sdk.model.api.request.GetItemsRequest -import org.jellyfin.sdk.model.api.ItemFields -import org.jellyfin.sdk.model.api.request.GetNextUpRequest import org.junit.Assert.* import org.junit.After import org.junit.Before @@ -130,7 +128,7 @@ class TitleReadFacadeTest { } @Test fun diskCopyPreservesFileAndNonContiguousStreamIndexesWithoutRatingsBeforeSignIn() = runTest { - coEvery { library.getItem(firstId) } returns successResponse(file(firstId).copy(userData = playbackUserData(firstId, 200_000_000L))) + coEvery { library.getItem(firstId) } returns successResponse(file(firstId)) facade.read(firstId, null, preferences) coEvery { library.getItem(any()) } throws java.io.IOException("offline") val saved = facade.readSaved(firstId, preferences)!! @@ -141,7 +139,6 @@ class TitleReadFacadeTest { assertEquals(TitleConnection.SignedOut, saved.connection) assertTrue(saved.item.ratings.isEmpty()) assertEquals(firstId.toString(), saved.watchTarget.id) - assertFalse(screen.options.any { it.id == "play" || it.id == "restart" }) } @Test fun diskCopiesNeverCrossViewerIdentity() = runTest { @@ -221,43 +218,6 @@ class TitleReadFacadeTest { assertEquals(2, TitleState(data, ShellPerson("justin", "Justin", "J", false)) {}.season) } - @Test fun leanEpisodeListsKeepSingleItemPlaybackTracksEvenWithoutNextUp() = runTest { - val series = BaseItemDto(id = seriesId, name = "Series", type = BaseItemKind.SERIES, people = emptyList(), providerIds = mapOf("Tmdb" to "42")) - val episode = file(firstId, BaseItemKind.EPISODE).copy(seriesId = seriesId, parentIndexNumber = 3, indexNumber = 1) - coEvery { library.getItem(seriesId) } returns successResponse(series) - coEvery { library.getItem(firstId) } returns successResponse(episode) - coEvery { shows.getNextUp(any()) } coAnswers { - assertTrue(firstArg().fields.orEmpty().isEmpty()) - successQueryResult(emptyList()) - } - coEvery { items.getItems(any()) } returns successQueryResult( - listOf(BaseItemDto(id = seasonId, type = BaseItemKind.SEASON, indexNumber = 3))) - coEvery { shows.getEpisodes(any()) } coAnswers { - val fields = firstArg().fields.orEmpty() - assertFalse(fields.any { it in listOf(ItemFields.MEDIA_SOURCES, ItemFields.MEDIA_STREAMS, ItemFields.PEOPLE, ItemFields.PARENT_ID) }) - successQueryResult(listOf(episode.copy(mediaSources = null, overview = "Episode synopsis"))) - } - val page = facade.read(seriesId, 3, preferences) - assertEquals(firstId.toString(), page.playTarget?.id) - assertEquals("MKV", page.versions.single().container) - assertEquals(listOf(3), page.versions.single().audio.map { it.index }) - val saved = requireNotNull(facade.readSaved(seriesId, preferences)) - assertEquals(page.versions, saved.versions) - } - - @Test fun performerCreditListsOmitStreamsButKeepCharacterRoles() = runTest { - coEvery { library.getItem(firstId) } returns successResponse( - BaseItemDto(id = firstId, type = BaseItemKind.PERSON, name = "Actor")) - coEvery { items.getItems(any()) } coAnswers { - val fields = firstArg().fields.orEmpty() - assertFalse(fields.any { it in listOf(ItemFields.MEDIA_SOURCES, ItemFields.MEDIA_STREAMS, ItemFields.PARENT_ID) }) - assertTrue(ItemFields.PEOPLE in fields) - successQueryResult(listOf(file(secondId).copy(people = listOf( - org.jellyfin.sdk.model.api.BaseItemPerson(id = firstId, name = "Actor", role = "Chef"))))) - } - assertEquals("Chef", facade.readPerson(firstId, 0).credits.single().character) - } - @Test fun compactJellyfinSourceIdUsesTheSameVersionPersistenceKey() = runTest { coEvery { library.getItem(firstId) } returns successResponse(file(firstId)) coEvery { playback.savePlayVersion(any(), any()) } returns null diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/WatchReadTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/WatchReadTest.kt deleted file mode 100644 index a7901727..00000000 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/WatchReadTest.kt +++ /dev/null @@ -1,135 +0,0 @@ -package org.justinvisser.wolfskin.tv - -import android.app.Application -import android.content.Context -import com.github.damontecres.wholphin.WholphinApplication -import com.github.damontecres.wholphin.data.ServerRepository -import com.github.damontecres.wholphin.services.ImageUrlService -import com.github.damontecres.wholphin.ui.successQueryResult -import com.github.damontecres.wholphin.ui.successResponse -import io.mockk.* -import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.cancel -import kotlinx.coroutines.launch -import kotlinx.coroutines.test.* -import kotlinx.serialization.json.Json -import org.jellyfin.sdk.api.client.ApiClient -import org.jellyfin.sdk.api.client.extensions.itemsApi -import org.jellyfin.sdk.api.client.extensions.tvShowsApi -import org.jellyfin.sdk.api.client.extensions.userLibraryApi -import org.jellyfin.sdk.api.operations.ItemsApi -import org.jellyfin.sdk.api.operations.TvShowsApi -import org.jellyfin.sdk.api.operations.UserLibraryApi -import org.jellyfin.sdk.model.api.BaseItemDto -import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult -import org.jellyfin.sdk.model.api.BaseItemKind -import org.junit.After -import org.junit.Assert.* -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.justinvisser.wolfskin.conductarr.MemoryCacheStore -import org.justinvisser.wolfskin.design.* -import org.justinvisser.wolfskin.tv.read.* -import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment -import org.robolectric.annotation.Config -import androidx.lifecycle.viewModelScope -import com.github.damontecres.wholphin.data.model.JellyfinServer -import com.github.damontecres.wholphin.data.model.JellyfinUser -import com.github.damontecres.wholphin.services.NavigationManager -import java.util.UUID -import com.github.damontecres.wholphin.util.WholphinDispatchers -import com.github.damontecres.wholphin.util.configure -import com.github.damontecres.wholphin.util.reset - -/** Recorded Jellyfin watch shapes exercise newer checkpoints and independent Home publication. */ -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [34], application = Application::class) -@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class) -class WatchReadTest { - private val api = mockk() - private val library = mockk() - private val shows = mockk() - private val items = mockk() - private val images = mockk(relaxed = true) - private val userId = UUID.fromString("167649f8-00c9-44b5-a86a-f371eccc2d2e") - private val seriesId = UUID.fromString("00000000-0000-0000-0000-000000000003") - private val json = Json { ignoreUnknownKeys = true } - // Selected fields from the read-only Resume and NextUp replies, without credentials. - private val resumeWire = """{"Items":[{"Id":"a8ed46755a50a5dfb443dd5cdd7125a3","Name":"Sex and the Country","Type":"Episode","ParentIndexNumber":4,"IndexNumber":9,"RunTimeTicks":17507200000,"UserData":{"PlaybackPositionTicks":960780000,"Played":false,"PlayCount":1,"IsFavorite":false,"LastPlayedDate":null,"Key":"","ItemId":"a8ed46755a50a5dfb443dd5cdd7125a3"}}],"TotalRecordCount":1,"StartIndex":0}""" - private val nextWire = """{"Items":[{"Id":"d6a9588e91a4a22ecb9ae279eb7e09d6","Name":"Me and My Town","Type":"Episode","SeriesName":"Desperate Housewives","ParentIndexNumber":5,"IndexNumber":9,"RunTimeTicks":25368960000,"UserData":{"PlaybackPositionTicks":11362740000,"Played":false,"PlayCount":2,"IsFavorite":false,"LastPlayedDate":"2026-11-06T10:39:27.1772471Z","Key":"","ItemId":"d6a9588e91a4a22ecb9ae279eb7e09d6"}}],"TotalRecordCount":1,"StartIndex":0}""" - private fun decode(wire: String) = json.decodeFromString(BaseItemDtoQueryResult.serializer(), wire).items.first() - - @Before fun setup() { - every { api.userLibraryApi } returns library - every { api.tvShowsApi } returns shows - every { api.itemsApi } returns items - mockkObject(WholphinApplication.Companion) - every { WholphinApplication.instance } returns mockk { - every { resources } returns RuntimeEnvironment.getApplication().resources - } - } - - @After fun teardown() { unmockkObject(WholphinApplication.Companion) } - - @Test fun bothFacadesUseTheLiveCheckpointAndSeriesNextUpWhileExplicitEpisodeKeepsItsIdentity() = runTest { - val resume = decode(resumeWire) - val next = decode(nextWire) - val series = BaseItemDto(id = seriesId, type = BaseItemKind.SERIES) - coEvery { library.getItem(itemId = seriesId, userId = userId) } returns successResponse(series) - coEvery { library.getItem(itemId = resume.id, userId = userId) } returns successResponse(resume) - coEvery { library.getItem(itemId = next.id, userId = userId) } returns successResponse(next) - coEvery { shows.getNextUp(userId = userId, seriesId = seriesId, limit = 1, enableResumable = true, enableUserData = true) } returns successQueryResult(listOf(next)) - val home = HomeReadFacade(api, images, mockk()) - val repository = mockk { - every { currentUser } returns mockk { every { id } returns userId } - } - val title = TitleReadFacade(api, images, mockk(), repository, mockk(), mockk()) - val cached = HomeTitle(resume.id.toString(), "Sex and the Country", "episode", resumeSeconds = 10.0) - assertEquals(96_078L, home.preparePlayback(userId, cached)!!.playbackPositionMs()) - assertEquals(96_078L, title.preparePlayback(resume.id)!!.playbackPositionMs()) - assertEquals(next.id, home.preparePlayback(userId, HomeTitle(seriesId.toString(), "Series", "tv"))!!.id) - val selected = title.preparePlayback(seriesId)!! - assertEquals(next.id, selected.id) - assertEquals(1_136_274L, selected.playbackPositionMs()) - coVerify(exactly = 2) { shows.getNextUp(userId = userId, seriesId = seriesId, limit = 1, enableResumable = true, enableUserData = true) } - val completed = resume.copy(userData = resume.userData!!.copy(playbackPositionTicks = 0, played = true)) - coEvery { library.getItem(itemId = resume.id, userId = userId) } returns successResponse(completed) - assertEquals(0L, home.preparePlayback(userId, cached)!!.playbackPositionMs()) - assertEquals(true, title.preparePlayback(resume.id)!!.userData?.played) - } - - @Test fun freshResumeAndNextUpPaintBeforeSlowLibraryAndSurviveItsFailure() = runTest { - WholphinDispatchers.configure(StandardTestDispatcher(testScheduler)) - val server = JellyfinServer(seriesId, "Fixture", "https://example.invalid", null) - val user = JellyfinUser(id = userId, serverId = server.id, name = "Mindel", accessToken = null) - val person = ShellPerson("mindel", "Mindel", "M", false, userId.toString()) - val resume = decode(resumeWire) - val next = decode(nextWire) - coEvery { items.getResumeItems(userId = userId, fields = any(), mediaTypes = any(), limit = 20) } returns successQueryResult(listOf(resume)) - coEvery { shows.getNextUp(userId = userId, fields = any(), limit = 20, enableUserData = true) } returns successQueryResult(listOf(next)) - val facade = spyk(HomeReadFacade(api, images, mockk())) - val releaseLibrary = CompletableDeferred() - coEvery { facade.readLibrary(userId) } coAnswers { releaseLibrary.await(); throw java.io.IOException("Library failed") } - val cache = mockk(relaxed = true) - every { cache.read(any()) } returns (HomeLibrary(resume = listOf(HomeTitle(resume.id.toString(), "Cached episode", "episode", resumeSeconds = 10.0))) to 1L) - val session = ConductarrSession(MemoryCacheStore()) - val model = WolfskinHomeViewModel(RuntimeEnvironment.getApplication(), facade, cache, NavigationManager(), WolfskinSeeAllLists(), session) - try { - val loading = launch { model.loadLibrary(server, user, person) } - runCurrent() - assertFalse(loading.isCompleted) - assertTrue(model.snapshot.rows.first().watchReady) - assertEquals(1136.274, model.snapshot.rows.single { it.id == "nu" }.cards.single().resumeSeconds, .0001) - releaseLibrary.complete(Unit) - loading.join() - assertEquals(96.078, model.snapshot.rows.first().cards.first().resumeSeconds, .0001) - assertTrue(model.snapshot.jellyfinAvailable) - } finally { - model.viewModelScope.cancel() - session.close() - WholphinDispatchers.reset() - } - } -} diff --git a/app/src/test/java/org/justinvisser/wolfskin/tv/WatchReturnTest.kt b/app/src/test/java/org/justinvisser/wolfskin/tv/WatchReturnTest.kt deleted file mode 100644 index 494c8412..00000000 --- a/app/src/test/java/org/justinvisser/wolfskin/tv/WatchReturnTest.kt +++ /dev/null @@ -1,77 +0,0 @@ -package org.justinvisser.wolfskin.tv - -import android.app.Application -import android.os.Looper -import androidx.activity.ComponentActivity -import androidx.compose.ui.test.junit4.createAndroidComposeRule -import androidx.lifecycle.viewModelScope -import com.github.damontecres.wholphin.data.model.JellyfinServer -import com.github.damontecres.wholphin.data.model.JellyfinUser -import com.github.damontecres.wholphin.services.NavigationManager -import com.github.damontecres.wholphin.util.PlaybackWatchState -import io.mockk.coEvery -import io.mockk.every -import io.mockk.mockk -import kotlinx.coroutines.cancel -import org.junit.Assert.* -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith -import org.justinvisser.wolfskin.conductarr.MemoryCacheStore -import org.justinvisser.wolfskin.design.* -import org.justinvisser.wolfskin.tv.read.HomeLibraryCache -import org.justinvisser.wolfskin.tv.read.HomeReadFacade -import org.robolectric.RobolectricTestRunner -import org.robolectric.Shadows.shadowOf -import org.robolectric.annotation.Config -import java.util.UUID -import java.util.concurrent.atomic.AtomicReference - -/** A still-composed Home must paint the checkpoint acknowledged after its first return read. */ -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [34], application = Application::class, qualifiers = "w960dp-h540dp-xhdpi") -class WatchReturnTest { - @get:Rule val rule = createAndroidComposeRule() - - @Test fun acknowledgedStopRefreshesVisibleHeroWithoutRecreatingHomeOrLosingFocus() { - val server = JellyfinServer(UUID.randomUUID(), "Fixture", "https://example.invalid", null) - val user = JellyfinUser(id = UUID.randomUUID(), serverId = server.id, name = "Mindel", accessToken = null) - val person = ShellPerson("mindel", "Mindel", "M", false, user.id.toString()) - val shell = ShellState(listOf(person), person.key).apply { pickerVisible = false; pickerLaunch = false } - val episode = HomeTitle("episode", "Me and My Town", "episode", runtimeSeconds = 2536, resumeSeconds = 10.0, held = true, seriesTitle = "Desperate Housewives", season = 5, episode = 9) - val current = AtomicReference(episode) - val facade = mockk() - every { facade.audiences } returns null - coEvery { facade.readWatch(user.id) } coAnswers { HomeLibrary(resume = listOf(current.get())) } - coEvery { facade.readLibrary(user.id) } returns HomeLibrary() - val cache = mockk(relaxed = true) - every { cache.read(any()) } returns null - val session = ConductarrSession(MemoryCacheStore()) - val model = WolfskinHomeViewModel(rule.activity, facade, cache, NavigationManager(), WolfskinSeeAllLists(), session) - val oldFixtures = ConductarrPreference.fixtures - ConductarrPreference.updateFixtures(false) - try { - rule.setContent { WolfskinTheme { - ShellSurface(shell) { HomeDestination(shell, server, user, it, model) } - } } - rule.waitUntil(5000) { - shadowOf(Looper.getMainLooper()).idle() - model.snapshot.rows.firstOrNull()?.cards?.firstOrNull()?.resumeSeconds == 10.0 - } - val view = shell.rememberedView("home") - rule.runOnIdle { shell.navFocused = false; view.cards["hero"] = 0; current.set(episode.copy(resumeSeconds = 1136.274)) } - PlaybackWatchState.stopped(rule.activity, "${server.id}:${user.id}") - rule.waitUntil(5000) { - shadowOf(Looper.getMainLooper()).idle() - model.snapshot.rows.firstOrNull()?.cards?.firstOrNull()?.resumeSeconds == 1136.274 - } - assertSame(view, shell.rememberedView("home")) - assertEquals(0, view.cards["hero"]) - assertTrue(model.snapshot.rows.first().watchReady) - } finally { - model.viewModelScope.cancel() - session.close() - ConductarrPreference.updateFixtures(oldFixtures) - } - } -} diff --git a/app/src/test/resources/conductarr/activity-history.json b/app/src/test/resources/conductarr/activity-history.json deleted file mode 100644 index 69a29b75..00000000 --- a/app/src/test/resources/conductarr/activity-history.json +++ /dev/null @@ -1,2568 +0,0 @@ -{ - "$schema": "https://wolfskin-tv.justinvisser.org/schemas/ActivityFeed.json", - "requester": "all", - "items": [ - { - "id": "request-11", - "tmdb_id": 14069, - "media_type": "movie", - "title": "The Girl Who Leapt Through Time", - "requester": { - "key": "shared", - "name": "shared" - }, - "actor": { - "name": "justin", - "role": "household", - "requester": "justin" - }, - "on_behalf": true, - "filed_by_you": true, - "seasons": [], - "requested_at": "2026-11-06T15:33:09Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "No Seerr request was needed: the media was already held.", - "source": "native request record", - "observed_at": "2026-11-06T15:33:10Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-06T15:41:46Z" - } - ] - }, - { - "id": "request-10", - "tmdb_id": 290720, - "media_type": "tv", - "title": "The Final Problem", - "requester": { - "key": "shared", - "name": "shared" - }, - "actor": { - "name": "Mindel Voogd", - "role": "household", - "requester": "mindel" - }, - "on_behalf": true, - "filed_by_you": false, - "seasons": [ - 1 - ], - "requested_at": "2026-11-04T18:55:20Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Filed in Seerr as request 72.", - "source": "native request record", - "observed_at": "2026-11-04T18:55:21Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S01E02, S01E03, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:14:52Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "request-9", - "tmdb_id": 289517, - "media_type": "tv", - "title": "Dead-End Job", - "requester": { - "key": "shared", - "name": "shared" - }, - "actor": { - "name": "Mindel Voogd", - "role": "household", - "requester": "mindel" - }, - "on_behalf": true, - "filed_by_you": false, - "seasons": [ - 1 - ], - "requested_at": "2026-11-04T18:54:18Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Filed in Seerr as request 71.", - "source": "native request record", - "observed_at": "2026-11-04T18:54:19Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S01E02, S01E03, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:14:51Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "request-8", - "tmdb_id": 110173, - "media_type": "tv", - "title": "Partition - The Day India Burned", - "requester": { - "key": "shared", - "name": "shared" - }, - "actor": { - "name": "Justin Visser", - "role": "admin", - "requester": "justin" - }, - "on_behalf": true, - "filed_by_you": true, - "seasons": [ - 1 - ], - "requested_at": "2026-11-01T14:14:54Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Filed in Seerr as request 70.", - "source": "native request record", - "observed_at": "2026-11-01T14:14:55Z" - }, - { - "name": "acquisition", - "state": "in_progress", - "summary": "Dispatched; waiting for the Arr to import a file.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "shared-tv: There is no file to show yet.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "request-7", - "tmdb_id": 93290, - "media_type": "tv", - "title": "Breeders", - "requester": { - "key": "shared", - "name": "shared" - }, - "actor": { - "name": "Mindel Voogd", - "role": "household", - "requester": "mindel" - }, - "on_behalf": true, - "filed_by_you": false, - "seasons": [ - 1, - 2, - 3, - 4 - ], - "requested_at": "2026-10-28T18:36:56Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Filed in Seerr as request 69.", - "source": "native request record", - "observed_at": "2026-10-28T18:36:56Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S02E01, S03E01, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:46:10Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "request-6", - "tmdb_id": 243316, - "media_type": "tv", - "title": "The Four Seasons (2025)", - "requester": { - "key": "shared", - "name": "shared" - }, - "actor": { - "name": "Mindel Voogd", - "role": "household", - "requester": "mindel" - }, - "on_behalf": true, - "filed_by_you": false, - "seasons": [ - 1, - 2 - ], - "requested_at": "2026-10-28T18:34:56Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Filed in Seerr as request 68.", - "source": "native request record", - "observed_at": "2026-10-28T18:34:56Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S02E01, S01E02, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:43:54Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "request-5", - "tmdb_id": 260458, - "media_type": "tv", - "title": "Adults", - "requester": { - "key": "shared", - "name": "shared" - }, - "actor": { - "name": "Mindel Voogd", - "role": "household", - "requester": "mindel" - }, - "on_behalf": true, - "filed_by_you": false, - "seasons": [ - 1, - 2 - ], - "requested_at": "2026-10-23T20:55:49Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Filed in Seerr as request 67.", - "source": "native request record", - "observed_at": "2026-10-23T20:55:49Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S02E01, S01E02, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:59:25Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "request-4", - "tmdb_id": 445629, - "media_type": "movie", - "title": "Fighting with My Family", - "requester": { - "key": "shared", - "name": "shared" - }, - "actor": { - "name": "Mindel Voogd", - "role": "household", - "requester": "mindel" - }, - "on_behalf": true, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-22T21:41:58Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Filed in Seerr as request 66.", - "source": "native request record", - "observed_at": "2026-10-22T21:41:59Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:14:53Z" - } - ] - }, - { - "id": "request-3", - "tmdb_id": 399057, - "media_type": "movie", - "title": "The Killing of a Sacred Deer", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "actor": { - "name": "Mindel Voogd", - "role": "household", - "requester": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-22T21:38:52Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Filed in Seerr as request 65.", - "source": "native request record", - "observed_at": "2026-10-22T21:38:53Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "mindel-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:14:52Z" - } - ] - }, - { - "id": "request-2", - "tmdb_id": 225745, - "media_type": "movie", - "title": "Steins;Gate: The Movie - Load Region of D\u00e9j\u00e0 Vu", - "requester": { - "key": "justin", - "name": "justin" - }, - "actor": { - "name": "Justin Visser", - "role": "admin", - "requester": "justin" - }, - "on_behalf": false, - "filed_by_you": true, - "seasons": [], - "requested_at": "2026-10-22T14:55:41Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Filed in Seerr as request 64.", - "source": "native request record", - "observed_at": "2026-10-22T14:55:41Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "failed", - "summary": "justin-movies: Jellyfin visibility needs attention.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "visibility" - }, - { - "id": "request-1", - "tmdb_id": 30669, - "media_type": "tv", - "title": "Yu Yu Hakusho", - "requester": { - "key": "justin", - "name": "justin" - }, - "actor": { - "name": "Justin Visser", - "role": "admin", - "requester": "justin" - }, - "on_behalf": false, - "filed_by_you": true, - "seasons": [ - 1, - 2, - 3, - 4 - ], - "requested_at": "2026-10-19T21:39:29Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Filed in Seerr as request 63.", - "source": "native request record", - "observed_at": "2026-10-19T21:39:29Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "failed", - "summary": "justin-anime: Jellyfin visibility needs attention.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin records the viewer playing 5 episode(s). That is a client playback record, not a server probe.", - "source": "viewer watch record and media-health ledger", - "observed_at": "2026-11-06T16:13:21Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-765", - "tmdb_id": 37735, - "media_type": "movie", - "title": "Easy A", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-17T19:57:25Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-17T19:57:25Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:30:33Z" - } - ] - }, - { - "id": "dispatch-764", - "tmdb_id": 329865, - "media_type": "movie", - "title": "Arrival", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-14T19:51:06Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-14T19:51:06Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T17:45:10Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T17:45:10Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:28:30Z" - } - ] - }, - { - "id": "dispatch-763", - "tmdb_id": 977942, - "media_type": "movie", - "title": "The Uprising", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-11T17:34:21Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-11T17:34:21Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:14:53Z" - } - ] - }, - { - "id": "dispatch-762", - "tmdb_id": 316152, - "media_type": "movie", - "title": "Free State of Jones", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-11T17:33:20Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-11T17:33:20Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:14:52Z" - } - ] - }, - { - "id": "dispatch-761", - "tmdb_id": 9040, - "media_type": "movie", - "title": "Serpico", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T20:35:14Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T20:35:14Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:13:15Z" - } - ] - }, - { - "id": "dispatch-760", - "tmdb_id": 479, - "media_type": "movie", - "title": "Shaft", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T20:35:14Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T20:35:14Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:13:04Z" - } - ] - }, - { - "id": "dispatch-759", - "tmdb_id": 197, - "media_type": "movie", - "title": "Braveheart", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T20:35:14Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T20:35:14Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:13:02Z" - } - ] - }, - { - "id": "dispatch-758", - "tmdb_id": 9361, - "media_type": "movie", - "title": "The Last of the Mohicans", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T20:34:14Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T20:34:14Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:13:15Z" - } - ] - }, - { - "id": "dispatch-757", - "tmdb_id": 2024, - "media_type": "movie", - "title": "The Patriot", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T20:34:13Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T20:34:13Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:13:07Z" - } - ] - }, - { - "id": "dispatch-756", - "tmdb_id": 715931, - "media_type": "movie", - "title": "Emancipation", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T20:33:13Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T20:33:13Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:43:55Z" - } - ] - }, - { - "id": "dispatch-755", - "tmdb_id": 290750, - "media_type": "tv", - "title": "Love is Blind: Netherlands", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T16:15:28Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T16:15:28Z" - }, - { - "name": "acquisition", - "state": "in_progress", - "summary": "Dispatched; waiting for the Arr to import a file.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "mindel-tv: There is no file to show yet.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-750", - "tmdb_id": 315635, - "media_type": "movie", - "title": "Spider-Man: Homecoming", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T14:05:49Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T14:05:49Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is only in libraries this viewer does not see: shared-movies.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "visibility" - }, - { - "id": "dispatch-749", - "tmdb_id": 429617, - "media_type": "movie", - "title": "Spider-Man: Far From Home", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T14:05:32Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T14:05:32Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is only in libraries this viewer does not see: shared-movies.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "visibility" - }, - { - "id": "dispatch-748", - "tmdb_id": 634649, - "media_type": "movie", - "title": "Spider-Man: No Way Home", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T14:04:54Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T14:04:54Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is only in libraries this viewer does not see: shared-movies.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "visibility" - }, - { - "id": "dispatch-747", - "tmdb_id": 969681, - "media_type": "movie", - "title": "Spider-Man: Brand New Day", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-10T14:04:33Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-10T14:04:33Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is only in libraries this viewer does not see: shared-movies.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "visibility" - }, - { - "id": "dispatch-746", - "tmdb_id": 258165, - "media_type": "tv", - "title": "East of Eden (2026)", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-04T09:22:33Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-04T09:22:33Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is only in libraries this viewer does not see: shared-tv.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-745", - "tmdb_id": 76148, - "media_type": "tv", - "title": "Derry Girls", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-10-02T19:58:53Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-10-02T19:58:53Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "mindel-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S02E01, S03E01, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:46:06Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-744", - "tmdb_id": 42994, - "media_type": "movie", - "title": "Memories", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-30T21:35:31Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-30T21:35:31Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "justin-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:46:05Z" - } - ] - }, - { - "id": "dispatch-743", - "tmdb_id": 616, - "media_type": "movie", - "title": "The Last Samurai", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-25T20:11:11Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-25T20:11:11Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:28:31Z" - } - ] - }, - { - "id": "dispatch-742", - "tmdb_id": 1203329, - "media_type": "movie", - "title": "The Witcher: Sirens of the Deep", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-25T19:37:11Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-25T19:37:11Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:14:53Z" - } - ] - }, - { - "id": "dispatch-741", - "tmdb_id": 666243, - "media_type": "movie", - "title": "The Witcher: Nightmare of the Wolf", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-25T19:37:05Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-25T19:37:05Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:59:26Z" - } - ] - }, - { - "id": "dispatch-740", - "tmdb_id": 1274, - "media_type": "tv", - "title": "Six Feet Under", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-25T19:36:06Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-25T19:36:06Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S02E01, S03E01, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:43:59Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-739", - "tmdb_id": 96488, - "media_type": "tv", - "title": "Interrogation", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-25T19:35:05Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-25T19:35:05Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "shared-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S01E02, S01E03, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:46:10Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-738", - "tmdb_id": 47665, - "media_type": "tv", - "title": "Black Sails", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-25T19:34:04Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-25T19:34:04Z" - }, - { - "name": "acquisition", - "state": "none", - "summary": "The title was deleted after it was dispatched.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-09-25T19:34:04Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is not in a library this viewer sees.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin records the viewer playing 1 episode(s). That is a client playback record, not a server probe.", - "source": "viewer watch record and media-health ledger", - "observed_at": "2026-10-12T16:24:20Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-737", - "tmdb_id": 2207, - "media_type": "tv", - "title": "Fawlty Towers", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-23T12:41:28Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-23T12:41:28Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is only in libraries this viewer does not see: shared-tv.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-735", - "tmdb_id": 133908, - "media_type": "tv", - "title": "SkyMed", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-22T17:33:55Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-22T17:33:55Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "mindel-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S02E01, S03E01, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-06T00:01:41Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-734", - "tmdb_id": 32504, - "media_type": "tv", - "title": "Hellcats", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-22T17:31:54Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-22T17:31:54Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "mindel-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S01E02, S01E03, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:13:18Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-733", - "tmdb_id": 40231, - "media_type": "tv", - "title": "So You Think You Can Dance (BE/NL)", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-22T17:03:09Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-22T17:03:09Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "mindel-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S08E01, S08E02, S08E03, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:46:05Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-732", - "tmdb_id": 99353, - "media_type": "tv", - "title": "Love is Blind", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-22T17:02:58Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-22T17:02:58Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "failed", - "summary": "mindel-tv: Jellyfin visibility needs attention.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-731", - "tmdb_id": 90228, - "media_type": "tv", - "title": "Dune: Prophecy", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T20:43:46Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T20:43:46Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is only in libraries this viewer does not see: shared-tv.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin records the viewer playing 1 episode(s). That is a client playback record, not a server probe.", - "source": "viewer watch record and media-health ledger", - "observed_at": "2026-11-04T18:22:43Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-728", - "tmdb_id": 291507, - "media_type": "tv", - "title": "The Body (2026)", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T16:07:00Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T16:07:00Z" - }, - { - "name": "acquisition", - "state": "none", - "summary": "The title is not released yet; there is nothing to acquire.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "mindel-tv: There is no file to show yet.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-727", - "tmdb_id": 1437, - "media_type": "tv", - "title": "Firefly", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T11:33:21Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T11:33:21Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "justin-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S01E02, S01E03, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:59:33Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-726", - "tmdb_id": 86831, - "media_type": "tv", - "title": "Love, Death & Robots", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T11:30:20Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T11:30:20Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "justin-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S02E01, S03E01, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-06T00:01:36Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-725", - "tmdb_id": 9357, - "media_type": "movie", - "title": "One Hour Photo", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T11:29:20Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T11:29:20Z" - }, - { - "name": "acquisition", - "state": "none", - "summary": "The title was deleted after it was dispatched.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-09-20T11:29:20Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is not in a library this viewer sees.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-724", - "tmdb_id": 65315, - "media_type": "tv", - "title": "Flaked", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T11:25:20Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T11:25:20Z" - }, - { - "name": "acquisition", - "state": "none", - "summary": "The title was deleted after it was dispatched.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-09-20T11:25:20Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is not in a library this viewer sees.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin records the viewer playing 1 episode(s). That is a client playback record, not a server probe.", - "source": "viewer watch record and media-health ledger", - "observed_at": "2026-09-20T12:15:36Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-723", - "tmdb_id": 9357, - "media_type": "movie", - "title": "One Hour Photo", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T11:22:19Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T11:22:19Z" - }, - { - "name": "acquisition", - "state": "none", - "summary": "The title was deleted after it was dispatched.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-09-20T11:29:20Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is not in a library this viewer sees.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin records the viewer playing this movie. That is a client playback record, not a server probe.", - "source": "viewer watch record and media-health ledger", - "observed_at": "2026-09-20T12:15:36Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-722", - "tmdb_id": 111803, - "media_type": "tv", - "title": "The White Lotus", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T00:15:57Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T00:15:57Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "mindel-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S02E01, S03E01, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-06T00:01:39Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-721", - "tmdb_id": 246, - "media_type": "tv", - "title": "Avatar: The Last Airbender", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T00:15:57Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T00:15:57Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:46:45Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is only in libraries this viewer does not see: shared-tv.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "failed", - "summary": "A file is unreadable and has not been repaired.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-720", - "tmdb_id": 33880, - "media_type": "tv", - "title": "The Legend of Korra", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T00:15:56Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T00:15:56Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "justin-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S02E01, S03E01, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:30:33Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-719", - "tmdb_id": 95557, - "media_type": "tv", - "title": "INVINCIBLE (2021)", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-20T00:15:56Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-20T00:15:56Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:00:28Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is only in libraries this viewer does not see: justin-tv.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin records the viewer playing 1 episode(s). That is a client playback record, not a server probe.", - "source": "viewer watch record and media-health ledger", - "observed_at": "2026-11-04T20:23:49Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-716", - "tmdb_id": 285404, - "media_type": "tv", - "title": "Maximum Pleasure Guaranteed", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-09-07T20:58:52Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-09-07T20:58:52Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "mindel-tv: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "playback", - "state": "partial", - "summary": "Jellyfin admits server playback for sampled episodes S01E01, S01E02, S01E03, not every requested episode. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T23:14:51Z" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-526", - "tmdb_id": 124428, - "media_type": "tv", - "title": "B&B Vol Liefde", - "requester": { - "key": "justin", - "name": "justin" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-07-31T15:40:26Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-07-31T15:40:26Z" - }, - { - "name": "acquisition", - "state": "unknown", - "summary": "Dispatched; the Arr has represented files, but which seasons they cover is not established here; open readiness for per-season coverage.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:31:21Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is only in libraries this viewer does not see: shared-tv.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-519", - "tmdb_id": 78941, - "media_type": "tv", - "title": "Aggretsuko", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-07-17T17:38:47Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-07-17T17:38:47Z" - }, - { - "name": "acquisition", - "state": "none", - "summary": "The title was deleted after it was dispatched.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-07-17T17:38:47Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is not in a library this viewer sees.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-518", - "tmdb_id": 486947, - "media_type": "movie", - "title": "The Guilty", - "requester": { - "key": "shared", - "name": "shared" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-07-17T17:38:47Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-07-17T17:38:47Z" - }, - { - "name": "acquisition", - "state": "none", - "summary": "The title was deleted after it was dispatched.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-07-17T17:38:47Z" - }, - { - "name": "visibility", - "state": "none", - "summary": "The title is not in a library this viewer sees.", - "source": "layer visibility observation" - }, - { - "name": "playback", - "state": "unknown", - "summary": "No playback record or current server playback evidence is available for this viewer.", - "source": "viewer watch record and media-health ledger" - } - ], - "blocking_stage": "acquisition" - }, - { - "id": "dispatch-514", - "tmdb_id": 220289, - "media_type": "movie", - "title": "Coherence", - "requester": { - "key": "mindel", - "name": "mindel" - }, - "on_behalf": false, - "filed_by_you": false, - "seasons": [], - "requested_at": "2026-07-17T17:38:46Z", - "stages": [ - { - "name": "request", - "state": "done", - "summary": "Seerr approved a request for this viewer. It was filed outside the cockpit, so who filed it is not recorded.", - "source": "dispatch log", - "observed_at": "2026-07-17T17:38:46Z" - }, - { - "name": "acquisition", - "state": "done", - "summary": "Dispatched; the Arr has represented files.", - "source": "dispatch log and layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "visibility", - "state": "done", - "summary": "mindel-movies: Jellyfin shows the represented files to the viewer.", - "source": "layer visibility observation", - "observed_at": "2026-11-06T18:15:52Z" - }, - { - "name": "playback", - "state": "done", - "summary": "Jellyfin admits server playback of this movie for the viewer. This is not a media byte-read or phone compatibility check.", - "source": "authenticated Jellyfin PlaybackInfo for the viewer", - "observed_at": "2026-11-05T22:59:24Z" - } - ] - } - ], - "truncated": false, - "sources": [ - { - "name": "native requests", - "state": "observed" - }, - { - "name": "dispatch log", - "state": "observed" - }, - { - "name": "library routes", - "state": "observed" - } - ] -} diff --git a/app/src/test/resources/conductarr/mindel-feed.json b/app/src/test/resources/conductarr/mindel-feed.json deleted file mode 100644 index ffb957ab..00000000 --- a/app/src/test/resources/conductarr/mindel-feed.json +++ /dev/null @@ -1,8143 +0,0 @@ -{ - "$schema": "https://wolfskin-tv.justinvisser.org/schemas/RecommendationFeed.json", - "profile": { - "key": "mindel", - "name": "mindel" - }, - "state": "current", - "outcome": "ranked", - "attempted_at": "2026-11-06T16:13:56.797980746Z", - "observed_at": "2026-11-06T16:14:14.67322323Z", - "expires_at": "2026-11-06T22:14:14.67322323Z", - "materialization": "current", - "movies": [ - { - "media_type": "movie", - "tmdb_id": 235271, - "tvdb_id": 0, - "title": "Addicted", - "overview": "A gallerist risks her family and flourishing career when she enters into an affair with a talented painter and slowly loses control of her life.", - "poster_path": "/fAERrD6vvmznDoL99wlgjhSfPcH.jpg", - "backdrop_path": "/aqqoDJs8vYp2EZ74aQ1UMY0sjM7.jpg", - "year": 2014, - "score": 1.0710949439563022, - "genre_ids": [ - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - }, - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 8999, - "tvdb_id": 0, - "title": "Derailed", - "overview": "When two married business executives having an affair are blackmailed by a violent criminal, they are forced to turn the tables on him to save their families.", - "poster_path": "/bcCoOkwEBHUS5Y7Rm1u1oTLUHdb.jpg", - "backdrop_path": "/yhx8DtHySbvIm19wurVttyXCTTe.jpg", - "year": 2005, - "score": 1, - "genre_ids": [ - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 317744, - "tvdb_id": 0, - "title": "Careful What You Wish For", - "overview": "A guy gets more than he bargained for after entering into an affair with the wife of an investment banker. Soon, a suspicious death and substantial life insurance policy embroil him in a scandal.", - "poster_path": "/alRvln4lzGjdSExC37vr1spSTF7.jpg", - "backdrop_path": "/kyx15eUlLQy7HHm8HRuvi9QagO8.jpg", - "year": 2015, - "score": 0.745920536874323, - "genre_ids": [ - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - }, - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 13250, - "tvdb_id": 0, - "title": "Butterfly on a Wheel", - "overview": "A sociopathic kidnapper methodically pushes a desperate pair of parents to their absolute breaking point.", - "poster_path": "/qcjjYcMaaSKD2C8xn0hy6o6yj2L.jpg", - "backdrop_path": "/7al64Hp3RPaMNB5AWTdFH7RggnG.jpg", - "year": 2007, - "score": 0.5848757652954433, - "genre_ids": [ - 80, - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - }, - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - }, - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 376004, - "tvdb_id": 0, - "title": "Adulterers", - "overview": "On a steamy New Orleans afternoon, Sam Deuprey decides to surprise his beautiful wife, Ashley, for their anniversary and comes home early. But Ashley is not alone in the bedroom. She and her lover, Damien are about to learn how far a jealous husband will go.", - "poster_path": "/7weaBxcimjsN9zi89Dfk4fZFCUE.jpg", - "backdrop_path": "/8q6AJYqJzZPrNSbttcwslXx7QgO.jpg", - "year": 2016, - "score": 0.48362143005756547, - "genre_ids": [ - 53, - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - }, - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 13483, - "tvdb_id": 0, - "title": "Awake", - "overview": "While undergoing heart surgery, a man experiences a phenomenon called \u2018anesthetic awareness\u2019, which leaves him awake but paralyzed throughout the operation. As various obstacles present themselves, his wife must make life-altering decisions while wrestling with her own personal drama.", - "poster_path": "/xqooV6lR1Kdx4Q52Sim0aGbDTYP.jpg", - "backdrop_path": "/c5TiPhbggc1LWckfd93p8ZFu16X.jpg", - "year": 2007, - "score": 0.45896249898432395, - "genre_ids": [ - 53, - 80, - 9648 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 18190, - "tvdb_id": 0, - "title": "Dream Lover", - "overview": "Not long after they cross paths at an art gallery, architect Ray Reardon and hypnotically sensual Lena are married with children. But as strange incidents occur, Ray begins to realize he may not really know the woman he married.", - "poster_path": "/epl5pprGt04gAJI8lzbKy83XkbE.jpg", - "backdrop_path": "/83hLixhpxMw2WpG72IzFYE28b3v.jpg", - "year": 1994, - "score": 0.30017994059534503, - "genre_ids": [ - 18, - 9648, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - }, - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - }, - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 210577, - "tvdb_id": 0, - "title": "Gone Girl", - "overview": "With his wife's disappearance having become the focus of an intense media circus, a man sees the spotlight turned on him when it's suspected that he may not be innocent.", - "poster_path": "/ts996lKsxvjkO2yiYG0ht4qAicO.jpg", - "backdrop_path": "/iWak7wT0j6ycCc8lKr4NBz9c7n5.jpg", - "year": 2014, - "score": 0.2353903390452386, - "genre_ids": [ - 9648, - 53, - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - }, - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - }, - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 619979, - "tvdb_id": 0, - "title": "Deep Water", - "overview": "A well-to-do husband who allows his wife to have affairs in order to avoid a divorce becomes a prime suspect in the disappearance of her lovers.", - "poster_path": "/6yRMyWwjuhKg6IU66uiZIGhaSc8.jpg", - "backdrop_path": "/lcITbesmy0IBO6TXTAgQHJE6Asx.jpg", - "year": 2022, - "score": 0.23033665255417463, - "genre_ids": [ - 18, - 9648, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - }, - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 1317288, - "tvdb_id": 0, - "title": "Marty Supreme", - "overview": "Marty Mauser, a young man with a dream no one respects, goes to hell and back in pursuit of greatness.", - "poster_path": "/lYWEXbQgRTR4ZQleSXAgRbxAjvq.jpg", - "backdrop_path": "/6h7w8R4BA7vubEmEEW5vYEjuoz6.jpg", - "year": 2025, - "score": 0.1659867561457205, - "genre_ids": [ - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - }, - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 582014, - "tvdb_id": 0, - "title": "Promising Young Woman", - "overview": "A young woman, traumatized by a tragic event in her past, seeks out vengeance against those who crossed her path.", - "poster_path": "/2h4EkRxy36zSsBDkijXSUMJFDaz.jpg", - "backdrop_path": "/gESm6yc2MZpSXakgqLF0OlLaRn1.jpg", - "year": 2020, - "score": 0.15298749966144132, - "genre_ids": [ - 53, - 80, - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 549514, - "tvdb_id": 0, - "title": "Fatale", - "overview": "After a wild one-night stand, successful sports agent Derrick Tyler watches his perfect life slowly disappear when he discovers the sexy and mysterious woman he risked everything for is determined police detective Valerie Quinlan who entangles him in her latest investigation. As he desperately tries to put the pieces together, he falls deeper into her trap, risking his family, his career, and even his life.", - "poster_path": "/tGFXEyESXIuei5tZWXRkSRSFSxi.jpg", - "backdrop_path": "/tljkeU2y1dCvT51Sv4ciNf0VfmV.jpg", - "year": 2020, - "score": 0.1475523221245938, - "genre_ids": [ - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 59231, - "tvdb_id": 0, - "title": "The Rain People", - "overview": "When a housewife finds out she is pregnant, she runs out of town looking for freedom to reevaluate her life decisions.", - "poster_path": "/dDg4I79yb2VNdM3Vkh9oDOUROTc.jpg", - "backdrop_path": "/k5VMD0fpCB8CunTjzpHdjOp6Lqv.jpg", - "year": 1969, - "score": 0.14285714285714285, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 1249213, - "tvdb_id": 0, - "title": "Drop", - "overview": "Violet, a widowed mother on her first date in years, arrives at an upscale restaurant where she is relieved that her date, Henry, is more charming and handsome than she expected. But their chemistry begins to curdle as Violet begins being irritated and then terrorized by a series of anonymous drops to her phone.", - "poster_path": "/hSQPSW8aLjsMBfwqGjgJ6HozTkp.jpg", - "backdrop_path": "/akBGSguhkAj1TXOdZUcL11e1hpH.jpg", - "year": 2025, - "score": 0.11516832627708731, - "genre_ids": [ - 9648, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - }, - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 624788, - "tvdb_id": 0, - "title": "Black Bear", - "overview": "At a remote lake house in the Adirondack Mountains, a couple entertains an out-of-town guest looking for inspiration in her filmmaking. The group quickly falls into a calculated game of desire, manipulation, and jealousy, unaware of how dangerously intertwined their lives will soon become.", - "poster_path": "/nqZFjQRWfW6PjFTc17pzJ5LRAAv.jpg", - "backdrop_path": "/o87ErHJHx99C5B8IiW9RYK1uCdU.jpg", - "year": 2020, - "score": 0.1111111111111111, - "genre_ids": [ - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 2252, - "tvdb_id": 0, - "title": "Eastern Promises", - "overview": "A Russian teenager living in London dies during childbirth but leaves clues in her diary that could tie her child to a rape involving a violent Russian mob family.", - "poster_path": "/nLwv1pxRCRZucQaqs6oPkq7HH3K.jpg", - "backdrop_path": "/1ckHUJ6ztq5XJRKM2nIAW0UjJNH.jpg", - "year": 2007, - "score": 0.1, - "genre_ids": [ - 53, - 80, - 9648 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 311667, - "tvdb_id": 0, - "title": "Manhattan Night", - "overview": "Porter Wren is a Manhattan tabloid writer with an appetite for scandal. On the beat he sells murder, tragedy, and anything that passes for the truth. At home, he is a dedicated husband and father. But when Caroline, a seductive stranger asks him to dig into the unsolved murder of her filmmaker husband Simon, he is drawn into a very nasty case of sexual obsession and blackmail--one that threatens his job, his marriage, and his life.", - "poster_path": "/d40J0y6Ha1eakPrmfyEHoKFQrSB.jpg", - "backdrop_path": "/1eM6CsDTwRmxgnigzz8pitLlUKJ.jpg", - "year": 2016, - "score": 0.09678494183275951, - "genre_ids": [ - 18, - 9648, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - }, - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 2990, - "tvdb_id": 0, - "title": "Pacific Heights", - "overview": "A couple works hard to renovate their dream house and become landlords to pay for it. Unfortunately one of their tenants has plans of his own.", - "poster_path": "/9iHD6xIrGSuuMEFWhwSVGXSddY2.jpg", - "backdrop_path": "/oifQqVSpK5fOqgCrYIEbLGkcIiS.jpg", - "year": 1990, - "score": 0.09619987082688097, - "genre_ids": [ - 53, - 18, - 9648 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - }, - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 1965, - "tvdb_id": 0, - "title": "A Perfect Murder", - "overview": "Millionaire industrialist Steven Taylor is a man who has everything but what he craves most: the love and fidelity of his wife. A hugely successful player in the New York financial world, he considers her to be his most treasured acquisition. But she needs more than simply the role of dazzling accessory.", - "poster_path": "/wC0ax12N9GQ8vMXPEs4nES5AAiB.jpg", - "backdrop_path": "/dNW7ftcqEAvKmDkuRPaLC4gnhwJ.jpg", - "year": 1998, - "score": 0.09122515832853577, - "genre_ids": [ - 80, - 53, - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - }, - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 63493, - "tvdb_id": 0, - "title": "The Ledge", - "overview": "A thriller in which a battle of philosophies between a fundamentalist Christian and an atheist who shares an apartment with a gay friend escalates into a lethal battle of wills.", - "poster_path": "/cTaDS6CTIfZ5MH189ub6oE1FATk.jpg", - "backdrop_path": "/fWOfr0L1ISpP3KF8qY2qG1qrxMi.jpg", - "year": 2011, - "score": 0.09090909090909091, - "genre_ids": [ - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 451156, - "tvdb_id": 0, - "title": "Infidelity in Suburbia", - "overview": "With her husband away at work, and her son at school, Laura dreams of a home-renovation project to supplant her restless days. Elliott, her irresistibly hot private contractor, soon fulfills her more forbidden dreams.", - "poster_path": "/gKyvJ8u2US61pHR56C2DoVbwnu.jpg", - "backdrop_path": "/wjnewOLmAYEfh1jeoXme7FO77K2.jpg", - "year": 2017, - "score": 0.08333333333333333, - "genre_ids": [ - 53, - 10770 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 1920, - "tvdb_id": 0, - "title": "Crime of Passion", - "overview": "Kathy leaves the newspaper business to marry homicide detective Bill, but is frustrated by his lack of ambition and the banality of life in the suburbs. Her drive to advance Bill's career soon takes her down a dangerous path.", - "poster_path": "/dDpstkYlTAE8n9jqcTYt3jJVNXm.jpg", - "backdrop_path": "/r3Ddxw4v780GzOZdjAT2CMgo0Gn.jpg", - "year": 1956, - "score": 0.0737761610622969, - "genre_ids": [ - 18, - 80, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 1033148, - "tvdb_id": 0, - "title": "Die My Love", - "overview": "After inheriting a remote Montana house, Jackson moves there from New York with his partner Grace, and the couple soon welcome a child. As Jackson becomes increasingly absent and rural isolation sets in, Grace struggles with loneliness, creative frustration, and unresolved emotional wounds. What begins as an attempt at renewal gradually turns into an intense psychological descent, placing strain on their relationship and exposing the fragile balance between love, identity, and motherhood.", - "poster_path": "/kajpShbFhOdpl6yCrLezMrr9tB4.jpg", - "backdrop_path": "/dEkFlZzj2cb5F7SShvqkL54E4lr.jpg", - "year": 2025, - "score": 0.07142857142857142, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 7442, - "tvdb_id": 0, - "title": "Sleeping with the Enemy", - "overview": "A young woman fakes her own death in an attempt to escape her nightmarish marriage, but discovers it is impossible to elude her controlling husband.", - "poster_path": "/zaUkndJP8IClB1gMsbw13PoVeLS.jpg", - "backdrop_path": "/apUbdi4nGrD5VGIaxErtpsn7ST8.jpg", - "year": 1991, - "score": 0.07039553585925253, - "genre_ids": [ - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - }, - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 8884, - "tvdb_id": 0, - "title": "Franklyn", - "overview": "Set between the parallel worlds of contemporary London and the futuristic faith dominated metropolis of Meanwhile City, Franklyn weaves a tale of four souls, whose lives are intertwined by fate, romance and tragedy. As these worlds collide, a single bullet determines the destiny of these four characters.", - "poster_path": "/5yns10om8I19j4OHy1zoVRilAnw.jpg", - "backdrop_path": "/6hQgTpZVNHrLafE6IeSAoThQwkH.jpg", - "year": 2008, - "score": 0.06666666666666667, - "genre_ids": [ - 14, - 53, - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 14698, - "tvdb_id": 0, - "title": "Suddenly, Last Summer", - "overview": "The only son of wealthy widow Violet Venable dies while on vacation with his cousin Catherine. What the girl saw was so horrible that she went insane; now Mrs. Venable wants Catherine lobotomized to cover up the truth.", - "poster_path": "/igma0zn9J5srRvOMDRnxyUDQXJL.jpg", - "backdrop_path": "/pMIIOovLyyCr8W5JFOqsSO8gK1r.jpg", - "year": 1959, - "score": 0.06556607128347484, - "genre_ids": [ - 53, - 18, - 9648 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 45938, - "tvdb_id": 0, - "title": "Sunday Bloody Sunday", - "overview": "Recently divorced career woman Alex Greville begins a romantic relationship with glamorous mod artist Bob Elkin, fully aware that he's also intimately involved with middle-aged doctor Daniel Hirsh. For both Alex and Daniel, the younger man represents a break with their repressive pasts, and though both know that Bob is seeing both of them, neither is willing to let go of the youth and vitality he brings to their otherwise stable lives.", - "poster_path": "/7q1h3M1vDlsHDKRhoPOzKjmFCVq.jpg", - "backdrop_path": "/xkIaVZo98JFCteffdXRgZfcW5A.jpg", - "year": 1971, - "score": 0.0625, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 16933, - "tvdb_id": 0, - "title": "They Drive by Night", - "overview": "Joe and Paul Fabrini are Wildcat, or independent, truck drivers who have their own small one-truck business. The Fabrini boys constantly battle distributors, rivals and loan collectors, while trying to make a success of their transport company.", - "poster_path": "/uF0X3IMhPIFgbwzlbayUsj4I6Tc.jpg", - "backdrop_path": "/4rd9SUlamdxZlLkCBl6A1z24L4e.jpg", - "year": 1940, - "score": 0.058823529411764705, - "genre_ids": [ - 18, - 80, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 7183, - "tvdb_id": 0, - "title": "Perfect Stranger", - "overview": "A journalist goes undercover to ferret out businessman Harrison Hill as her best friend's killer. Posing as one of his temps, she enters into a game of online cat-and-mouse.", - "poster_path": "/i7D5QqQ0q5EXU1UuZVY9KwIxoYR.jpg", - "backdrop_path": "/sNhYDvDbEwf9AUGip2fGRwP7x8r.jpg", - "year": 2007, - "score": 0.056750893124843764, - "genre_ids": [ - 53, - 80, - 9648 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 893086, - "tvdb_id": 0, - "title": "The Good Neighbor", - "overview": "A nightmarish evening unfolds for neighbors David and Robert when they accidentally hit a woman on her bike and flee the scene. While David is increasingly plagued by feelings of guilt, Robert shows no remorse and becomes overbearing and possessive.", - "poster_path": "/mXJ2xI7B0Z9WxDjyv18anPsOxeE.jpg", - "backdrop_path": "/AnmfRV7X0kwEn96pg0lAVopV8YK.jpg", - "year": 2022, - "score": 0.05555555555555555, - "genre_ids": [ - 53, - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 1213, - "tvdb_id": 0, - "title": "The Talented Mr. Ripley", - "overview": "Tom Ripley is a calculating young man who believes it's better to be a fake somebody than a real nobody. Opportunity knocks in the form of a wealthy U.S. shipbuilder who hires Tom to travel to Italy to bring back his playboy son, Dickie. Ripley worms his way into the idyllic lives of Dickie and his girlfriend, plunging into a daring scheme of duplicity, lies and murder.", - "poster_path": "/6ojHgqtIR41O2qLKa7LFUVj0cZa.jpg", - "backdrop_path": "/51UDa3IuGyiKGe2MgMcLGvJE2Fm.jpg", - "year": 1999, - "score": 0.05269725790164064, - "genre_ids": [ - 53, - 80, - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 1317088, - "tvdb_id": 0, - "title": "The Assessment", - "overview": "In a climate change-ravaged world, a utopian society optimizes life, including parenthood assessments. A successful couple faces scrutiny by an evaluator over seven days to determine their fitness for childbearing.", - "poster_path": "/o1K7be85FAauSbVPzCQ0GjOXUqu.jpg", - "backdrop_path": "/96w2p3xKIgvuSTJsNVnvNFqOhPJ.jpg", - "year": 2025, - "score": 0.05263157894736842, - "genre_ids": [ - 878, - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 50875, - "tvdb_id": 0, - "title": "Higher Ground", - "overview": "Inspired by screenwriter Carolyn S. Briggs' memoir This Dark World, a tight-knit spiritual community is thrown off-kilter when one of their own begins to question her faith, love, and trust - in human relationships as well as in God.", - "poster_path": "/xFvN6OVYGwPokUnkZlKxd1coxbS.jpg", - "backdrop_path": "/evC47eVO3jBNb1iaXyc5TdnDMgl.jpg", - "year": 2011, - "score": 0.05, - "genre_ids": [ - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 210479, - "watched": true, - "added": true, - "title": "Locke" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 11660, - "tvdb_id": 0, - "title": "Following", - "overview": "Bill, an idle, unemployed aspiring writer, walks the crowded streets of London following randomly chosen strangers, a seemingly innocent entertainment that becomes dangerous when he crosses paths with a mysterious character.", - "poster_path": "/3bX6VVSMf0dvzk5pMT4ALG5A92d.jpg", - "backdrop_path": "/yf5I5VHllK4h5VdbxHfQ40RBTe8.jpg", - "year": 1999, - "score": 0.04611010066393556, - "genre_ids": [ - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 65650, - "tvdb_id": 0, - "title": "The Good Doctor", - "overview": "Dr. Martin Blake, who has spent his life looking for respect, meets an 18-year-old patient named Diane, suffering from a kidney infection, and gets a much-needed boost of self-esteem. However, when her health starts improving, Martin fears losing her, so he begins tampering with her treatment, keeping Diane sick and in the hospital right next to him.", - "poster_path": "/fJSdqHzpMeCkXMrILYt1SdGN2sL.jpg", - "backdrop_path": "/jPlyFmmh9rHQqIuRtEv0gCsOVPK.jpg", - "year": 2011, - "score": 0.04172386354402945, - "genre_ids": [ - 18, - 53, - 9648 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 241, - "tvdb_id": 0, - "title": "Natural Born Killers", - "overview": "Two victims of traumatized childhoods become lovers and serial murderers irresponsibly glorified by the mass media.", - "poster_path": "/fEKZwT91gxvkAoyPgpNXo8W5fu0.jpg", - "backdrop_path": "/k3TOt50cHvTLXWYPnXP0szhiXB8.jpg", - "year": 1994, - "score": 0.03824687491536033, - "genre_ids": [ - 80, - 53, - 18 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 645710, - "tvdb_id": 0, - "title": "The Voyeurs", - "overview": "When Pippa and Thomas move into their dream apartment, they notice that their windows look directly into the apartment opposite \u2013 inviting them to witness the volatile relationship of the attractive couple across the street. But what starts as a simple curiosity turns into full-blown obsession with increasingly dangerous consequences.", - "poster_path": "/8Y4XOIWhpOvSOEn8XrxbkH9yAXO.jpg", - "backdrop_path": "/5KGrBXvE0cYDwqfEaymvNBVspkJ.jpg", - "year": 2021, - "score": 0.03688808053114845, - "genre_ids": [ - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 9357, - "watched": true, - "added": false, - "title": "One Hour Photo" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 69668, - "tvdb_id": 0, - "title": "Dream House", - "overview": "Publisher Will Atenton quits a lucrative job in New York to relocate his wife, Libby, and their daughters to a quaint town in New England. However, as they settle into their home the Atentons discover that a woman and her children were murdered there, and the surviving husband is the town's prime suspect. With help from a neighbor who was close to the murdered family, Will pieces together a horrifying chain of events.", - "poster_path": "/uQFbnBEYguc6EWYKG0Hgq4LVdc2.jpg", - "backdrop_path": "/6eFU4wRgnL4YEvDagEianumeGpc.jpg", - "year": 2011, - "score": 0.03278303564173742, - "genre_ids": [ - 9648, - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 33195, - "tvdb_id": 0, - "title": "Triage", - "overview": "The wife of a photojournalist sets out to discover why he came home from a recent assignment without his colleague.", - "poster_path": "/qH3QzgkqJYcTVs5QoH9SOE80B8q.jpg", - "backdrop_path": "/yLqD4mKGLR4pZRP42DxGqPlIG1t.jpg", - "year": 2009, - "score": 0.030597499932288264, - "genre_ids": [ - 18, - 53, - 9648 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 4547, - "tvdb_id": 0, - "title": "Panic Room", - "overview": "Trapped in their New York brownstone's panic room, a hidden chamber built as a sanctuary in the event of break-ins, newly divorced Meg Altman and her young daughter Sarah play a deadly game of cat-and-mouse with three intruders - Burnham, Raoul and Junior - during a brutal home invasion. But the room itself is the focal point because what the intruders really want is inside it.", - "poster_path": "/hANYbvfwxmkC9E4yY6YyJxYxlSJ.jpg", - "backdrop_path": "/gJfd2SzUsvY1q1iszthJ3ryuvEA.jpg", - "year": 2002, - "score": 0.028685156186520247, - "genre_ids": [ - 80, - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - }, - { - "media_type": "movie", - "tmdb_id": 74998, - "tvdb_id": 0, - "title": "Seeking Justice", - "overview": "After his wife is assaulted, a husband enlists the services of a vigilante group to help him settle the score.", - "poster_path": "/fJCBxeeKLmxOG2TS4ewhalSb9ur.jpg", - "backdrop_path": "/3luwjhBo76a7swVxqfjcOh3e8tR.jpg", - "year": 2011, - "score": 0.02549791661024022, - "genre_ids": [ - 28, - 18, - 53 - ], - "contributions": [ - { - "media_type": "movie", - "tmdb_id": 399057, - "watched": false, - "added": true, - "title": "The Killing of a Sacred Deer" - } - ] - } - ], - "shows": [ - { - "media_type": "tv", - "tmdb_id": 73552, - "tvdb_id": 341235, - "title": "Heathers", - "overview": "A pitch-black comedy anthology set in the present day, as our heroine, Veronica Sawyer, deals with a very different but equally vicious group of Heathers. Based on the 1988 cult classic film.", - "poster_path": "/pbK7GvYCrkqUevhGLcNuyja3ngm.jpg", - "backdrop_path": "/bsazBvyJQlor6PvA5pS6X3mRWmX.jpg", - "year": 2018, - "score": 1.0824883110875794, - "genre_ids": [ - 35, - 80 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - }, - { - "media_type": "tv", - "tmdb_id": 107113, - "watched": false, - "added": true, - "title": "Only Murders in the Building" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 2327, - "tvdb_id": 72584, - "title": "Dawson's Creek", - "overview": "Dawson's Creek is an American teen drama that portrays the fictional lives of a close-knit group of teenagers through high school and college.", - "poster_path": "/arT93dBemanftfWTcf9I0JRIlxU.jpg", - "backdrop_path": "/ofiNBOL7gpuzqXEqWBprF90CtY7.jpg", - "year": 1998, - "score": 1.030931929109617, - "genre_ids": [ - 18, - 10766 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 4586, - "watched": true, - "added": false, - "title": "Gilmore Girls" - }, - { - "media_type": "tv", - "tmdb_id": 202851, - "watched": false, - "added": true, - "title": "Big Boys" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 578, - "tvdb_id": 73918, - "title": "Numb3rs", - "overview": "Inspired by actual cases and experiences, Numb3rs depicts the confluence of police work and mathematics in solving crime as an FBI agent recruits his mathematical genius brother to help solve a wide range of challenging crimes in Los Angeles from a very different perspective.", - "poster_path": "/wOzbxJmpccPA5MYvBSGbor3WKh3.jpg", - "backdrop_path": "/oYwaOeQmE0tuBKy8kt43NFNI4bE.jpg", - "year": 2005, - "score": 1, - "genre_ids": [ - 80, - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 226637, - "watched": true, - "added": false, - "title": "High Potential" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 900, - "tvdb_id": 79773, - "title": "Skins", - "overview": "Irreverent comedy drama which follows the messy lives, loves, delirious highs and inevitable lows of a group of raucous teenage friends in Bristol.", - "poster_path": "/bf4L6bB9YOGyrPeLdlpz3FlMZQg.jpg", - "backdrop_path": "/saBnI34QTYTjG9sj8DsembO4PBK.jpg", - "year": 2007, - "score": 1, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 76148, - "watched": true, - "added": true, - "title": "Derry Girls" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 56570, - "tvdb_id": 270408, - "title": "Outlander", - "overview": "The story of Claire Randall, a married combat nurse from 1945 who is mysteriously swept back in time to 1743, where she is immediately thrown into an unknown world where her life is threatened. When she is forced to marry Jamie, a chivalrous and romantic young Scottish warrior, a passionate affair is ignited that tears Claire's heart between two vastly different men in two irreconcilable lives.", - "poster_path": "/oftZNfyTVNU7IfOqoGLoT8MGvNs.jpg", - "backdrop_path": "/nf3Vlxm3C9U1aKUUQHmKFZmxPSc.jpg", - "year": 2014, - "score": 1, - "genre_ids": [ - 18, - 10765 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 207484, - "watched": true, - "added": false, - "title": "Outlander: Blood of My Blood" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 62117, - "tvdb_id": 280706, - "title": "Younger", - "overview": "Liza Miller, a suddenly single stay-at-home mother, tries to get back into the working world, only to find it\u2019s nearly impossible to start at the bottom at 40-year old. When a chance encounter convinces her she looks younger than she is, Liza tries to pass herself off as 26 and lands a job as an assistant at Empirical Press. Now she just has to make sure no one finds out the secret only she and her best friend Maggie share.", - "poster_path": "/feWw6i09zaX2apzRqd7QbKEAsx9.jpg", - "backdrop_path": "/wCdhtaLMNtQ37j4OEch4dSKXyoE.jpg", - "year": 2015, - "score": 1, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 87428, - "tvdb_id": 365069, - "title": "Why Women Kill", - "overview": "Three women living in three different decades: a housewife in the '60s, a socialite in the '80s and a lawyer in 2018, deal with infidelity in their marriages.", - "poster_path": "/fI3E1G5N8oimMeyYn5UzWRT2cST.jpg", - "backdrop_path": "/61YttrsiP6B4sJo98HFMuHKPV3G.jpg", - "year": 2019, - "score": 1, - "genre_ids": [ - 35, - 80, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 88989, - "tvdb_id": 376815, - "title": "Nine Perfect Strangers", - "overview": "At a boutique health-and-wellness resort that promises healing and transformation, nine stressed city dwellers try to get on a path to a better way of living. Watching over them during this 10-day retreat is the resort's director, Masha, a woman on a mission to reinvigorate their tired minds and bodies. However, these nine \"perfect\" strangers have no idea what is about to hit them.", - "poster_path": "/oPcqsZIFHrv7HoGgFQnsGDiPulD.jpg", - "backdrop_path": "/RzCw9LQyAcoa9mn4xkEAyuvhgr.jpg", - "year": 2021, - "score": 1, - "genre_ids": [ - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 106454, - "tvdb_id": 384495, - "title": "The Afterparty", - "overview": "Nothing is as it seems in this hilarious murder mystery where each suspect's story is told through a different film genre.", - "poster_path": "/9iAxAxeX5RjB39ckhxPMDCJPpG9.jpg", - "backdrop_path": "/kbehRFMpW7VHsoLB0FM2wsdZsyd.jpg", - "year": 2022, - "score": 0.9711203427159524, - "genre_ids": [ - 9648, - 35, - 80 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - }, - { - "media_type": "tv", - "tmdb_id": 107113, - "watched": false, - "added": true, - "title": "Only Murders in the Building" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 71199, - "tvdb_id": 321149, - "title": "Claws", - "overview": "Follow the life and crimes of five diverse and treacherous manicurists working at the Nail Artisan of Manatee County salon, where there is a lot more going on than silk wraps and pedicures.", - "poster_path": "/3XtQTSWYpmv9NpC9MJt96nJ9fbf.jpg", - "backdrop_path": "/ooCJReGvCw8UcHQeP5gmNFSInQp.jpg", - "year": 2017, - "score": 0.9248318554229322, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 76148, - "watched": true, - "added": true, - "title": "Derry Girls" - }, - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - }, - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - }, - { - "media_type": "tv", - "tmdb_id": 65315, - "watched": true, - "added": false, - "title": "Flaked" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 100883, - "tvdb_id": 378746, - "title": "Never Have I Ever", - "overview": "After a traumatic year, all an Indian-American teen wants is to go from pariah to popular -- but friends, family and feeling won't make it easy on her.", - "poster_path": "/hd5fnBixab6IzfUwjC5wfdbX3eM.jpg", - "backdrop_path": "/umVYLVZ7T85TkIHudxK799lPnLQ.jpg", - "year": 2020, - "score": 0.8999999999999999, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - }, - { - "media_type": "tv", - "tmdb_id": 76148, - "watched": true, - "added": true, - "title": "Derry Girls" - }, - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 42282, - "tvdb_id": 220411, - "title": "Girls", - "overview": "The assorted humiliations, disasters and rare triumphs of four very different twenty-something girls: Hannah, an aspiring writer; Marnie, an art gallery assistant and cousins Jessa and Shoshanna.", - "poster_path": "/ikyT3hnELofnYRsPIqVGgUhDbOT.jpg", - "backdrop_path": "/9O2k1lfAMes2UgrWzHVvpMJHjw.jpg", - "year": 2012, - "score": 0.8666666666666667, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - }, - { - "media_type": "tv", - "tmdb_id": 76148, - "watched": true, - "added": true, - "title": "Derry Girls" - }, - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 243861, - "tvdb_id": 444846, - "title": "The Vince Staples Show", - "overview": "Kind of famous and sort of rich, rapper and actor Vince Staples navigates the challenges and surprises of everyday life in his hometown of The Beach.", - "poster_path": "/gyUKo6ILKVwuiVq4EWv1avEXpBp.jpg", - "backdrop_path": "/saDz8sl3IjuKpPgD3uqkzJ952tJ.jpg", - "year": 2024, - "score": 0.7377724130921047, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 65315, - "watched": true, - "added": false, - "title": "Flaked" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 94617, - "tvdb_id": 415488, - "title": "Grease: Rise of the Pink Ladies", - "overview": "In 1954, a time before rock \u2018n\u2019 roll ruled, before the T-Birds were the coolest in the school, four fed-up outcasts dare to have fun on their own terms, sparking a moral panic that will change Rydell High forever.", - "poster_path": "/dGu8u5F9Cjn9Ij2aMYtGmKHp5m1.jpg", - "backdrop_path": "/aWXGFJyhEvI1Y7NWk2A3oriHMfb.jpg", - "year": 2023, - "score": 0.6669665360344916, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 254420, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 62823, - "tvdb_id": 294417, - "title": "Scream: The TV Series", - "overview": "What starts as a YouTube video going viral, soon leads to problems for the teenagers of Lakewood and serves as the catalyst for a murder that opens up a window to the town's troubled past. Everyone has secrets. Everyone tells lies. Everyone is fair game.", - "poster_path": "/cb2WD75HjajBmFtPzfU5ukGqfeo.jpg", - "backdrop_path": "/xCXyhbr7T4vx82QUqtN8ZszYIqx.jpg", - "year": 2015, - "score": 0.666741634008623, - "genre_ids": [ - 18, - 80, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 226637, - "watched": true, - "added": false, - "title": "High Potential" - }, - { - "media_type": "tv", - "tmdb_id": 254420, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 18856, - "tvdb_id": 95741, - "title": "Hawthorne", - "overview": "Christina Hawthorne is a compassionate and headstrong Chief Nursing Officer heading up a group of dedicated nurses at Richmond Trinity Hospital on the hospital's front lines. She does everything in her power to help her patients. When necessary, she takes on doctors and administrators who are overworked, distracted or just unable to see the human being behind the hospital chart. But the long days at the hospital and Hawthorne\u2019s intense focus on helping others take a toll on her personal life.", - "poster_path": "/bZuFnSA7RtgEQJUBdHqbhtlbpmp.jpg", - "backdrop_path": "/rvlQ6u2ZR8phyOtQSmaOOP9pOPv.jpg", - "year": 2009, - "score": 0.6224984087250857, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 39793, - "watched": true, - "added": false, - "title": "Call the Midwife" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 1803, - "tvdb_id": 76130, - "title": "The Facts of Life", - "overview": "Mrs. Edna Garrett, housemother and dietitian at the Eastland School, teaches a group of girls in her charge how to solve those problems that every teenager has to face.", - "poster_path": "/45i9VujUbQITmHl3QE3eNs9ZUv3.jpg", - "backdrop_path": "/nxqRVJ3QP76CZBaunWl42hQVK0.jpg", - "year": 1979, - "score": 0.598852635575991, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 4586, - "watched": true, - "added": false, - "title": "Gilmore Girls" - }, - { - "media_type": "tv", - "tmdb_id": 254420, - "watched": true, - "added": false - }, - { - "media_type": "tv", - "tmdb_id": 108255, - "watched": false, - "added": true, - "title": "All Creatures Great & Small (2020)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 116450, - "tvdb_id": 394924, - "title": "And Just Like That\u2026", - "overview": "This new chapter of \u201cSex and the City\u201d follows Carrie, Miranda and Charlotte as they navigate the journey from the complicated reality of life and friendship in their 30s to the even more complicated reality of life and friendship in their 50s.", - "poster_path": "/2b6E0pN19IGsmxSv6HyTKydKKdb.jpg", - "backdrop_path": "/sHvTsXSWxuW7hoXAqWM4lBLJI50.jpg", - "year": 2021, - "score": 0.5808878159517542, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - }, - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - }, - { - "media_type": "tv", - "tmdb_id": 65315, - "watched": true, - "added": false, - "title": "Flaked" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 199001, - "tvdb_id": 405817, - "title": "My Life with the Walter Boys", - "overview": "When a tragedy disrupts her life, a teen moves in with her guardian's big family in a small town and learns new lessons about love, hope and friendship.", - "poster_path": "/dQOwpTpBQEqRUcev4423LrU32G6.jpg", - "backdrop_path": "/ntsEP1jUbLxz62MZqxmVfM5TNfX.jpg", - "year": 2023, - "score": 0.5398411880684697, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - }, - { - "media_type": "tv", - "tmdb_id": 207484, - "watched": true, - "added": false, - "title": "Outlander: Blood of My Blood" - }, - { - "media_type": "tv", - "tmdb_id": 258165, - "watched": false, - "added": true, - "title": "East of Eden (2026)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 64254, - "tvdb_id": 298901, - "title": "Master of None", - "overview": "30-year-old New York actor Dev takes on such pillars of maturity as the first big job, a serious relationship, and busting sex offenders on the subway.", - "poster_path": "/AcJM86PhgHAfbrF4dMKBaqO3cHV.jpg", - "backdrop_path": "/yYnxld9hgTLCOFORequmOK6paj2.jpg", - "year": 2015, - "score": 0.5, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 196454, - "tvdb_id": 425204, - "title": "Queen Charlotte: A Bridgerton Story", - "overview": "Young Queen Charlotte's marriage to King George of England sparks an epic love story and transforms high society in this \"Bridgerton\" universe prequel.", - "poster_path": "/kFSaVIlBRycGNfrLzJZX7dgSQ1o.jpg", - "backdrop_path": "/92R2R75gIiVo32dIm0JUaIytpij.jpg", - "year": 2023, - "score": 0.5, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 207484, - "watched": true, - "added": false, - "title": "Outlander: Blood of My Blood" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 206829, - "tvdb_id": 422776, - "title": "The Regime", - "overview": "The story of one year within the walls of the palace of a modern European regime as it begins to unravel.", - "poster_path": "/ztqPixNyezY6pWSNIP2AlhwPMO0.jpg", - "backdrop_path": "/lp6Rsgid52BIlzYxWDURFSZZU6m.jpg", - "year": 2024, - "score": 0.5, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 99248, - "tvdb_id": 376879, - "title": "Survive", - "overview": "Jane's plane crashes on a remote snow-covered mountain and she, along with Paul, the only remaining survivors, must pull themselves out of the wreckage and fight for their lives. Together they embark on a harrowing journey out of the wilderness, battling brutal conditions and personal traumas.", - "poster_path": "/stere2OYFYoqj6LTGm0XXWUcKYy.jpg", - "backdrop_path": "/A9h3YUFbnQ7ReXwvnaQvJf5uNjC.jpg", - "year": 2020, - "score": 0.49493359594934455, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 117488, - "watched": false, - "added": true, - "title": "Yellowjackets" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 124834, - "tvdb_id": 395494, - "title": "Heartstopper", - "overview": "Teens Charlie and Nick discover their unlikely friendship might be something more as they navigate school and young love.", - "poster_path": "/dQc0QbDiHjGmWxTfKtBgYtS4bj5.jpg", - "backdrop_path": "/8cpXau1LjYMBjiaHUS75JmlgGsU.jpg", - "year": 2022, - "score": 0.4949108657538713, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 202851, - "watched": false, - "added": true, - "title": "Big Boys" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 7406, - "tvdb_id": 78289, - "title": "All Creatures Great and Small", - "overview": "The trials and misadventures of the staff at a country veterinary office in Yorkshire. James Herriot, a young animal surgeon, moves to a small Yorkshire town to begin his first job.", - "poster_path": "/inl6wqdRPoLEDXttC33x9PBoMbN.jpg", - "backdrop_path": "/kqpOg91jYda1G3RU7MpjdHllAGy.jpg", - "year": 1978, - "score": 0.49490485366539394, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 108255, - "watched": false, - "added": true, - "title": "All Creatures Great & Small (2020)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 69470, - "tvdb_id": 320450, - "title": "Santa Clarita Diet", - "overview": "They're ordinary husband and wife realtors until she undergoes a dramatic change that sends them down a road of death and destruction. In a good way.", - "poster_path": "/5rBjNm2sRubaXKBnU904NInFi7P.jpg", - "backdrop_path": "/zPCDfLwOEtEhddaT2xeO5ChErsV.jpg", - "year": 2017, - "score": 0.45706579996470237, - "genre_ids": [ - 35, - 9648, - 80 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 107113, - "watched": false, - "added": true, - "title": "Only Murders in the Building" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 62705, - "tvdb_id": 295729, - "title": "Married at First Sight", - "overview": "Working with leading relationship experts, eight Australian singles are carefully match-made into four married couples, who each meet each other - for the very first time - at their wedding. We'll follow them as they marry, honeymoon, meet the in-laws and set up home, all the while getting to know one another more and more deeply, to see if the matchmakers have got it right and they will have a future together.", - "poster_path": "/2F0ADv2beVB4tRG0qx7YlWMvnDN.jpg", - "backdrop_path": "/pLa2pcYnKA9xxWiWh1C08TXcDTY.jpg", - "year": 2015, - "score": 0.42500246169008526, - "genre_ids": [ - 10764 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 290750, - "watched": false, - "added": true, - "title": "Love is Blind: Netherlands" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 253376, - "tvdb_id": 449706, - "title": "The Girlfriend", - "overview": "Laura has it all: a glittering career, a loving husband, and her precious son, Daniel. But her perfect life unravels when Daniel brings home Cherry, a girlfriend who changes everything. After a tense introduction, Laura becomes convinced Cherry is hiding something. Is she a manipulative social climber, or is Laura just paranoid? The truth is a matter of perspective.", - "poster_path": "/ktrp3tdZ5IQpFux4nLy8z70bt3n.jpg", - "backdrop_path": "/lnVWmFvLv2pTZGsuAJytiqKu541.jpg", - "year": 2025, - "score": 0.41000601893271116, - "genre_ids": [ - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 207484, - "watched": true, - "added": false, - "title": "Outlander: Blood of My Blood" - }, - { - "media_type": "tv", - "tmdb_id": 117488, - "watched": false, - "added": true, - "title": "Yellowjackets" - }, - { - "media_type": "tv", - "tmdb_id": 258165, - "watched": false, - "added": true, - "title": "East of Eden (2026)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 39468, - "tvdb_id": 211681, - "title": "Mildred Pierce", - "overview": "Mildred Pierce depicts an overprotective, self-sacrificing mother during the Great Depression who finds herself separated from her husband, opening a restaurant of her own and falling in love with a man, all the while trying to earn her spoiled, narcissistic daughter's love and respect.", - "poster_path": "/eZ7TUocetldADAXZfnMSEVl7SbJ.jpg", - "backdrop_path": "/nYGVRE2VVJZ71gqsm1AYAjO0C1G.jpg", - "year": 2011, - "score": 0.407539273675682, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 258165, - "watched": false, - "added": true, - "title": "East of Eden (2026)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 126914, - "tvdb_id": 404298, - "title": "With Love", - "overview": "The Diaz siblings, Lily and Jorge, are on a mission to find love and purpose. They cross paths with seemingly unrelated residents during some of the most heightened days of the year\u2014the holidays.", - "poster_path": "/H7UoEyxRPKdwgdy4kt7UbvkAlX.jpg", - "backdrop_path": "/tlamrEuFPeXBjUNW4ynmJaAemV3.jpg", - "year": 2021, - "score": 0.4007003182322874, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - }, - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - }, - { - "media_type": "tv", - "tmdb_id": 65315, - "watched": true, - "added": false, - "title": "Flaked" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 5721, - "tvdb_id": 82422, - "title": "The Secret Life of the American Teenager", - "overview": "Amy and her friends at Grant High learn to define themselves while they navigate the perilous waters of contemporary adolescence. Between their love triangles, secrets, drama, accusations, gossip, confusion, and scandalous rumors, there's never a dull moment.", - "poster_path": "/k2XTj9D0tzca3dSgvVojU9xk8F5.jpg", - "backdrop_path": "/bH9Sf6wzJqYeBzhOsqGXwcLSUgR.jpg", - "year": 2008, - "score": 0.38888888888888884, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 76148, - "watched": true, - "added": true, - "title": "Derry Girls" - }, - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 21762, - "tvdb_id": 94551, - "title": "Parenthood", - "overview": "The trials and tribulations of the very large, colorful and imperfect Braverman family.", - "poster_path": "/9KjKLJrrUI1sU9bNsQaQ5H8kTyY.jpg", - "backdrop_path": "/72zLfNDaL8JpfLDwmQ2b8DPbeHc.jpg", - "year": 2010, - "score": 0.3781500494089771, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 33155, - "watched": true, - "added": false, - "title": "Offspring" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 80587, - "tvdb_id": 342059, - "title": "Big City Greens", - "overview": "The offbeat adventures of 10-year-old Cricket Green, a mischievous and optimistic country boy who moves to the big city with his wildly out of place family \u2013 older sister Tilly, father Bill and Gramma Alice.", - "poster_path": "/buRk2Vrz8UhF5nZUOADSRZLEU1f.jpg", - "backdrop_path": "/vVGmv5mle6lCrgnx8lNv5Q1vZPw.jpg", - "year": 2018, - "score": 0.3781500494089771, - "genre_ids": [ - 10751, - 16, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 66134, - "watched": true, - "added": false, - "title": "The Durrells" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 39859, - "tvdb_id": 249882, - "title": "Awkward.", - "overview": "An irreverent look at the conflict, chaos and humor that defines teenage life through the eyes of 15-year-old Jenna Hamilton whose life begins to change when a simple accident becomes an epic misunderstanding and is blown way out of proportion. Narration in the first-person voice of Jenna's blog posts captures the humor within the struggles and experiences everyone can relate to from their formative years.", - "poster_path": "/7PLO6PdGmfKiV3KER2Rd08Ga8kM.jpg", - "backdrop_path": "/yFFW6MtYRjBHppYWskmG81pR7xV.jpg", - "year": 2011, - "score": 0.37155333461369744, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 254420, - "watched": true, - "added": false - }, - { - "media_type": "tv", - "tmdb_id": 202851, - "watched": false, - "added": true, - "title": "Big Boys" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 210805, - "tvdb_id": 414550, - "title": "Tyler Perry's Zatima", - "overview": "Zac and Fatima take a huge step to strengthen their bond, but new friends and past actions interfere with their blossoming relationship.", - "poster_path": "/mccoy3vzuTHucJXkBL27SqcyAvv.jpg", - "backdrop_path": "/6Vtd3EMdOuoT3GIUKDbkDzSFp0Q.jpg", - "year": 2022, - "score": 0.36888620654605236, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 65315, - "watched": true, - "added": false, - "title": "Flaked" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 4177, - "tvdb_id": 70589, - "title": "Perry Mason", - "overview": "The cases of master criminal defense attorney Perry Mason and his staff who handled the most difficult of cases in the aid of the innocent.", - "poster_path": "/sK6JvgNFP1ClT4aF4nPAZiDpAdk.jpg", - "backdrop_path": "/iq4BjyVsDxzg24XnjoGP0Xi2Tz5.jpg", - "year": 1957, - "score": 0.3333333333333333, - "genre_ids": [ - 9648, - 18, - 80 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 226637, - "watched": true, - "added": false, - "title": "High Potential" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 46028, - "tvdb_id": 267777, - "title": "Girl Meets World", - "overview": "The adventures of relatable and adventurous Riley Matthews, the tween daughter of Cory and Topanga Matthews, and her bold best friend Maya as they traverse the twists and turns of teenage years at Manhattan's John Quincy Adams Middle School where Riley's dad is their History teacher.", - "poster_path": "/8E1i8j6GVT7wMzw8CtqzifRpr5R.jpg", - "backdrop_path": "/pJvLprQwTVEOSBPs25y4rM214ch.jpg", - "year": 2014, - "score": 0.3333333333333333, - "genre_ids": [ - 35, - 10751 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 4586, - "watched": true, - "added": false, - "title": "Gilmore Girls" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 92621, - "tvdb_id": 351960, - "title": "Brassic", - "overview": "A group of working-class friends finding unconventional ways to win at life in suburban northern England. These lads have dealt, scammed, bribed and conned their way through adolescence, but now, their dealing and stealing is catching up with them and a whole load of trouble is heading their way.", - "poster_path": "/tnIq3yiLMZJpaJyRs8FNV7WJs6V.jpg", - "backdrop_path": "/hEJE1WsZZqjJsq0Ltpom5qZzWEE.jpg", - "year": 2019, - "score": 0.325, - "genre_ids": [ - 35, - 18, - 80 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 76148, - "watched": true, - "added": true, - "title": "Derry Girls" - }, - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 1395, - "tvdb_id": 80547, - "title": "Gossip Girl", - "overview": "An exclusive group of privileged teens from a posh prep school on Manhattan's Upper East Side whose lives revolve around the blog of the all-knowing albeit ultra-secretive Gossip Girl.", - "poster_path": "/ep03M6KKZGeljOizPEbt3Geja5n.jpg", - "backdrop_path": "/5RWAjCYhu3D8Ai2QBYP7GjaxFb3.jpg", - "year": 2007, - "score": 0.3166966536034492, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 4586, - "watched": true, - "added": false, - "title": "Gilmore Girls" - }, - { - "media_type": "tv", - "tmdb_id": 254420, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 6127, - "tvdb_id": 78895, - "title": "Agatha Christie's Marple", - "overview": "The adventures of Miss Jane Marple, an elderly spinster living in the quiet little village of St Mary Mead. During her many visits to friends and relatives in other villages, Miss Marple often stumbles upon mysterious murders which she helps solve. Although the police are sometimes reluctant to accept Miss Marple's help, her reputation and unparalleled powers of observation eventually win them over.", - "poster_path": "/nVswrZQpqQND9TgwgbWgz18KgAo.jpg", - "backdrop_path": "/1lBEfsnzUkxtxzvFwimENpM6bEP.jpg", - "year": 2004, - "score": 0.31224984087250857, - "genre_ids": [ - 18, - 80, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 226637, - "watched": true, - "added": false, - "title": "High Potential" - }, - { - "media_type": "tv", - "tmdb_id": 39793, - "watched": true, - "added": false, - "title": "Call the Midwife" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 1021, - "tvdb_id": 71756, - "title": "Casualty", - "overview": "Drama series about the staff and patients at Holby City Hospital's emergency department, charting the ups and downs in their personal and professional lives.", - "poster_path": "/ahqMUNIUeGIBQSkShEV32085IFZ.jpg", - "backdrop_path": "/wnyMAP1Xep5BUwTqMq2KBHjRHws.jpg", - "year": 1986, - "score": 0.31124920436254283, - "genre_ids": [ - 18, - 10766 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 39793, - "watched": true, - "added": false, - "title": "Call the Midwife" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 211, - "tvdb_id": 79636, - "title": "The Game", - "overview": "When her boyfriend Derwin Davis is chosen as the new third-string wide receiver for the San Diego Sabers, Melanie Barnett decides to attend a local college so she can be with him. While Derwin worries about the plays on the field, Melanie adjusts to her new lifestyle. She gets a play-by-play account of the lives and relationships among NFL wives, girlfriends and mom/managers who use their best game to help their men stay on the field and on their arm.", - "poster_path": "/zmvRaCRcmi6lsriYxZmAR6uWHPS.jpg", - "backdrop_path": "/lW3RCsfXXVGIBXyupMGT7dAYcze.jpg", - "year": 2006, - "score": 0.30110976993969285, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - }, - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - }, - { - "media_type": "tv", - "tmdb_id": 65315, - "watched": true, - "added": false, - "title": "Flaked" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 61118, - "tvdb_id": 281776, - "title": "You're the Worst", - "overview": "Narcissistic, brash, and self-destructive Jimmy Shive-Overly thinks all relationships are doomed. Cynical, people-pleasing, and stubborn Gretchen Cutler knows that relationships aren't for her. So when they meet at a wedding, it's only natural that the two of them go home together.", - "poster_path": "/whXfP89yXz4AwQ9dzWCTGcl9YvV.jpg", - "backdrop_path": "/3gqDstdBLUbJ2jY3hl953iS97D4.jpg", - "year": 2014, - "score": 0.3005952380952381, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - }, - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - }, - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 62704, - "tvdb_id": 281714, - "title": "Ballers", - "overview": "Looking at the lives of former and current football players, the show follows former superstar Spencer Strasmore as he gets his life on track in retirement while mentoring other current and former players through the daily grind of the business of football.", - "poster_path": "/WyIazPyjmcFMC42nWEpI0jr56x.jpg", - "backdrop_path": "/gyPWbM1lq7Ufd9cENSl5Phsrb0a.jpg", - "year": 2015, - "score": 0.29592413769736825, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 76148, - "watched": true, - "added": true, - "title": "Derry Girls" - }, - { - "media_type": "tv", - "tmdb_id": 65315, - "watched": true, - "added": false, - "title": "Flaked" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 39525, - "tvdb_id": 239761, - "title": "Wilfred", - "overview": "Everyone else sees Wilfred as just a dog, but Ryan sees a crude and somewhat surly, yet irrepressibly brave and honest Australian bloke in a cheap dog suit. While leading him through a series of comedic and existential adventures, Wilfred the dog shows Ryan the man how to overcome his fears and joyfully embrace the unpredictability and insanity of the world around him.", - "poster_path": "/2cUYCkmHEWsxaNiVTQnFqxyq5Ij.jpg", - "backdrop_path": "/f43EKMX1QHJhiieDfhRgh5M1fZj.jpg", - "year": 2011, - "score": 0.2920702193720095, - "genre_ids": [ - 35, - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - }, - { - "media_type": "tv", - "tmdb_id": 65315, - "watched": true, - "added": false, - "title": "Flaked" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 111838, - "tvdb_id": 390537, - "title": "The Woman in the House Across the Street from the Girl in the Window", - "overview": "For Anna, every day is the same. She sits with her wine, staring out the window, watching life go by without her. But when a handsome neighbor moves in across the street, Anna starts to see a light at the end of the tunnel. That is until she witnesses a gruesome murder\u2026 Or did she?", - "poster_path": "/riSoMsWYkwqed4ul5PgHOnbIVFp.jpg", - "backdrop_path": "/7I81Iey8vEk6IOfSXqulSckcCsZ.jpg", - "year": 2022, - "score": 0.2656526399717619, - "genre_ids": [ - 9648, - 80, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 107113, - "watched": false, - "added": true, - "title": "Only Murders in the Building" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 124010, - "tvdb_id": 401513, - "title": "How I Met Your Father", - "overview": "In the near future, Sophie tells her son the story of how she met his father: a story that catapults us back to the year 2021 where Sophie and her close-knit group of friends are in the midst of figuring out who they are, what they want out of life, and how to fall in love in the age of dating apps and limitless options.", - "poster_path": "/8psLGtFzTMYCXxUNMpMOCB6doPn.jpg", - "backdrop_path": "/40JJpWnIkxMpKGHCjt9uE6kzJHU.jpg", - "year": 2022, - "score": 0.255580544669541, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 4586, - "watched": true, - "added": false, - "title": "Gilmore Girls" - }, - { - "media_type": "tv", - "tmdb_id": 254420, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 275139, - "tvdb_id": 455844, - "title": "Phony", - "overview": "After waking up from a freak car accident, Sonny discovers that his mother has been replaced by an impostor.", - "poster_path": "/iCyQc8cSSHkxUHbkvzbC77owALt.jpg", - "backdrop_path": "/roUD5m2nj6k88azMFsiqBae29cr.jpg", - "year": 2026, - "score": 0.25263157894736843, - "genre_ids": [ - 35, - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 69050, - "tvdb_id": 311954, - "title": "Riverdale", - "overview": "Set in the present, the series offers a bold, subversive take on Archie, Betty, Veronica and their friends, exploring the surreality of small-town life, the darkness and weirdness bubbling beneath Riverdale\u2019s wholesome facade.", - "poster_path": "/d8mmn9thQ5dBk2qbv6BCqGUXWK3.jpg", - "backdrop_path": "/kb9XvtEnDhBVVit4eeKygqll4EA.jpg", - "year": 2017, - "score": 0.25, - "genre_ids": [ - 80, - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 70796, - "tvdb_id": 326791, - "title": "The Marvelous Mrs. Maisel", - "overview": "It\u2019s 1958 Manhattan and Miriam \u201cMidge\u201d Maisel has everything she\u2019s ever wanted - the perfect husband, kids, and Upper West Side apartment. But when her life suddenly takes a turn and Midge must start over, she discovers a previously unknown talent - one that will take her all the way from the comedy clubs of Greenwich Village to a spot on Johnny Carson\u2019s couch.", - "poster_path": "/zS7fQiOZiKCVH2vlYSiIsFWW8hh.jpg", - "backdrop_path": "/vQ77kC1amsZECKIxkUIsMJCtBVp.jpg", - "year": 2017, - "score": 0.25, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 135959, - "tvdb_id": 411173, - "title": "That '90s Show", - "overview": "Hello, Wisconsin! It's 1995 and Leia Forman, daughter of Eric and Donna, is visiting her grandparents for the summer where she bonds with a new generation of Point Place kids under the watchful eye of Kitty and the stern glare of Red. Sex, drugs and rock 'n roll never dies, it just changes clothes.", - "poster_path": "/nZcufEuqZqNYMx6mNjlh2rmjDqx.jpg", - "backdrop_path": "/23WUgvjfnQFNwSPSSG9CdGFnauN.jpg", - "year": 2023, - "score": 0.25, - "genre_ids": [ - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 76148, - "watched": true, - "added": true, - "title": "Derry Girls" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 241372, - "tvdb_id": 443312, - "title": "56 Days", - "overview": "When an unidentified body is found in a luxury apartment linked to Oliver Kennedy and his girlfriend Ciara Wyse, Detectives Lee Reardon and Karl Connolly reconstruct the couple's deadly romance across the past 56 days.", - "poster_path": "/sdJLbucggwGj8NdX0UN2zt1Vwmn.jpg", - "backdrop_path": "/dnEljhBkw53ra7tEl2JNKGrI0wk.jpg", - "year": 2026, - "score": 0.25, - "genre_ids": [ - 18, - 80, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 250504, - "tvdb_id": 448245, - "title": "The Beast in Me", - "overview": "A famous author is pulled into a twisted mind game with her rich, powerful new neighbor \u2014 who might be a murderer.", - "poster_path": "/jxf7JCfIMvGONWTNUIJ068sFixK.jpg", - "backdrop_path": "/ylW0m5UztyyL4YFu8EC6usUHLF.jpg", - "year": 2025, - "score": 0.25, - "genre_ids": [ - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 258190, - "tvdb_id": 451659, - "title": "Coldwater", - "overview": "A man in the midst of a mid-life crisis moves his family to a remote Scottish village, only to find himself entangled in a dangerous friendship with a sinister neighbour.", - "poster_path": "/oguBhjxw7hwwCyq2G4ujFRy6kbX.jpg", - "backdrop_path": "/yufA0LfNVYYFApA07cgs3V45yJK.jpg", - "year": 2025, - "score": 0.25, - "genre_ids": [ - 18, - 80 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 207484, - "watched": true, - "added": false, - "title": "Outlander: Blood of My Blood" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 120998, - "tvdb_id": 398822, - "title": "Poker Face", - "overview": "Follow Charlie Cale, a woman with an extraordinary ability to tell when someone is lying, as she hits the road and, at every stop, encounters a new cast of characters and crimes she can't help but solve.", - "poster_path": "/8Xm5dyMQC9whMJKnGdFugUAW73C.jpg", - "backdrop_path": "/ccOzCmrglAjRGtqv5ClTaBEsWt8.jpg", - "year": 2023, - "score": 0.2474649332627381, - "genre_ids": [ - 80, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 107113, - "watched": false, - "added": true, - "title": "Only Murders in the Building" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 4454, - "tvdb_id": 71814, - "title": "Will & Grace", - "overview": "Will Truman and Grace Adler are best friends living in New York, and when Grace's engagement falls apart, she moves in with Will. Together, along with their friends, they go through the trials of dating, sex, relationships and their careers, butting heads at times but ultimately supporting one another while exchanging plenty of witty banter along the way.", - "poster_path": "/aEaYdyHcpHN3fIXHhXHtXOs8Rtk.jpg", - "backdrop_path": "/pIPMPMEZErCxTvQG9HDt4AsnAfn.jpg", - "year": 1998, - "score": 0.24745543287693564, - "genre_ids": [ - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 202851, - "watched": false, - "added": true, - "title": "Big Boys" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 2585, - "tvdb_id": 74684, - "title": "Heartbeat", - "overview": "Set during the 1960s in the fictional North Yorkshire village of Aidensfield, this enduringly popular series interweaves crime and medical storylines.", - "poster_path": "/naMIm2WuIFcBk2yNWAQcRAhZFyU.jpg", - "backdrop_path": "/dRVToyhldkgjzGcrhPlZf4IuK0y.jpg", - "year": 1992, - "score": 0.24745242683269697, - "genre_ids": [ - 80, - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 108255, - "watched": false, - "added": true, - "title": "All Creatures Great & Small (2020)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 269, - "tvdb_id": 72158, - "title": "One Tree Hill", - "overview": "In Tree Hill, North Carolina two half brothers share a last name and nothing else. Brooding, blue-collar Lucas is a talented street-side basketball player, but his skills are appreciated only by his friends at the river court. Popular, affluent Nathan basks in the hero-worship of the town, as the star of his high school team. And both boys are the son of former college ball player Dan Scott whose long ago choice to abandon Lucas and his mother Karen, will haunt him long into his life with wife Deb and their son Nathan.", - "poster_path": "/sOrelBaAhp7DZbPTivDwKEyPslC.jpg", - "backdrop_path": "/gJOpHgHa37qnglH3dL9g63iztky.jpg", - "year": 2003, - "score": 0.22683789670264065, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 76148, - "watched": true, - "added": true, - "title": "Derry Girls" - }, - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - }, - { - "media_type": "tv", - "tmdb_id": 258165, - "watched": false, - "added": true, - "title": "East of Eden (2026)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 95004, - "tvdb_id": 367658, - "title": "Tyler Perry's The Oval", - "overview": "A seemingly perfect interracial first family becomes the White House's newest residents. But behind closed doors they unleash a torrent of lies, cheating and corruption.", - "poster_path": "/l0u0L1ekz6VVBvbZDWM1XizNEes.jpg", - "backdrop_path": "/LdcSeybOK0xoWTkDjyy1P49KvA.jpg", - "year": 2019, - "score": 0.22345230192348647, - "genre_ids": [ - 18, - 10751 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 33155, - "watched": true, - "added": false, - "title": "Offspring" - }, - { - "media_type": "tv", - "tmdb_id": 66134, - "watched": true, - "added": false, - "title": "The Durrells" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 4107, - "tvdb_id": 74112, - "title": "The Steve Harvey Show", - "overview": "Down on his luck and out of money, former R&B star Steve Hightower lands a music teacher gig at an inner-city Chicago school. Showing who's in charge with his unorthodox approach, Steve discovers a new groove at Washington High School.", - "poster_path": "/iGUWv21kgKc79bpYxImk2nTIPin.jpg", - "backdrop_path": "/2y3q6BzERpZRZrutdKrMHrBnbDb.jpg", - "year": 1996, - "score": 0.22232217867816387, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 254420, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 70785, - "tvdb_id": 322971, - "title": "Anne with an E", - "overview": "A coming-of-age story about an outsider who, against all odds and numerous challenges, fights for love and acceptance and for her place in the world. The series centers on a young orphaned girl in the late 1890s, who, after an abusive childhood spent in orphanages and the homes of strangers, is mistakenly sent to live with an elderly woman and her aging brother. Over time, 13-year-old Anne will transform their lives and eventually the small town in which they live with her unique spirit, fierce intellect and brilliant imagination.", - "poster_path": "/6P6tXhjT5tK3qOXzxF9OMLlG7iz.jpg", - "backdrop_path": "/ywQtHG17LZhAFZyZtBflhtFMtJ7.jpg", - "year": 2017, - "score": 0.21646710032483785, - "genre_ids": [ - 18, - 10751 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 39793, - "watched": true, - "added": false, - "title": "Call the Midwife" - }, - { - "media_type": "tv", - "tmdb_id": 108255, - "watched": false, - "added": true, - "title": "All Creatures Great & Small (2020)" - }, - { - "media_type": "tv", - "tmdb_id": 66134, - "watched": true, - "added": false, - "title": "The Durrells" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 4607, - "tvdb_id": 73739, - "title": "Lost", - "overview": "Stripped of everything, the survivors of a horrific plane crash must work together to stay alive. But the island holds many secrets.", - "poster_path": "/og6S0aTZU6YUJAbqxeKjCa3kY1E.jpg", - "backdrop_path": "/yUOFocKDW7MCC5isx4FK8A68QFp.jpg", - "year": 2004, - "score": 0.2149778653164482, - "genre_ids": [ - 9648, - 10759, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - }, - { - "media_type": "tv", - "tmdb_id": 117488, - "watched": false, - "added": true, - "title": "Yellowjackets" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 73319, - "tvdb_id": 332747, - "title": "90 Day Fianc\u00e9: Before the 90 Days", - "overview": "Follow couples who have an existing relationship online, but haven't met in person. We'll experience their journey as they travel to the other's foreign country for the first time in an attempt to establish an in-person relationship and start the K-1 visa process.", - "poster_path": "/miG0k1MGyLovjKETzhqbKs9kIdt.jpg", - "backdrop_path": "/5cq5nn8L9wxK4GBPfZU7KnTnrFE.jpg", - "year": 2017, - "score": 0.21250123084504263, - "genre_ids": [ - 10764 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 290750, - "watched": false, - "added": true, - "title": "Love is Blind: Netherlands" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 2398, - "tvdb_id": 74631, - "title": "Girlfriends", - "overview": "A friend group of black women face life's tests and triumphs together. From dating to divorce, and friends to family to relationships, Joan, Maya, Lynn and Toni support each other despite their differing backgrounds.", - "poster_path": "/buFnsyWEg4pPR7dco5Vbsm6HCIY.jpg", - "backdrop_path": "/lJEItmoc7bdqvA0yS5quuBIwW0N.jpg", - "year": 2000, - "score": 0.20647286761979436, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 4586, - "watched": true, - "added": false, - "title": "Gilmore Girls" - }, - { - "media_type": "tv", - "tmdb_id": 202851, - "watched": false, - "added": true, - "title": "Big Boys" - }, - { - "media_type": "tv", - "tmdb_id": 108255, - "watched": false, - "added": true, - "title": "All Creatures Great & Small (2020)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 186, - "tvdb_id": 74845, - "title": "Weeds", - "overview": "After the unexpected death of her husband, a suburban mom resorts to selling weed to support her family.", - "poster_path": "/gKUsBTa5b0GY7U4iWBseeBalfjO.jpg", - "backdrop_path": "/6k6vAUa0Fm73HB0QBOJbFGTgPq5.jpg", - "year": 2005, - "score": 0.20535714285714285, - "genre_ids": [ - 35, - 80, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 31917, - "tvdb_id": 146711, - "title": "Pretty Little Liars", - "overview": "Based on the Pretty Little Liars series of young adult novels by Sara Shepard, the series follows the lives of four girls \u2014 Spencer, Hanna, Aria, and Emily \u2014 whose clique falls apart after the disappearance of their queen bee, Alison. One year later, they begin receiving messages from someone using the name \"A\" who threatens to expose their secrets \u2014 including long-hidden ones they thought only Alison knew.", - "poster_path": "/aUPbHiLS3hCHKjtLsncFa9g0viV.jpg", - "backdrop_path": "/6NuvpA24GbWrnkKsYrNyr2RiRbp.jpg", - "year": 2010, - "score": 0.20473848173969317, - "genre_ids": [ - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - }, - { - "media_type": "tv", - "tmdb_id": 117488, - "watched": false, - "added": true, - "title": "Yellowjackets" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 88324, - "tvdb_id": 371972, - "title": "Virgin River", - "overview": "After seeing an ad for a midwife, a recently divorced big-city nurse moves to the redwood forests of California, where she meets an intriguing man.", - "poster_path": "/oHEqfmSWR4Ex4V4AJyUn8HGHHnt.jpg", - "backdrop_path": "/m1nuMHBCiNy6pMGzRAdH5frNesN.jpg", - "year": 2019, - "score": 0.203769636837841, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 258165, - "watched": false, - "added": true, - "title": "East of Eden (2026)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 4582, - "tvdb_id": 78677, - "title": "Ironside", - "overview": "When an assassin's bullet confines him to a wheelchair for life ending his career as Chief of Detectives, Robert T. Ironside becomes a consultant to the police department. Detective Sergeant Ed Brown and policewoman Eve Whitfield join with him to crack varied and fascinating cases. Ex-con Mark Sanger is employed by the chief as home help but eventually becomes a fully fledged member of the team also. Officer Whitfield leaves after 4 years service, and is replaced by Officer Fran Belding.", - "poster_path": "/Fu9Sv0pQ0s89uWwwXcaG0kiNW7.jpg", - "backdrop_path": "/7lYBvjfgrguOUgnS9NrpysHtaCq.jpg", - "year": 1967, - "score": 0.2, - "genre_ids": [ - 80, - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 226637, - "watched": true, - "added": false, - "title": "High Potential" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 67697, - "tvdb_id": 309523, - "title": "Search Party", - "overview": "A dark comedy about four self-absorbed twenty-somethings who become entangled in an ominous mystery when a former college acquaintance suddenly disappears.", - "poster_path": "/8ldHjc3Hx29NKK0bfgaYZkIwQWN.jpg", - "backdrop_path": "/kK2bP2ZWF2up3Y2uzBJupHCaMos.jpg", - "year": 2016, - "score": 0.2, - "genre_ids": [ - 35, - 18, - 80 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 130842, - "tvdb_id": 393813, - "title": "The Newsreader", - "overview": "An unconventional relationship in a world on the cusp of change; a star newsreader and an ambitious bisexual reporter join forces in a ruthless 1986 newsroom, as events unfold that will change their lives.", - "poster_path": "/aHl6HgHcFLfe68E7uiq8NRDCXOv.jpg", - "backdrop_path": "/aGLAJddCYwKhnGZeJdtOEhBGYsr.jpg", - "year": 2021, - "score": 0.2, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 153723, - "tvdb_id": 396645, - "title": "All American: Homecoming", - "overview": "Follow the journeys of Simone Hicks, a tennis hopeful from Beverly Hills, and elite baseball player Damon Sims from Chicago, as they navigate life at the prestigious HBCU Bringston University.", - "poster_path": "/97988mOprohvBB61LgdsSdeMGa3.jpg", - "backdrop_path": "/9An9RjsIGLnRmZDbeUVCWDUcuWB.jpg", - "year": 2022, - "score": 0.2, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 207484, - "watched": true, - "added": false, - "title": "Outlander: Blood of My Blood" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 41875, - "tvdb_id": 251405, - "title": "Chemistry", - "overview": "The scandalous lives of Liz and Michael, a cop and a lawyer who meet in a near-fatal coincidence. Drama and comedy with inevitable and powerful chemistry between a man and woman that completely alter a destined life plan.", - "poster_path": "/6YL87vk4mdRv2o0v04X6FjSd0XO.jpg", - "backdrop_path": "/4bUFGOe6AxBqBPx6rNMsWVJeKsW.jpg", - "year": 2011, - "score": 0.1875, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - }, - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 60705, - "tvdb_id": 277169, - "title": "Faking It", - "overview": "A romantic comedy about two best friends who love each other -- in slightly different ways. After numerous failed attempts to become popular, the girls are mistakenly outed as lesbians, which launches them to instant celebrity status. Seduced by their newfound fame, Karma and Amy decide to keep up their romantic ruse.", - "poster_path": "/vb9J7q977HB3AmvLETpmWIyIyTP.jpg", - "backdrop_path": "/nIMog8nl1FB2uE9NvbL7YOKCcP3.jpg", - "year": 2014, - "score": 0.18436103789614888, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 254420, - "watched": true, - "added": false - }, - { - "media_type": "tv", - "tmdb_id": 202851, - "watched": false, - "added": true, - "title": "Big Boys" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 236235, - "tvdb_id": 426845, - "title": "The Gentlemen", - "overview": "When aristocratic Eddie inherits the family estate, he discovers that it's home to an enormous weed empire \u2014 and its proprietors aren't going anywhere.", - "poster_path": "/tw3tzfXaSpmUZIB8ZNqNEGzMBCy.jpg", - "backdrop_path": "/yG1wltFmkX5c5ocACKfpX0tp3SY.jpg", - "year": 2024, - "score": 0.17692307692307693, - "genre_ids": [ - 35, - 18, - 80 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - }, - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 81357, - "tvdb_id": 361857, - "title": "Dead to Me", - "overview": "A hotheaded widow searching for the hit-and-run driver who mowed down her husband befriends an eccentric optimist who isn't quite what she seems.", - "poster_path": "/mAj18PHeACxqcrEus4pD8pksRmB.jpg", - "backdrop_path": "/j4TXQ7OJsLx1Ba6z8XA7is0DcRZ.jpg", - "year": 2019, - "score": 0.16783216783216784, - "genre_ids": [ - 18, - 35, - 80 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 117581, - "watched": true, - "added": false, - "title": "Ginny & Georgia" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 1088, - "tvdb_id": 71436, - "title": "Dream On", - "overview": "The family life, romantic life, and career of Martin Tupper, a divorced New York City book editor. The show distinctively interjected clips from older black and white television series to punctuate Tupper's feelings or thoughts.", - "poster_path": "/8aiG4OUBXj5yMFrBIpYIXMtxCJv.jpg", - "backdrop_path": "/oLrKqDLFdAdbNe2KurNBDDtrE6d.jpg", - "year": 1990, - "score": 0.16666666666666666, - "genre_ids": [ - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 3004, - "tvdb_id": 76896, - "title": "Newhart", - "overview": "Dick Loudon and his wife Joanna decide to leave life in New York City and buy a little inn in Vermont. Dick is a how-to book writer, who eventually becomes a local TV celebrity as host of \"Vermont Today.\" George Utley is the handyman at the inn and Leslie Vanderkellen is the maid, with ambitions of being an Olympic Ski champion; she is later replaced by her cousin Stephanie, an heiress who hates her job. Her boyfriend is Dick's yuppie TV producer, Michael Harris. There are many other quirky characters in this fictional little town, including Dick's neighbors Larry, Darryl, and Darryl...three brothers who buy the Minuteman Cafe from Kirk Devane. Besides sharing a name, Darryl and Darryl never speak.", - "poster_path": "/zBI5YcdsftGE9F6zY6UwYVybsdY.jpg", - "backdrop_path": "/pCUfyiLZ1bT7JkffXZdDT0PgbGz.jpg", - "year": 1982, - "score": 0.16666666666666666, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 4586, - "watched": true, - "added": false, - "title": "Gilmore Girls" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 3216, - "tvdb_id": 71928, - "title": "Baretta", - "overview": "Baretta is an American detective television series which ran on ABC from 1975 to 1978. The show was a milder version of a successful 1973\u201374 ABC series, Toma, starring Tony Musante as chameleon-like, real-life New Jersey police officer David Toma. While popular, Toma received intense criticism at the time for its realistic and frequent depiction of police and criminal violence. When Musante left the series after a single season, the concept was retooled as Baretta, with Robert Blake in the title role.", - "poster_path": "/xayGSRT2GbcFTwNIqt6l355v29F.jpg", - "backdrop_path": "/wixjwQv8aPfIwbc7euj0fPPsMjT.jpg", - "year": 1975, - "score": 0.16666666666666666, - "genre_ids": [ - 80, - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 226637, - "watched": true, - "added": false, - "title": "High Potential" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 80213, - "tvdb_id": 349661, - "title": "The Purge", - "overview": "Set in a dystopian America ruled by a totalitarian political party, the series follows several seemingly unrelated characters living in a small city. Tying them all together is a mysterious savior who\u2019s impeccably equipped for everything the night throws at them. As the clock winds down with their fates hanging in the balance, each character is forced to reckon with their pasts as they discover how far they will go to survive the night.", - "poster_path": "/9CaS2XFd0Db42grzzVBnWcSkrbg.jpg", - "backdrop_path": "/9PARvL1FQtyjNhLF6AT6Oanqg1U.jpg", - "year": 2018, - "score": 0.16666666666666666, - "genre_ids": [ - 9648, - 80, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 81358, - "tvdb_id": 349743, - "title": "Mr Inbetween", - "overview": "Ray Shoesmith is a father, ex-husband, boyfriend and best friend: tough roles to juggle in the modern age. Even harder when you\u2019re a criminal for hire.", - "poster_path": "/1FkONly4j7hxi6Pz5CmuhRN1Ops.jpg", - "backdrop_path": "/2INMEKxee4z0mVYpHCS4AdPxgOb.jpg", - "year": 2018, - "score": 0.16666666666666666, - "genre_ids": [ - 80, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 153312, - "tvdb_id": 413215, - "title": "Tulsa King", - "overview": "New York mafia capo Dwight \"The General\" Manfredi is released from prison after 25 years and exiled by his boss to set up shop in Tulsa, Oklahoma. Realizing that his mob family may not have his best interests in mind, Dwight slowly builds a crew.", - "poster_path": "/y13WOeZ2rz2Ezpws0RJ0I8sQpG4.jpg", - "backdrop_path": "/mNHRGO1gFpR2CYZdANe72kcKq7G.jpg", - "year": 2022, - "score": 0.16666666666666666, - "genre_ids": [ - 80, - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 111803, - "watched": true, - "added": true, - "title": "The White Lotus" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 242054, - "tvdb_id": 417552, - "title": "The Residence", - "overview": "A brilliant, eccentric detective must solve a murder in the White House residence \u2014 where the staff and guests at a state dinner are all suspects.", - "poster_path": "/cJZbg425I9LF3SlJVQDOg4nJEvq.jpg", - "backdrop_path": "/rhwN3mIN89zlDveR0gv0VkrspXa.jpg", - "year": 2025, - "score": 0.16497662217515874, - "genre_ids": [ - 35, - 80, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 107113, - "watched": false, - "added": true, - "title": "Only Murders in the Building" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 749, - "tvdb_id": 77152, - "title": "Cold Feet", - "overview": "Follow the lives and loves of a group of thirtysomethings in a heart-warming comic drama as they try to find true love - or at least keep their relationships on track.\u00a0In this wry and funny look at a generation which is as confused as it is liberated by the choices it faces, will the chill in their feet put out the passion that burns in their hearts?", - "poster_path": "/mSPjuYGUpxr3bwP2VB97Ry0oJA0.jpg", - "backdrop_path": "/u6VRUfHyrh4tsIwucbs39P7HghH.jpg", - "year": 1998, - "score": 0.16497028858462376, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 202851, - "watched": false, - "added": true, - "title": "Big Boys" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 2215, - "tvdb_id": 77589, - "title": "Monarch of the Glen", - "overview": "Archie MacDonald, a young restaurateur is called back to his childhood home of Glenbogle where he is told he is the new Laird of Glenbogle.", - "poster_path": "/jeMhROvJWKTQuwSip5z5RsNPyfU.jpg", - "backdrop_path": "/ecxni5kM5664x1cy4Hdi2WB1Zdy.jpg", - "year": 2000, - "score": 0.16496828455513132, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 108255, - "watched": false, - "added": true, - "title": "All Creatures Great & Small (2020)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 87049, - "tvdb_id": 384248, - "title": "Firefly Lane", - "overview": "For decades, childhood best friends Kate and Tully have weathered life's storms together -- until a betrayal threatens to break them apart for good.", - "poster_path": "/2AavbPEEXzyy7Smyusozyz48T1n.jpg", - "backdrop_path": "/zvdnqNYYjW1NvULZbToh50pdts4.jpg", - "year": 2021, - "score": 0.15744037397447605, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 76148, - "watched": true, - "added": true, - "title": "Derry Girls" - }, - { - "media_type": "tv", - "tmdb_id": 258165, - "watched": false, - "added": true, - "title": "East of Eden (2026)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 95386, - "tvdb_id": 372160, - "title": "Nurses", - "overview": "Follow five young nurses working on the frontlines of a busy hospital in downtown Toronto, dedicating their lives to helping others, while struggling to help themselves.", - "poster_path": "/hBhiT42BLVuWwl0B79zYA5bJ0ES.jpg", - "backdrop_path": "/tqhsaVtN3zvmCDxut1DvI2sq5pe.jpg", - "year": 2020, - "score": 0.15562460218127142, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 39793, - "watched": true, - "added": false, - "title": "Call the Midwife" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 136044, - "tvdb_id": 378995, - "title": "The Outlaws", - "overview": "Seven strangers from different walks of life - people who would never normally interact - are forced to work together to renovate a derelict community centre. They resent the menial physical labour and they resent each other. But when one of their number gets dragged into a dangerous world of organised crime, they unite in ways none of them thought possible.", - "poster_path": "/s8vp0S0iz2nPb7TpOpV0rHbm1er.jpg", - "backdrop_path": "/qQcI42QcZk9Eo4IqexsUwaRhusx.jpg", - "year": 2021, - "score": 0.14766081499309897, - "genre_ids": [ - 35, - 80, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - }, - { - "media_type": "tv", - "tmdb_id": 65315, - "watched": true, - "added": false, - "title": "Flaked" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 195670, - "tvdb_id": 412285, - "title": "XO, Kitty", - "overview": "Teen matchmaker Kitty Song Covey thinks she knows everything there is to know about love. But when she moves halfway across the world to reunite with her long-distance boyfriend, she'll soon realise that relationships are a lot more complicated when it's your heart on the line.", - "poster_path": "/hxvTdKAwv27PUfpXOQp6AwWr6V.jpg", - "backdrop_path": "/h0CQ36rm9cSLznve5ocCDtYlnwN.jpg", - "year": 2023, - "score": 0.1466226400103808, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 254420, - "watched": true, - "added": false - }, - { - "media_type": "tv", - "tmdb_id": 202851, - "watched": false, - "added": true, - "title": "Big Boys" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 102904, - "tvdb_id": 381065, - "title": "Sweet Magnolias", - "overview": "Lifelong friends Maddie, Helen and Dana Sue lift each other up as they juggle relationships, family and careers in the small Southern town of Serenity.", - "poster_path": "/n1WDSFOnCCg3cdHHGBywZtYIzf9.jpg", - "backdrop_path": "/wt60Q4doM2vrubiCsutwaeWncLL.jpg", - "year": 2020, - "score": 0.14528214151952024, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 207484, - "watched": true, - "added": false, - "title": "Outlander: Blood of My Blood" - }, - { - "media_type": "tv", - "tmdb_id": 258165, - "watched": false, - "added": true, - "title": "East of Eden (2026)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 45194, - "tvdb_id": 77570, - "title": "Dragnet", - "overview": "Police Detective Sgt. Joe Friday and his partners investigate crimes in Los Angeles.", - "poster_path": "/tvozcbojiCAHIFar7kdaGfwSWew.jpg", - "backdrop_path": "/k7w3VSy1F4pW5HeoZjk2wn73AXS.jpg", - "year": 1967, - "score": 0.14285714285714285, - "genre_ids": [ - 80, - 18, - 9648 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 226637, - "watched": true, - "added": false, - "title": "High Potential" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 69630, - "tvdb_id": 323385, - "title": "The Bold Type", - "overview": "A glimpse into the outrageous lives of Jane, Kat and Sutton, who are working at the nation's top women's magazine, Scarlet, while navigating their careers, identities and individual voices.", - "poster_path": "/cKloQpl6zE7kdFf8SUeYU2qPT9H.jpg", - "backdrop_path": "/ppBiYWnUn2STU8YUdlct4Klfyu4.jpg", - "year": 2017, - "score": 0.14285714285714285, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 105, - "watched": true, - "added": false, - "title": "Sex and the City" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 91239, - "tvdb_id": 366668, - "title": "Bridgerton", - "overview": "Wealth, lust, and betrayal set in the backdrop of Regency era England, seen through the eyes of the powerful Bridgerton family.", - "poster_path": "/uXTg565ahu9RwonCX1V2Hex1NU6.jpg", - "backdrop_path": "/6umsRLI7t0ydFwCl0JNEIO0q2LH.jpg", - "year": 2020, - "score": 0.14285714285714285, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 207484, - "watched": true, - "added": false, - "title": "Outlander: Blood of My Blood" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 100412, - "tvdb_id": 376698, - "title": "The Baby-Sitters Club", - "overview": "In this contemporary take on the beloved book series, five best friends launch a baby-sitting business that's big on fun and adventure.", - "poster_path": "/afyG6cPl0jeV3SwNwyZxRG0Q9wd.jpg", - "backdrop_path": "/lhk5vgXN4Mnz4YWDw5RDqTaqPLd.jpg", - "year": 2020, - "score": 0.14285714285714285, - "genre_ids": [ - 10762, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 4586, - "watched": true, - "added": false, - "title": "Gilmore Girls" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 284558, - "tvdb_id": 460247, - "title": "Kill Jackie", - "overview": "Jackie Price has been living a wealthy, luxurious life for the past 20 years after escaping a dangerous past as an international cocaine dealer. But just as life begins to feel a little boring, she discovers that The Seven Demons, a group of the world\u2019s most terrifying hitmen, have been hired to kill her.", - "poster_path": "/3tjZspkqquE24iK1rc0nvnJwdEZ.jpg", - "backdrop_path": "/twc2YYBXTjdv52TShVumB1voT3Q.jpg", - "year": 2026, - "score": 0.14285714285714285, - "genre_ids": [ - 18, - 80 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 90046, - "tvdb_id": 363769, - "title": "90 Day Fianc\u00e9: The Other Way", - "overview": "Americans move to a foreign country all in the name of love. Will uprooting their lives in the United States pay off, or will they be packing up and moving back to America brokenhearted?", - "poster_path": "/jw4KDjNmpBnMd7fEjbz9qTUmKJS.jpg", - "backdrop_path": "/9jmxvWOt5xTjrJ03FNmViZCuZ5f.jpg", - "year": 2019, - "score": 0.14166748723002842, - "genre_ids": [ - 10764 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 290750, - "watched": false, - "added": true, - "title": "Love is Blind: Netherlands" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 259702, - "tvdb_id": 452532, - "title": "The House of the Spirits", - "overview": "The epic tale of a proud and passionate family, secret loves, and bloody revolution. The Trueba family's passions, struggles, and secrets span a century of violent social change, culminating in a crisis that hurls the proud, tyrannical patriarch and his beloved granddaughter towards opposite sides of the fence.", - "poster_path": "/yb682O0KCZlS5qRydxOytO5A6co.jpg", - "backdrop_path": "/u2nBtDrTOIi9u78c02bL0A3lo7Y.jpg", - "year": 2026, - "score": 0.13584642455856066, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 258165, - "watched": false, - "added": true, - "title": "East of Eden (2026)" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 2382, - "tvdb_id": 76321, - "title": "Freaks and Geeks", - "overview": "High school mathlete Lindsay Weir rebels and begins hanging out with a crowd of burnouts (the \"freaks\"), while her brother Sam Weir navigates a different part of the social universe with his nerdy friends (the \"geeks\").", - "poster_path": "/tPqV63zcW6ZV0Hd48DMGb5UzQIG.jpg", - "backdrop_path": "/1lOGkpGa9SjZ2uP1PxfxDkSXRNs.jpg", - "year": 1999, - "score": 0.13339330720689832, - "genre_ids": [ - 18, - 35 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 254420, - "watched": true, - "added": false - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 10860, - "tvdb_id": 74481, - "title": "Road to Avonlea", - "overview": "In the fictional small town of Avonlea, Prince Edward Island, in the early 20th century, 10-year-old Montreal heiress Sara Stanley is sent by her wealthy father to live with her two maiden aunts, Hetty and Olivia King, to be near her late mother's side of the family.", - "poster_path": "/2392PwVEfsMOMgYD5q0KaRWbjhP.jpg", - "backdrop_path": "/fM7OxNnULTgN19JChMPIv2OSiNx.jpg", - "year": 1990, - "score": 0.12605001646965905, - "genre_ids": [ - 18, - 10751 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 66134, - "watched": true, - "added": false, - "title": "The Durrells" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 211564, - "tvdb_id": 420865, - "title": "Sullivan's Crossing", - "overview": "After Neurosurgeon Maggie Sullivan\u2019s personal and professional life are thrown into turmoil she returns home to Sullivan\u2019s Crossing. While there, Maggie is forced to navigate her complicated present while confronting the painful past she has chosen to ignore for years.", - "poster_path": "/nYRnuQNR13nEYaXkOZaY0qIWl2K.jpg", - "backdrop_path": "/coh0nl5ov1o42fy7f74MDMvme2I.jpg", - "year": 2023, - "score": 0.12605001646965905, - "genre_ids": [ - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 33155, - "watched": true, - "added": false, - "title": "Offspring" - } - ] - }, - { - "media_type": "tv", - "tmdb_id": 197373, - "tvdb_id": 418934, - "title": "Based on a True Story", - "overview": "The lives of a realtor, a plumber and a former tennis star unexpectedly collide, exposing America\u2019s obsession with true crime, murder and the slow-close toilet seat.", - "poster_path": "/5xPLk78TFStBi1dQAlG2mnoSK60.jpg", - "backdrop_path": "/yVWlvUHX02ARZte4aBep6GPkkck.jpg", - "year": 2023, - "score": 0.12549019607843137, - "genre_ids": [ - 35, - 18 - ], - "contributions": [ - { - "media_type": "tv", - "tmdb_id": 693, - "watched": true, - "added": false, - "title": "Desperate Housewives" - }, - { - "media_type": "tv", - "tmdb_id": 218347, - "watched": true, - "added": false - } - ] - } - ], - "projection": { - "media_type": "all", - "genre_id": 0, - "service_id": 0, - "coverage": { - "total": 141, - "matched": 141, - "excluded": 0, - "unresolved": 0, - "complete": true - }, - "facts": [ - { - "metadata": { - "tmdb_id": 235271, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [ - { - "id": 2358, - "name": "Lionsgate+ Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/1356slxu4QrHOMrEVDKHJXRo5sW.png" - } - ], - "genres_observed_at": "2026-11-06T10:43:00.643180289Z", - "providers_observed_at": "2026-11-06T10:43:00.643180289Z", - "checked_at": "2026-11-06T10:43:00.643180289Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 8999, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:44:52.599309363Z", - "providers_observed_at": "2026-11-06T15:44:52.599309363Z", - "checked_at": "2026-11-06T15:44:52.599309363Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 317744, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:44:17.038050781Z", - "checked_at": "2026-11-06T15:44:17.038050781Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 13250, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:44:18.812047665Z", - "checked_at": "2026-11-06T15:44:18.812047665Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 376004, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 53, - "name": "Thriller" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:44:20.081486476Z", - "checked_at": "2026-11-06T15:44:20.081486476Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 13483, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 53, - "name": "Thriller" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 2358, - "name": "Lionsgate+ Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/1356slxu4QrHOMrEVDKHJXRo5sW.png" - } - ], - "genres_observed_at": "2026-11-06T00:21:02.623137183Z", - "providers_observed_at": "2026-11-06T00:21:02.623137183Z", - "checked_at": "2026-11-06T00:21:02.623137183Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 18190, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:44:56.168073579Z", - "checked_at": "2026-11-06T15:44:56.168073579Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 210577, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 53, - "name": "Thriller" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - }, - { - "id": 337, - "name": "Disney Plus", - "logo_url": "https://image.tmdb.org/t/p/w92/5eZ872CghnHFLB1j8grszbrx0dx.png" - } - ], - "genres_observed_at": "2026-11-05T21:25:31.995556322Z", - "providers_observed_at": "2026-11-05T21:25:31.995556322Z", - "checked_at": "2026-11-05T21:25:31.995556322Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 619979, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-05T21:23:46.870483061Z", - "providers_observed_at": "2026-11-05T21:23:46.870483061Z", - "checked_at": "2026-11-05T21:23:46.870483061Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1317288, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [ - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-06T12:21:37.342438175Z", - "providers_observed_at": "2026-11-06T12:21:37.342438175Z", - "checked_at": "2026-11-06T12:21:37.342438175Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 582014, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 53, - "name": "Thriller" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-06T00:21:16.848833721Z", - "providers_observed_at": "2026-11-06T00:21:16.848833721Z", - "checked_at": "2026-11-06T00:21:16.848833721Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 549514, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - }, - { - "id": 297, - "name": "Ziggo TV", - "logo_url": "https://image.tmdb.org/t/p/w92/96DBWDlJw9X0EnP22cOahM8Fdpn.png" - }, - { - "id": 1773, - "name": "SkyShowtime", - "logo_url": "https://image.tmdb.org/t/p/w92/ube1pVpP3FklRkeyQjlDkkC3tL2.png" - } - ], - "genres_observed_at": "2026-11-05T21:24:51.510424868Z", - "providers_observed_at": "2026-11-05T21:24:51.510424868Z", - "checked_at": "2026-11-05T21:24:51.510424868Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 59231, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:45:24.19081339Z", - "checked_at": "2026-11-06T15:45:24.19081339Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1249213, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-06T15:45:03.503769553Z", - "providers_observed_at": "2026-11-06T15:45:03.503769553Z", - "checked_at": "2026-11-06T15:45:03.503769553Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 624788, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:34:19.075907378Z", - "checked_at": "2026-11-05T21:34:19.075907378Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 2252, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 53, - "name": "Thriller" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:24:35.282458128Z", - "providers_observed_at": "2026-11-05T21:24:35.282458128Z", - "checked_at": "2026-11-05T21:24:35.282458128Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 311667, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - }, - { - "id": 639, - "name": "CineMember", - "logo_url": "https://image.tmdb.org/t/p/w92/gd0zMEph8WdBDaRd7LTqfCG53vI.png" - } - ], - "genres_observed_at": "2026-11-05T21:27:25.057305529Z", - "providers_observed_at": "2026-11-05T21:27:25.057305529Z", - "checked_at": "2026-11-05T21:27:25.057305529Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 2990, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 53, - "name": "Thriller" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T00:21:14.82897145Z", - "checked_at": "2026-11-06T00:21:14.82897145Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1965, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 53, - "name": "Thriller" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:45:02.873240161Z", - "providers_observed_at": "2026-11-06T15:45:02.873240161Z", - "checked_at": "2026-11-06T15:45:02.873240161Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 63493, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:45:00.513271626Z", - "checked_at": "2026-11-06T15:45:00.513271626Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 451156, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 53, - "name": "Thriller" - }, - { - "id": 10770, - "name": "TV Movie" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:26:30.493325244Z", - "checked_at": "2026-11-05T21:26:30.493325244Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1920, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:44:58.412956949Z", - "checked_at": "2026-11-06T15:44:58.412956949Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1033148, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 11, - "name": "MUBI", - "logo_url": "https://image.tmdb.org/t/p/w92/k7iSlvgWzZuO4zU5PcBjhABMuia.png" - }, - { - "id": 201, - "name": "MUBI Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/w1hl8HszsPf5aAGT0mVY0O6LYP4.png" - } - ], - "genres_observed_at": "2026-11-05T21:24:05.016873731Z", - "providers_observed_at": "2026-11-05T21:24:05.016873731Z", - "checked_at": "2026-11-05T21:24:05.016873731Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 7442, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [ - { - "id": 337, - "name": "Disney Plus", - "logo_url": "https://image.tmdb.org/t/p/w92/5eZ872CghnHFLB1j8grszbrx0dx.png" - } - ], - "genres_observed_at": "2026-11-06T12:26:41.975535551Z", - "providers_observed_at": "2026-11-06T12:26:41.975535551Z", - "checked_at": "2026-11-06T12:26:41.975535551Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 8884, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 14, - "name": "Fantasy" - }, - { - "id": 53, - "name": "Thriller" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:25:13.822417756Z", - "checked_at": "2026-11-05T21:25:13.822417756Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 14698, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 53, - "name": "Thriller" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T00:21:20.880053202Z", - "providers_observed_at": "2026-11-06T00:21:20.880053202Z", - "checked_at": "2026-11-06T00:21:20.880053202Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 45938, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T12:35:54.548175409Z", - "checked_at": "2026-11-06T12:35:54.548175409Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 16933, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T13:23:01.142473058Z", - "providers_observed_at": "2026-11-06T13:23:01.142473058Z", - "checked_at": "2026-11-06T13:23:01.142473058Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 7183, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 53, - "name": "Thriller" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:29:08.281292709Z", - "providers_observed_at": "2026-11-05T21:29:08.281292709Z", - "checked_at": "2026-11-05T21:29:08.281292709Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 893086, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 53, - "name": "Thriller" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-06T17:51:19.878708528Z", - "providers_observed_at": "2026-11-06T17:51:19.878708528Z", - "checked_at": "2026-11-06T17:51:19.878708528Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1213, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 53, - "name": "Thriller" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-05T21:33:16.269467208Z", - "providers_observed_at": "2026-11-05T21:33:16.269467208Z", - "checked_at": "2026-11-05T21:33:16.269467208Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1317088, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 878, - "name": "Science Fiction" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-06T13:23:05.185284868Z", - "providers_observed_at": "2026-11-06T13:23:05.185284868Z", - "checked_at": "2026-11-06T13:23:05.185284868Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 50875, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T13:22:59.015768824Z", - "checked_at": "2026-11-06T13:22:59.015768824Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 11660, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:25:09.782964078Z", - "checked_at": "2026-11-05T21:25:09.782964078Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 65650, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T00:21:23.004963735Z", - "checked_at": "2026-11-06T00:21:23.004963735Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 241, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 53, - "name": "Thriller" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 337, - "name": "Disney Plus", - "logo_url": "https://image.tmdb.org/t/p/w92/5eZ872CghnHFLB1j8grszbrx0dx.png" - } - ], - "genres_observed_at": "2026-11-06T00:21:12.685828539Z", - "providers_observed_at": "2026-11-06T00:21:12.685828539Z", - "checked_at": "2026-11-06T00:21:12.685828539Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 645710, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-06T16:14:14.986254896Z", - "providers_observed_at": "2026-11-06T16:14:14.986254896Z", - "checked_at": "2026-11-06T16:14:14.986254896Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 69668, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:45:07.983781006Z", - "checked_at": "2026-11-06T15:45:07.983781006Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 33195, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T00:21:25.163153867Z", - "checked_at": "2026-11-06T00:21:25.163153867Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 4547, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:16:43.34835158Z", - "providers_observed_at": "2026-11-05T21:16:43.34835158Z", - "checked_at": "2026-11-05T21:16:43.34835158Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 74998, - "media_type": "movie", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 28, - "name": "Action" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 53, - "name": "Thriller" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T17:48:57.705507001Z", - "providers_observed_at": "2026-10-30T17:48:50.333477339Z", - "checked_at": "2026-11-06T17:48:57.705507001Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 73552, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 80, - "name": "Crime" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:44:50.276092275Z", - "checked_at": "2026-11-06T15:44:50.276092275Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 2327, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 10766, - "name": "Soap" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-06T15:44:51.398997957Z", - "providers_observed_at": "2026-11-06T15:44:51.398997957Z", - "checked_at": "2026-11-06T15:44:51.398997957Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 578, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T15:44:54.217033174Z", - "checked_at": "2026-11-06T15:44:54.217033174Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 900, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T16:12:55.902717952Z", - "checked_at": "2026-11-06T16:12:55.902717952Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 56570, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 10765, - "name": "Sci-Fi & Fantasy" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - }, - { - "id": 297, - "name": "Ziggo TV", - "logo_url": "https://image.tmdb.org/t/p/w92/96DBWDlJw9X0EnP22cOahM8Fdpn.png" - } - ], - "genres_observed_at": "2026-11-05T21:28:53.93026257Z", - "providers_observed_at": "2026-11-05T21:28:53.93026257Z", - "checked_at": "2026-11-05T21:28:53.93026257Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 62117, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:34:59.469454878Z", - "providers_observed_at": "2026-11-05T21:34:59.469454878Z", - "checked_at": "2026-11-05T21:34:59.469454878Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 87428, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 1773, - "name": "SkyShowtime", - "logo_url": "https://image.tmdb.org/t/p/w92/ube1pVpP3FklRkeyQjlDkkC3tL2.png" - } - ], - "genres_observed_at": "2026-11-06T15:44:56.822294671Z", - "providers_observed_at": "2026-11-06T15:44:56.822294671Z", - "checked_at": "2026-11-06T15:44:56.822294671Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 88989, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - }, - { - "id": 72, - "name": "Videoland", - "logo_url": "https://image.tmdb.org/t/p/w92/3IdfSLRjSoDoo9lrpvX4oxZmnVi.png" - } - ], - "genres_observed_at": "2026-11-06T16:06:10.308397809Z", - "providers_observed_at": "2026-11-06T16:06:10.308397809Z", - "checked_at": "2026-11-06T16:06:10.308397809Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 106454, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 35, - "name": "Comedy" - }, - { - "id": 80, - "name": "Crime" - } - ], - "providers": [ - { - "id": 350, - "name": "Apple TV", - "logo_url": "https://image.tmdb.org/t/p/w92/9icYBfYFcwgCbky5VdGUIKJ4C5i.png" - }, - { - "id": 2243, - "name": "Apple TV Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/rerVCu9auZrgxTTiZu1criqrQzg.png" - } - ], - "genres_observed_at": "2026-11-05T21:31:15.207798622Z", - "providers_observed_at": "2026-11-05T21:31:15.207798622Z", - "checked_at": "2026-11-05T21:31:15.207798622Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 71199, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:23:04.487348035Z", - "checked_at": "2026-11-05T21:23:04.487348035Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 100883, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:28:19.499884611Z", - "providers_observed_at": "2026-11-05T21:28:19.499884611Z", - "checked_at": "2026-11-05T21:28:19.499884611Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 42282, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - } - ], - "genres_observed_at": "2026-11-05T21:25:25.936697952Z", - "providers_observed_at": "2026-11-05T21:25:25.936697952Z", - "checked_at": "2026-11-05T21:25:25.936697952Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 243861, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-06T11:54:43.481292701Z", - "providers_observed_at": "2026-11-06T11:54:43.481292701Z", - "checked_at": "2026-11-06T11:54:43.481292701Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 94617, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T14:16:07.710906158Z", - "checked_at": "2026-11-06T14:16:07.710906158Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 62823, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:29:50.618636269Z", - "checked_at": "2026-11-05T21:29:50.618636269Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 18856, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T20:11:40.044894331Z", - "checked_at": "2026-11-05T20:11:40.044894331Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1803, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:31:45.413498213Z", - "checked_at": "2026-11-05T21:31:45.413498213Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 116450, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-05T21:21:23.639209961Z", - "providers_observed_at": "2026-11-05T21:21:23.639209961Z", - "checked_at": "2026-11-05T21:21:23.639209961Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 199001, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:28:07.451469754Z", - "providers_observed_at": "2026-11-05T21:28:07.451469754Z", - "checked_at": "2026-11-05T21:28:07.451469754Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 64254, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:27:39.175684225Z", - "providers_observed_at": "2026-11-05T21:27:39.175684225Z", - "checked_at": "2026-11-05T21:27:39.175684225Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 196454, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:29:14.359242906Z", - "providers_observed_at": "2026-11-05T21:29:14.359242906Z", - "checked_at": "2026-11-05T21:29:14.359242906Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 206829, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-05T21:32:53.972934948Z", - "providers_observed_at": "2026-11-05T21:32:53.972934948Z", - "checked_at": "2026-11-05T21:32:53.972934948Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 99248, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T23:55:25.168767993Z", - "checked_at": "2026-11-05T23:55:25.168767993Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 124834, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T23:55:19.136059766Z", - "providers_observed_at": "2026-11-05T23:55:19.136059766Z", - "checked_at": "2026-11-05T23:55:19.136059766Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 7406, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 472, - "name": "NLZIET", - "logo_url": "https://image.tmdb.org/t/p/w92/jY3kxKfekzgpEDtghtK9elh4G6T.png" - } - ], - "genres_observed_at": "2026-11-05T21:21:11.294138927Z", - "providers_observed_at": "2026-11-05T21:21:11.294138927Z", - "checked_at": "2026-11-05T21:21:11.294138927Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 69470, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 80, - "name": "Crime" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:29:38.48700516Z", - "providers_observed_at": "2026-11-05T21:29:38.48700516Z", - "checked_at": "2026-11-05T21:29:38.48700516Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 62705, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 10764, - "name": "Reality" - } - ], - "providers": [ - { - "id": 72, - "name": "Videoland", - "logo_url": "https://image.tmdb.org/t/p/w92/3IdfSLRjSoDoo9lrpvX4oxZmnVi.png" - } - ], - "genres_observed_at": "2026-11-05T21:27:31.084696935Z", - "providers_observed_at": "2026-11-05T21:27:31.084696935Z", - "checked_at": "2026-11-05T21:27:31.084696935Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 253376, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-06T10:13:53.419455494Z", - "providers_observed_at": "2026-11-06T10:13:53.419455494Z", - "checked_at": "2026-11-06T10:13:53.419455494Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 39468, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-05T21:27:47.2630122Z", - "providers_observed_at": "2026-11-05T21:27:47.2630122Z", - "checked_at": "2026-11-05T21:27:47.2630122Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 126914, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-05T21:34:41.152157563Z", - "providers_observed_at": "2026-11-05T21:34:41.152157563Z", - "checked_at": "2026-11-05T21:34:41.152157563Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 5721, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:33:08.217497968Z", - "checked_at": "2026-11-05T21:33:08.217497968Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 21762, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - }, - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-05T21:29:02.122502055Z", - "providers_observed_at": "2026-11-05T21:29:02.122502055Z", - "checked_at": "2026-11-05T21:29:02.122502055Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 80587, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 10751, - "name": "Family" - }, - { - "id": 16, - "name": "Animation" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 337, - "name": "Disney Plus", - "logo_url": "https://image.tmdb.org/t/p/w92/5eZ872CghnHFLB1j8grszbrx0dx.png" - } - ], - "genres_observed_at": "2026-11-05T21:22:05.988680828Z", - "providers_observed_at": "2026-11-05T21:22:05.988680828Z", - "checked_at": "2026-11-05T21:22:05.988680828Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 39859, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T08:24:56.06076054Z", - "checked_at": "2026-11-06T08:24:56.06076054Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 210805, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T16:14:25.197987217Z", - "checked_at": "2026-11-06T16:14:25.197987217Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 4177, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:29:10.325858991Z", - "checked_at": "2026-11-05T21:29:10.325858991Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 46028, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 10751, - "name": "Family" - } - ], - "providers": [ - { - "id": 337, - "name": "Disney Plus", - "logo_url": "https://image.tmdb.org/t/p/w92/5eZ872CghnHFLB1j8grszbrx0dx.png" - } - ], - "genres_observed_at": "2026-11-05T21:25:23.923810903Z", - "providers_observed_at": "2026-11-05T21:25:23.923810903Z", - "checked_at": "2026-11-05T21:25:23.923810903Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 92621, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:22:26.18747643Z", - "checked_at": "2026-11-05T21:22:26.18747643Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1395, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - }, - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - }, - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-05T21:25:36.035509536Z", - "providers_observed_at": "2026-11-05T21:25:36.035509536Z", - "checked_at": "2026-11-05T21:25:36.035509536Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 6127, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:21:05.257417929Z", - "checked_at": "2026-11-05T21:21:05.257417929Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1021, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 10766, - "name": "Soap" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:22:48.413281577Z", - "checked_at": "2026-11-05T21:22:48.413281577Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 211, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T12:25:13.758451016Z", - "checked_at": "2026-11-06T12:25:13.758451016Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 61118, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:34:53.407473419Z", - "checked_at": "2026-11-05T21:34:53.407473419Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 62704, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - }, - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-05T21:21:45.84116767Z", - "providers_observed_at": "2026-11-05T21:21:45.84116767Z", - "checked_at": "2026-11-05T21:21:45.84116767Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 39525, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:34:35.115608453Z", - "checked_at": "2026-11-05T21:34:35.115608453Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 111838, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-06T11:54:45.492394545Z", - "providers_observed_at": "2026-11-06T11:54:45.492394545Z", - "checked_at": "2026-11-06T11:54:45.492394545Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 124010, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 337, - "name": "Disney Plus", - "logo_url": "https://image.tmdb.org/t/p/w92/5eZ872CghnHFLB1j8grszbrx0dx.png" - } - ], - "genres_observed_at": "2026-11-05T21:26:22.356825229Z", - "providers_observed_at": "2026-11-05T21:26:22.356825229Z", - "checked_at": "2026-11-05T21:26:22.356825229Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 275139, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 337, - "name": "Disney Plus", - "logo_url": "https://image.tmdb.org/t/p/w92/5eZ872CghnHFLB1j8grszbrx0dx.png" - } - ], - "genres_observed_at": "2026-11-06T05:51:43.36209593Z", - "providers_observed_at": "2026-11-06T05:51:43.36209593Z", - "checked_at": "2026-11-06T05:51:43.36209593Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 69050, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-06T12:26:31.89821713Z", - "providers_observed_at": "2026-11-06T12:26:31.89821713Z", - "checked_at": "2026-11-06T12:26:31.89821713Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 70796, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-05T21:32:33.891659122Z", - "providers_observed_at": "2026-11-05T21:32:33.891659122Z", - "checked_at": "2026-11-05T21:32:33.891659122Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 135959, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:31:07.148373201Z", - "providers_observed_at": "2026-11-05T21:31:07.148373201Z", - "checked_at": "2026-11-05T21:31:07.148373201Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 241372, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-05T21:20:34.823654155Z", - "providers_observed_at": "2026-11-05T21:20:34.823654155Z", - "checked_at": "2026-11-05T21:20:34.823654155Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 250504, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:31:35.342107155Z", - "providers_observed_at": "2026-11-05T21:31:35.342107155Z", - "checked_at": "2026-11-05T21:31:35.342107155Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 258190, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:23:10.633405579Z", - "checked_at": "2026-11-05T21:23:10.633405579Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 120998, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 1773, - "name": "SkyShowtime", - "logo_url": "https://image.tmdb.org/t/p/w92/ube1pVpP3FklRkeyQjlDkkC3tL2.png" - } - ], - "genres_observed_at": "2026-11-05T23:55:23.162687765Z", - "providers_observed_at": "2026-11-05T23:55:23.162687765Z", - "checked_at": "2026-11-05T23:55:23.162687765Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 4454, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T23:55:31.205160147Z", - "providers_observed_at": "2026-11-05T23:55:31.205160147Z", - "checked_at": "2026-11-05T23:55:31.205160147Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 2585, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:26:02.269758895Z", - "checked_at": "2026-11-05T21:26:02.269758895Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 269, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - }, - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-06T11:49:56.238979796Z", - "providers_observed_at": "2026-11-06T11:49:56.238979796Z", - "checked_at": "2026-11-06T11:49:56.238979796Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 95004, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 10751, - "name": "Family" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:34:21.087963942Z", - "checked_at": "2026-11-05T21:34:21.087963942Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 4107, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:33:14.236852284Z", - "checked_at": "2026-11-05T21:33:14.236852284Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 70785, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 10751, - "name": "Family" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:21:27.666221762Z", - "providers_observed_at": "2026-11-05T21:21:27.666221762Z", - "checked_at": "2026-11-05T21:21:27.666221762Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 4607, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 10759, - "name": "Action & Adventure" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 337, - "name": "Disney Plus", - "logo_url": "https://image.tmdb.org/t/p/w92/5eZ872CghnHFLB1j8grszbrx0dx.png" - } - ], - "genres_observed_at": "2026-11-05T23:55:21.150838395Z", - "providers_observed_at": "2026-11-05T23:55:21.150838395Z", - "checked_at": "2026-11-05T23:55:21.150838395Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 73319, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 10764, - "name": "Reality" - } - ], - "providers": [ - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-05T21:20:36.83693195Z", - "providers_observed_at": "2026-11-05T21:20:36.83693195Z", - "checked_at": "2026-11-05T21:20:36.83693195Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 2398, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 315, - "name": "Hoichoi", - "logo_url": "https://image.tmdb.org/t/p/w92/8dgAD4EzQWMsyudVwWCFg19998L.png" - } - ], - "genres_observed_at": "2026-11-06T12:26:07.803808577Z", - "providers_observed_at": "2026-11-06T12:26:07.803808577Z", - "checked_at": "2026-11-06T12:26:07.803808577Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 186, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - }, - { - "id": 2358, - "name": "Lionsgate+ Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/1356slxu4QrHOMrEVDKHJXRo5sW.png" - } - ], - "genres_observed_at": "2026-11-06T11:01:27.847601167Z", - "providers_observed_at": "2026-11-06T11:01:27.847601167Z", - "checked_at": "2026-11-06T11:01:27.847601167Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 31917, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - }, - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-06T11:52:12.800296211Z", - "providers_observed_at": "2026-11-06T11:52:12.800296211Z", - "checked_at": "2026-11-06T11:52:12.800296211Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 88324, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:34:27.102165661Z", - "providers_observed_at": "2026-11-05T21:34:27.102165661Z", - "checked_at": "2026-11-05T21:34:27.102165661Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 4582, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-05T21:26:34.535473425Z", - "providers_observed_at": "2026-11-05T21:26:34.535473425Z", - "checked_at": "2026-11-05T21:26:34.535473425Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 67697, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T14:23:12.166007627Z", - "checked_at": "2026-11-06T14:23:12.166007627Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 130842, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 76, - "name": "Viaplay", - "logo_url": "https://image.tmdb.org/t/p/w92/c1J9PGGowXwW5AxAaZaGipeFu7U.png" - }, - { - "id": 2358, - "name": "Lionsgate+ Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/1356slxu4QrHOMrEVDKHJXRo5sW.png" - } - ], - "genres_observed_at": "2026-11-06T14:23:26.216965491Z", - "providers_observed_at": "2026-11-06T14:23:26.216965491Z", - "checked_at": "2026-11-06T14:23:26.216965491Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 153723, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-05T21:21:09.275219679Z", - "providers_observed_at": "2026-11-05T21:21:09.275219679Z", - "checked_at": "2026-11-05T21:21:09.275219679Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 41875, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T11:51:26.706620327Z", - "checked_at": "2026-11-06T11:51:26.706620327Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 60705, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T23:55:17.124876009Z", - "checked_at": "2026-11-05T23:55:17.124876009Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 236235, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-06T18:26:46.070072679Z", - "providers_observed_at": "2026-11-06T18:26:46.070072679Z", - "checked_at": "2026-11-06T18:26:46.070072679Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 81357, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - }, - { - "id": 80, - "name": "Crime" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T21:23:42.814357802Z", - "providers_observed_at": "2026-11-05T21:23:42.814357802Z", - "checked_at": "2026-11-05T21:23:42.814357802Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 1088, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:24:27.206645932Z", - "checked_at": "2026-11-05T21:24:27.206645932Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 3004, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:28:29.672713141Z", - "checked_at": "2026-11-05T21:28:29.672713141Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 3216, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T11:47:20.045517228Z", - "checked_at": "2026-11-06T11:47:20.045517228Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 80213, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 9648, - "name": "Mystery" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 1773, - "name": "SkyShowtime", - "logo_url": "https://image.tmdb.org/t/p/w92/ube1pVpP3FklRkeyQjlDkkC3tL2.png" - } - ], - "genres_observed_at": "2026-11-06T11:48:40.127262242Z", - "providers_observed_at": "2026-11-06T11:48:40.127262242Z", - "checked_at": "2026-11-06T11:48:40.127262242Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 81358, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 337, - "name": "Disney Plus", - "logo_url": "https://image.tmdb.org/t/p/w92/5eZ872CghnHFLB1j8grszbrx0dx.png" - } - ], - "genres_observed_at": "2026-11-05T21:28:01.418530642Z", - "providers_observed_at": "2026-11-05T21:28:01.418530642Z", - "checked_at": "2026-11-05T21:28:01.418530642Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 153312, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 1773, - "name": "SkyShowtime", - "logo_url": "https://image.tmdb.org/t/p/w92/ube1pVpP3FklRkeyQjlDkkC3tL2.png" - } - ], - "genres_observed_at": "2026-11-06T14:22:04.05218024Z", - "providers_observed_at": "2026-11-06T14:22:04.05218024Z", - "checked_at": "2026-11-06T14:22:04.05218024Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 242054, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T23:55:27.177769487Z", - "providers_observed_at": "2026-11-05T23:55:27.177769487Z", - "checked_at": "2026-11-05T23:55:27.177769487Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 749, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 472, - "name": "NLZIET", - "logo_url": "https://image.tmdb.org/t/p/w92/jY3kxKfekzgpEDtghtK9elh4G6T.png" - }, - { - "id": 1986, - "name": "NPO Plus", - "logo_url": "https://image.tmdb.org/t/p/w92/eIplw9Hv4Q5RyHtofKZwjeRufz6.png" - } - ], - "genres_observed_at": "2026-11-05T23:55:15.115823011Z", - "providers_observed_at": "2026-11-05T23:55:15.115823011Z", - "checked_at": "2026-11-05T23:55:15.115823011Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 2215, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:27:53.294051763Z", - "checked_at": "2026-11-05T21:27:53.294051763Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 87049, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-06T10:13:55.439872014Z", - "providers_observed_at": "2026-11-06T10:13:55.439872014Z", - "checked_at": "2026-11-06T10:13:55.439872014Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 95386, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:28:41.730357928Z", - "checked_at": "2026-11-05T21:28:41.730357928Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 136044, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-06T11:54:35.332205607Z", - "providers_observed_at": "2026-11-06T11:54:35.332205607Z", - "checked_at": "2026-11-06T11:54:35.332205607Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 195670, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T23:55:33.213426461Z", - "providers_observed_at": "2026-11-05T23:55:33.213426461Z", - "checked_at": "2026-11-05T23:55:33.213426461Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 102904, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-05T20:24:15.046007915Z", - "providers_observed_at": "2026-11-05T20:24:15.046007915Z", - "checked_at": "2026-11-05T20:24:15.046007915Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 45194, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 80, - "name": "Crime" - }, - { - "id": 18, - "name": "Drama" - }, - { - "id": 9648, - "name": "Mystery" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T11:54:47.502903807Z", - "checked_at": "2026-11-06T11:54:47.502903807Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 69630, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-05T21:31:37.373897507Z", - "providers_observed_at": "2026-11-05T21:31:37.373897507Z", - "checked_at": "2026-11-05T21:31:37.373897507Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 91239, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - } - ], - "genres_observed_at": "2026-11-06T11:51:22.696252683Z", - "providers_observed_at": "2026-11-06T11:51:22.696252683Z", - "checked_at": "2026-11-06T11:51:22.696252683Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 100412, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 10762, - "name": "Kids" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 8, - "name": "Netflix", - "logo_url": "https://image.tmdb.org/t/p/w92/rK1KljqmbvO9HQa1PBFLILWah72.png" - }, - { - "id": 175, - "name": "Netflix Kids", - "logo_url": "https://image.tmdb.org/t/p/w92/rjPaInWHH1nPgtRFF17BbHN2gu.png" - } - ], - "genres_observed_at": "2026-11-06T11:53:31.09024729Z", - "providers_observed_at": "2026-11-06T11:53:31.09024729Z", - "checked_at": "2026-11-06T11:53:31.09024729Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 284558, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 80, - "name": "Crime" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-06T12:36:00.575054236Z", - "providers_observed_at": "2026-11-06T12:36:00.575054236Z", - "checked_at": "2026-11-06T12:36:00.575054236Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 90046, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 10764, - "name": "Reality" - } - ], - "providers": [ - { - "id": 1899, - "name": "HBO Max", - "logo_url": "https://image.tmdb.org/t/p/w92/skypuy7SXuugIQeYg0IglmzoKaS.png" - }, - { - "id": 1825, - "name": "HBO Max Amazon Channel", - "logo_url": "https://image.tmdb.org/t/p/w92/64fLWeSyZ1KQZhIdvTdy4QHeWty.png" - } - ], - "genres_observed_at": "2026-11-05T21:20:38.84522959Z", - "providers_observed_at": "2026-11-05T21:20:38.84522959Z", - "checked_at": "2026-11-05T21:20:38.84522959Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 259702, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-06T05:48:13.225189916Z", - "providers_observed_at": "2026-11-06T05:48:13.225189916Z", - "checked_at": "2026-11-06T05:48:13.225189916Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 2382, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 35, - "name": "Comedy" - } - ], - "providers": [], - "genres_observed_at": "2026-11-06T11:48:52.142526753Z", - "checked_at": "2026-11-06T11:48:52.142526753Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 10860, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "unobserved", - "genres": [ - { - "id": 18, - "name": "Drama" - }, - { - "id": 10751, - "name": "Family" - } - ], - "providers": [], - "genres_observed_at": "2026-11-05T21:29:28.442352928Z", - "checked_at": "2026-11-05T21:29:28.442352928Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 211564, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 472, - "name": "NLZIET", - "logo_url": "https://image.tmdb.org/t/p/w92/jY3kxKfekzgpEDtghtK9elh4G6T.png" - } - ], - "genres_observed_at": "2026-11-06T16:14:23.188509289Z", - "providers_observed_at": "2026-11-06T16:14:23.188509289Z", - "checked_at": "2026-11-06T16:14:23.188509289Z" - }, - "match": "matched", - "genre_source": "ranked" - }, - { - "metadata": { - "tmdb_id": 197373, - "media_type": "tv", - "region": "NL", - "genre_state": "observed", - "provider_state": "observed", - "genres": [ - { - "id": 35, - "name": "Comedy" - }, - { - "id": 18, - "name": "Drama" - } - ], - "providers": [ - { - "id": 119, - "name": "Amazon Prime Video", - "logo_url": "https://image.tmdb.org/t/p/w92/gMZdpavHmxFNnLpMHwVxfqeux2g.png" - } - ], - "genres_observed_at": "2026-11-05T21:21:49.852947013Z", - "providers_observed_at": "2026-11-05T21:21:49.852947013Z", - "checked_at": "2026-11-05T21:21:49.852947013Z" - }, - "match": "matched", - "genre_source": "ranked" - } - ], - "unresolved": [] - } -} diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrPreference.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrPreference.kt index b794391b..559b4365 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrPreference.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrPreference.kt @@ -21,7 +21,6 @@ import kotlinx.coroutines.CoroutineScope import org.justinvisser.wolfskin.conductarr.CacheEntry import org.justinvisser.wolfskin.conductarr.CacheStore import org.justinvisser.wolfskin.conductarr.FileCacheStore -import org.justinvisser.wolfskin.conductarr.PersistentDns /** Advanced-only endpoint and fixture controls contain no credentials. */ object ConductarrPreference { @@ -55,8 +54,8 @@ object ConductarrPreference { object ConductarrModule { @Provides @Singleton - fun session(@ApplicationContext context: Context, @IoCoroutineScope scope: CoroutineScope, dns: PersistentDns): ConductarrSession = - ConductarrSession(ConductarrDiskCache(context), scope, dns) + fun session(@ApplicationContext context: Context, @IoCoroutineScope scope: CoroutineScope): ConductarrSession = + ConductarrSession(ConductarrDiskCache(context), scope) } /** Android may create noBackupFilesDir, so resolve it only during an IO cache operation. */ diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrProjection.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrProjection.kt index 3f76141f..1718dc44 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrProjection.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrProjection.kt @@ -41,62 +41,20 @@ internal fun DiscoverTitle.homeTitle(): HomeTitle = HomeTitle( overview = overview, poster = poster, backdrop = backdrop, genres = genres, tmdbId = tmdb.toInt(), ) -/** Activity is history; stage evidence must not turn a past dispatch into a live transfer. */ internal fun RequestProgress.comingIn(): ComingInRequest { val stagesByName = stages.orEmpty().associateBy { it.name } val acquisition = stagesByName[ReadinessStage.Name.ACQUISITION] val visibility = stagesByName[ReadinessStage.Name.VISIBILITY] - val playback = stagesByName[ReadinessStage.Name.PLAYBACK] val stage = when { - acquisition?.summary == "The title was deleted after it was dispatched." -> ComingInStage.Removed - acquisition?.summary == "The title is not released yet; there is nothing to acquire." -> ComingInStage.NotOutYet - playback?.state == ReadinessStage.State.FAILED || playback?.state == ReadinessStage.State.CONFLICTING -> ComingInStage.FileHealth - visibility?.summary?.startsWith("The title is only in libraries this viewer does not see: ") == true -> ComingInStage.HeldElsewhere - visibility?.summary == "The title is not in a library this viewer sees." -> ComingInStage.NotInLibrary - visibility?.state == ReadinessStage.State.FAILED || visibility?.state == ReadinessStage.State.CONFLICTING -> ComingInStage.CheckNeeded - stagesByName[ReadinessStage.Name.REQUEST]?.state == ReadinessStage.State.FAILED || acquisition?.state == ReadinessStage.State.FAILED -> ComingInStage.Failed + stages.orEmpty().any { it.state == ReadinessStage.State.FAILED } -> ComingInStage.Failed visibility?.state == ReadinessStage.State.DONE -> ComingInStage.Ready - awaitingApproval == true || acquisition?.summary == "Waiting for Seerr's approval to reach dispatch." -> ComingInStage.Waiting - acquisition?.summary == "Dispatched; waiting for the Arr to import a file." -> ComingInStage.WaitingForFile - visibility?.state == ReadinessStage.State.IN_PROGRESS || visibility?.state == ReadinessStage.State.PARTIAL || acquisition?.state == ReadinessStage.State.DONE -> ComingInStage.AlmostReady - acquisition?.state == ReadinessStage.State.IN_PROGRESS && acquisition.summary.startsWith("Downloading", ignoreCase = true) -> ComingInStage.Downloading - acquisition?.state == ReadinessStage.State.NONE && acquisition.summary.startsWith("Searching", ignoreCase = true) -> ComingInStage.Searching - acquisition?.state == ReadinessStage.State.IN_PROGRESS || acquisition?.state == ReadinessStage.State.NONE -> ComingInStage.Waiting - else -> ComingInStage.Checking - } - val detail = when (stage) { - ComingInStage.FileHealth -> playback - ComingInStage.CheckNeeded, ComingInStage.HeldElsewhere, ComingInStage.NotInLibrary, ComingInStage.Ready -> visibility - ComingInStage.Failed -> stages.orEmpty().firstOrNull { it.state == ReadinessStage.State.FAILED } - else -> acquisition + awaitingApproval == true -> ComingInStage.Waiting + visibility?.state in setOf(ReadinessStage.State.IN_PROGRESS, ReadinessStage.State.PARTIAL) || acquisition?.state == ReadinessStage.State.DONE -> ComingInStage.AlmostReady + acquisition?.state == ReadinessStage.State.IN_PROGRESS -> ComingInStage.Downloading + acquisition?.state == ReadinessStage.State.NONE -> ComingInStage.Searching + stages.orEmpty().any { it.state in setOf(ReadinessStage.State.UNKNOWN, ReadinessStage.State.STALE, ReadinessStage.State.CONFLICTING) } -> ComingInStage.Checking + else -> ComingInStage.Waiting } return ComingInRequest(id, mediaType.name.lowercase(), tmdbId, title ?: "Title unavailable", requester.key, - requester.name, actor?.requester, actor?.name, stage, summary = detail?.summary, - readiness = ReadinessStage.Name.entries.map { stagesByName[it].readinessWord() }) -} - -/** Expanded readiness describes each observed stage, not a synthetic download failure. */ -private fun ReadinessStage?.readinessWord(): String = when { - this == null -> "Unknown" - name == ReadinessStage.Name.PLAYBACK && (state == ReadinessStage.State.FAILED || state == ReadinessStage.State.CONFLICTING) -> "Needs attention" - name == ReadinessStage.Name.VISIBILITY && (state == ReadinessStage.State.FAILED || state == ReadinessStage.State.CONFLICTING) -> "Check needed" - name == ReadinessStage.Name.ACQUISITION && summary == "The title was deleted after it was dispatched." -> "Removed" - name == ReadinessStage.Name.ACQUISITION && summary == "The title is not released yet; there is nothing to acquire." -> "Not out yet" - name == ReadinessStage.Name.ACQUISITION && summary.startsWith("Dispatched; the Arr has represented files") -> "Files present" - name == ReadinessStage.Name.ACQUISITION && summary == "Dispatched; waiting for the Arr to import a file." -> "Waiting for a file" - name == ReadinessStage.Name.VISIBILITY && summary.startsWith("The title is only in libraries this viewer does not see: ") -> "Another library" - name == ReadinessStage.Name.VISIBILITY && summary == "The title is not in a library this viewer sees." -> "Not in library" - name == ReadinessStage.Name.ACQUISITION && state == ReadinessStage.State.IN_PROGRESS && summary.startsWith("Downloading", ignoreCase = true) -> "Downloading" - name == ReadinessStage.Name.PLAYBACK && (state == ReadinessStage.State.DONE || state == ReadinessStage.State.PARTIAL) -> "Recorded play" - name == ReadinessStage.Name.PLAYBACK && state == ReadinessStage.State.UNKNOWN -> "Not checked yet" - else -> when (state) { - ReadinessStage.State.DONE -> "Done" - ReadinessStage.State.FAILED -> "Failed" - ReadinessStage.State.IN_PROGRESS -> "In progress" - ReadinessStage.State.PARTIAL -> "Partial" - ReadinessStage.State.NONE -> "Not yet" - ReadinessStage.State.UNKNOWN -> "Unknown" - ReadinessStage.State.STALE -> "Last observed" - ReadinessStage.State.CONFLICTING -> "Check needed" - } + requester.name, actor?.requester, actor?.name, stage) } diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrProvider.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrProvider.kt index 8196559c..06caea9c 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrProvider.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrProvider.kt @@ -57,14 +57,10 @@ class ConductarrProvider(val client: ConductarrClient) : ConductarrTitleProvider val loader = catalogue?.takeIf { it.queries == queries } ?: ConductarrCatalogue(client, queries) { libraryAudiences }.also { catalogue = it } val lanes = if (trigger == ReadTrigger.CACHE_ONLY) loader.saved() else loader.through(1, force = trigger == ReadTrigger.FORCE) val genres = options.flatMap { it.genres.orEmpty() }.associate { it.id to it.name } - val candidates = feed?.movies.orEmpty() + feed?.shows.orEmpty() - val picks = candidates.map { it.discoverTitle(genres) } - val seeds = candidates.flatMapIndexed { index, candidate -> - candidate.contributions.orEmpty().filter { !it.title.isNullOrBlank() }.map { it to picks[index] } - }.groupBy { (seed, _) -> "${seed.mediaType.name.lowercase()}:${seed.tmdbId}" }.map { (key, contributions) -> - DiscoverSeed(key, requireNotNull(contributions.first().first.title), contributions.map { it.second }, - watched = contributions.any { it.first.watched }, added = contributions.any { it.first.added }) - } + val picks = (feed?.movies.orEmpty() + feed?.shows.orEmpty()).map { it.discoverTitle(genres) } + val seeds = (feed?.movies.orEmpty() + feed?.shows.orEmpty()).flatMap { candidate -> + candidate.contributions.orEmpty().mapNotNull { seed -> seed.title?.let { it to candidate.discoverTitle(genres) } } + }.groupBy({ it.first }, { it.second }).map { DiscoverSeed(it.key, it.value) } val hidden = hiddenJob.await()?.dismissals.orEmpty().map { DiscoverTitle(it.tmdbId, it.mediaType.name.lowercase(), it.title, it.year.toInt(), poster = catalogueImage(it.posterPath)) } diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrSession.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrSession.kt index ce639277..5ba52caa 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrSession.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/ConductarrSession.kt @@ -29,7 +29,6 @@ data class ConductarrIdentity( class ConductarrSession( private val cache: CacheStore, private val disposalScope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO), - private val dns: PersistentDns? = null, ) : Closeable { private val mutableIdentity = MutableStateFlow(null) val identity: StateFlow = mutableIdentity.asStateFlow() @@ -51,7 +50,7 @@ class ConductarrSession( } try { val client = if (token.isNullOrBlank()) null else try { - ConductarrClient(baseUrl, token, PersonCacheStore(cache, person), timeouts = ClientTimeouts(3, 5, 8), dns = dns, onEvent = { event -> + ConductarrClient(baseUrl, token, PersonCacheStore(cache, person), timeouts = ClientTimeouts(3, 5, 8), onEvent = { event -> if (event == ClientEvent.NEEDS_SIGN_IN) { mutableIdentity.update { if (generation == currentGeneration) it?.copy(operator = null, signedIn = false, error = ClientError.NeedsSignIn) else it diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/HomeDestination.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/HomeDestination.kt index 35f10b1e..c8ab24cc 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/HomeDestination.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/HomeDestination.kt @@ -18,12 +18,10 @@ import java.util.Date import java.util.Locale import javax.inject.Inject import kotlinx.coroutines.CancellationException -import com.github.damontecres.wholphin.util.WholphinDispatchers +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import kotlinx.coroutines.coroutineScope -import org.justinvisser.wolfskin.tv.read.playbackPositionMs import org.justinvisser.wolfskin.design.* import org.justinvisser.wolfskin.tv.read.HomeLibraryCache import org.justinvisser.wolfskin.tv.read.HomeReadFacade @@ -52,9 +50,9 @@ class WolfskinHomeViewModel @Inject constructor( suspend fun load(server: JellyfinServer, user: JellyfinUser, person: ShellPerson, retry: Boolean = false) { catalogueJob?.cancel() - withContext(WholphinDispatchers.IO) { debugHomeSnapshot(context, person.key) }?.let { snapshot = it; return } + withContext(Dispatchers.IO) { debugHomeSnapshot(context, person.key) }?.let { snapshot = it; return } if (retry && conductarr.identity.value?.signedIn != true) { - withContext(WholphinDispatchers.IO) { + withContext(Dispatchers.IO) { conductarr.select("${server.id}:${user.id}", user.accessToken, ConductarrPreference.baseUrl, retry = true) } } @@ -76,12 +74,11 @@ class WolfskinHomeViewModel @Inject constructor( toast = null snapshot = HomeSnapshot(buildHomeRows(HomeLibrary(), emptyList(), loading = true), HomeAvailability.Loading) } - val saved = withContext(WholphinDispatchers.IO) { try { cache.read(scope) } catch (_: java.io.IOException) { null } } + val saved = withContext(Dispatchers.IO) { try { cache.read(scope) } catch (_: java.io.IOException) { null } } if (revision != loadRevision) return var libraryCopy = saved?.first ?: HomeLibrary() var libraryAvailable = true var librarySavedAt: String? = null - var watchReady = false val identity = conductarr.identity.value var catalogueCopy = DiscoverSnapshot(status = if (identity?.signedIn == true || (retry && identity != null)) DiscoverStatus.Loading else DiscoverStatus.NeedsSignIn) fun publish() { @@ -92,9 +89,8 @@ class WolfskinHomeViewModel @Inject constructor( DiscoverStatus.Unavailable -> HomeAvailability.Unavailable else -> if (catalogueCopy.savedAt != null) HomeAvailability.Saved else HomeAvailability.Ready } - snapshot = HomeSnapshot(buildHomeRows(libraryCopy, catalogueCopy.homeRows(), libraryAvailable = libraryAvailable).map { - if (it.kind == HomeRowKind.Hero) it.copy(watchReady = watchReady) else it - }, status, libraryAvailable, catalogueCopy.savedAt ?: librarySavedAt) + snapshot = HomeSnapshot(buildHomeRows(libraryCopy, catalogueCopy.homeRows(), libraryAvailable = libraryAvailable), + status, libraryAvailable, catalogueCopy.savedAt ?: librarySavedAt) } catalogueSnapshot = catalogueCopy publishCatalogue = { value -> if (revision == loadRevision && sourceScope == scope) { catalogueCopy = value; catalogueSnapshot = value; publish() } } @@ -111,43 +107,20 @@ class WolfskinHomeViewModel @Inject constructor( if (revision == loadRevision && conductarr.identity.value?.client === identity.client) publishCatalogue?.invoke(catalogue) } } - suspend fun save() { - val library = libraryCopy - withContext(WholphinDispatchers.IO) { - try { cache.write(scope, library, System.currentTimeMillis()) } catch (_: java.io.IOException) { /* Disk failure cannot revoke fresh watch data. */ } - } + try { + val library = withContext(Dispatchers.IO) { home.read(user.id) } + val savedAt = System.currentTimeMillis() + libraryCopy = library + publish() + withContext(Dispatchers.IO) { try { cache.write(scope, library, savedAt) } catch (_: java.io.IOException) { /* Saving cannot delay first paint or turn a reachable source into an outage. */ } } + } catch (exception: Exception) { + if (exception is CancellationException) throw exception + if (revision != loadRevision) return + libraryAvailable = false + librarySavedAt = saved?.second?.let { SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date(it)) } + publish() + if (retry) showToast(RecoveryMessage.StillUnreachable) } - coroutineScope { - launch { - try { - val watch = withContext(WholphinDispatchers.IO) { home.readWatch(user.id) } - if (revision != loadRevision) return@launch - libraryCopy = libraryCopy.copy(resume = watch.resume, nextUp = watch.nextUp) - watchReady = true - libraryAvailable = true - publish() - } catch (exception: Exception) { - if (exception is CancellationException) throw exception - if (revision != loadRevision) return@launch - libraryAvailable = false - librarySavedAt = saved?.second?.let { SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date(it)) } - publish() - if (retry) showToast(RecoveryMessage.StillUnreachable) - } - } - launch { - try { - val shelves = withContext(WholphinDispatchers.IO) { home.readLibrary(user.id) } - if (revision != loadRevision) return@launch - libraryCopy = libraryCopy.copy(newest = shelves.newest, destinations = shelves.destinations, destinationTotals = shelves.destinationTotals) - publish() - } catch (exception: Exception) { - if (exception is CancellationException) throw exception - if (revision == loadRevision && retry) showToast(RecoveryMessage.StillUnreachable) - } - } - } - if (revision == loadRevision) save() } suspend fun readAhead(lane: String?) { @@ -165,7 +138,6 @@ class WolfskinHomeViewModel @Inject constructor( is HomeAction.SeeAll -> if (action.row.target in shell.tabs) openRoot(shell, action.row.target!!) else openCatalogueGrid(action.row, shell) is HomeAction.Details -> navigation.navigateTo(Destination.Wolfskin(titleRoute(action.title.id))) is HomeAction.Play -> viewModelScope.launch { - val personKey = shell.person.key val selectedId = shell.person.jellyfinUserId val matchesUser = if (selectedId != null) selectedId == user.id.toString() else shell.person.key == user.name.orEmpty().lowercase() || (conductarr.identity.value?.person == "${server.id}:${user.id}" && shell.person.key == conductarr.identity.value?.operator?.requester) @@ -174,9 +146,9 @@ class WolfskinHomeViewModel @Inject constructor( return@launch } try { - val item = withContext(WholphinDispatchers.IO) { home.preparePlayback(user.id, action.title) } - if (item == null) showToast(RecoveryMessage.PlaybackUnavailable) - else if (shell.person.key == personKey && (sourceScope == null || sourceScope == "${server.id}:${user.id}")) navigation.navigateTo(Destination.Playback(item.id, item.playbackPositionMs())) + val id = withContext(Dispatchers.IO) { home.playableId(user.id, action.title) } + if (id == null) showToast(RecoveryMessage.PlaybackUnavailable) + else navigation.navigateTo(Destination.Playback(id, if (action.resume) (action.title.resumeSeconds * 1000).toLong() else 0L)) } catch (exception: Exception) { if (exception is CancellationException) throw exception showToast(RecoveryMessage.PlaybackUnavailable) @@ -232,8 +204,7 @@ internal fun HomeTitle.libraryTitle(): LibraryTitle = LibraryTitle( @Composable fun HomeDestination(shell: ShellState, server: JellyfinServer, user: JellyfinUser, modifier: Modifier = Modifier, model: WolfskinHomeViewModel = hiltViewModel()) { val identity by model.conductarrState.collectAsState() - val watchRefresh = rememberWatchRefresh("${server.id}:${user.id}") - LaunchedEffect(shell.person, server.id, user.id, identity?.client, identity?.signedIn, model.audiences, watchRefresh) { model.load(server, user, shell.person) } + LaunchedEffect(shell.person, server.id, user.id, identity?.client, identity?.signedIn, model.audiences) { model.load(server, user, shell.person) } val view = shell.rememberedView("home") LaunchedEffect(view.row, model.snapshot.rows) { val lane = model.snapshot.rows.drop(view.row).take(3).lastOrNull { it.catalogue }?.id diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/NetworkStartup.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/NetworkStartup.kt deleted file mode 100644 index 899341e5..00000000 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/NetworkStartup.kt +++ /dev/null @@ -1,46 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -package org.justinvisser.wolfskin.tv - -import android.content.Context -import com.github.damontecres.wholphin.data.MostRecentServer -import com.github.damontecres.wholphin.data.MostRecentServerProvider -import com.github.damontecres.wholphin.services.hilt.IoCoroutineScope -import dagger.hilt.android.qualifiers.ApplicationContext -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.launch -import okhttp3.HttpUrl.Companion.toHttpUrlOrNull -import org.justinvisser.wolfskin.conductarr.PersistentDns - -/** Process warm-up never blocks application creation or serializes the two service lookups. */ -@Singleton -class NetworkStartup @Inject constructor( - @param:ApplicationContext private val context: Context, - private val recent: Provider, - private val dns: PersistentDns, - @param:IoCoroutineScope private val scope: CoroutineScope, -) { - fun start() { - scope.launch { - val url = when (val server = recent.get().get()) { - is MostRecentServer.Server -> server.serverUrl - is MostRecentServer.ServerAndUser -> server.serverUrl - MostRecentServer.None -> null - } - warm(url) - } - scope.launch { - ConductarrPreference.initialize(context) - warm(ConductarrPreference.baseUrl) - } - } - - private fun warm(url: String?) { - val host = url?.toHttpUrlOrNull()?.host ?: return - try { dns.lookup(host) } catch (_: Exception) { - // An offline launch must still render the saved people. - } - } -} diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/RequestsRefresh.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/RequestsRefresh.kt index a678ca21..2c88cc9b 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/RequestsRefresh.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/RequestsRefresh.kt @@ -28,6 +28,6 @@ internal suspend fun refreshRequestsWhileStarted(state: ShellState, refresh: () refresh() while (currentCoroutineContext().isActive) { delay(WolfskinTokens.Behaviour.requestsPollSeconds.toLong() * 1000L) - if (state.requestsVisible || state.requests.snapshot.hasUnsettledRequests) refresh() + if (state.requestsVisible || state.requests.snapshot.openCount > 0) refresh() } } diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/TitleDestination.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/TitleDestination.kt index 4db5512d..e457aa86 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/TitleDestination.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/TitleDestination.kt @@ -48,7 +48,6 @@ import org.justinvisser.wolfskin.design.TitleReadStatus import org.justinvisser.wolfskin.design.TitleState import org.justinvisser.wolfskin.design.TitleSurface import org.justinvisser.wolfskin.tv.read.TitleReadFacade -import org.justinvisser.wolfskin.tv.read.playbackPositionMs import java.util.UUID import javax.inject.Inject @@ -80,7 +79,6 @@ class WolfskinTitleViewModel @Inject constructor( private val saveMutex = Mutex() private var performerPage = 1 var conductarrAction: ((TitleAction) -> Unit)? = null - val watchScope: String get() = "${repository.currentServer?.id}:${repository.currentUser?.id}" fun openRoute(route: String) = navigation.navigateTo(Destination.Wolfskin(route)) fun popRoute() = navigation.goBack() @@ -89,16 +87,6 @@ class WolfskinTitleViewModel @Inject constructor( /** Only an explicit preview/test choice admits assets; real catalogue ids use Conductarr. */ fun load(destination: String, selected: ShellPerson, userPreferences: UserPreferences, fixtures: Boolean = BuildConfig.DEBUG, force: Boolean = false) { if (!force && route == destination && ::viewer.isInitialized && viewer.key == selected.key) return - if (force && route == destination && ::viewer.isInitialized && viewer.key == selected.key && - title?.data?.status == TitleReadStatus.Ready && title?.data?.item?.held == true && - (title?.data?.connection != TitleConnection.SignedIn || conductarr.identity.value?.signedIn == true) && - !destination.startsWith("person/") && fixture == null) { - loadJob?.cancel() - preferences = userPreferences - title?.let { it.update(it.data.copy(watchReady = false)) } - loadJob = viewModelScope.launch { readTitle(Uri.decode(destination.substringAfter('/'))) } - return - } route = destination loadJob?.cancel() person = null @@ -144,7 +132,7 @@ class WolfskinTitleViewModel @Inject constructor( if (title !== current) return if (heldId != null) { if (current.data.status != TitleReadStatus.Ready) facade.readSaved(heldId, preferences)?.let { current.update(it) } - held = facade.read(heldId, current.requestedSeason, preferences) + held = facade.read(heldId, current.takeIf { it.data.status == TitleReadStatus.Ready }?.season, preferences) current.update(held) } } catch (exception: Exception) { @@ -235,21 +223,13 @@ class WolfskinTitleViewModel @Inject constructor( when (action) { TitleAction.Pop -> navigation.goBack() is TitleAction.Person -> navigation.navigateTo(action.person.id.toUuidOrNull()?.let { Destination.MediaItem(it, org.jellyfin.sdk.model.api.BaseItemKind.PERSON) } ?: Destination.Wolfskin(personRoute(action.person.id))) - is TitleAction.OpenTitle -> { - val destination = action.item.id.toUuidOrNull()?.let { Destination.MediaItem(it, when (action.item.kind) { - "movie" -> org.jellyfin.sdk.model.api.BaseItemKind.MOVIE - "episode" -> org.jellyfin.sdk.model.api.BaseItemKind.EPISODE - else -> org.jellyfin.sdk.model.api.BaseItemKind.SERIES - }) } ?: Destination.Wolfskin(titleRoute(action.item.id)) - if (action.episodeSelection && title?.data?.watchTarget?.kind == "episode") navigation.replaceTop(destination) - else navigation.navigateTo(destination) - } - is TitleAction.Play -> { - val opened = title?.data?.watchTarget - play((if (action.restart || opened?.kind != "tv") action.item.id else opened.id).toUuidOrNull(), - restart = action.restart) - } - is TitleAction.Trailer -> if (action.url.startsWith("jellyfin:")) play(action.url.removePrefix("jellyfin:").toUuidOrNull(), restart = true) + is TitleAction.OpenTitle -> navigation.navigateTo(action.item.id.toUuidOrNull()?.let { Destination.MediaItem(it, when (action.item.kind) { + "movie" -> org.jellyfin.sdk.model.api.BaseItemKind.MOVIE + "episode" -> org.jellyfin.sdk.model.api.BaseItemKind.EPISODE + else -> org.jellyfin.sdk.model.api.BaseItemKind.SERIES + }) } ?: Destination.Wolfskin(titleRoute(action.item.id))) + is TitleAction.Play -> play(action.item.id.toUuidOrNull(), if (action.restart) 0 else action.item.resumeSeconds * 1000) + is TitleAction.Trailer -> if (action.url.startsWith("jellyfin:")) play(action.url.removePrefix("jellyfin:").toUuidOrNull(), 0) else if (!TitleTrailer(context).open(action.url)) title?.toast = "No YouTube app is available to play this trailer." is TitleAction.Version, is TitleAction.Track, is TitleAction.Watched -> savePlayback(action) is TitleAction.Season -> { @@ -281,15 +261,12 @@ class WolfskinTitleViewModel @Inject constructor( } } - private fun play(id: UUID?, restart: Boolean) { - val current = title - val playbackScope = watchScope + private fun play(id: UUID?, position: Long) { viewModelScope.launch { try { if (id == null) throw IllegalArgumentException("No Jellyfin playback identity") - val item = facade.preparePlayback(id) ?: throw IllegalArgumentException("No playable item") - if (title !== current || watchScope != playbackScope) return@launch - navigation.navigateTo(Destination.Playback(item.id, if (restart) 0L else item.playbackPositionMs())) + facade.preparePlayback(id) + navigation.navigateTo(Destination.Playback(id, position)) } catch (exception: Exception) { if (exception is CancellationException) throw exception title?.toast = RecoveryMessage.PlaybackUnavailable @@ -331,8 +308,7 @@ class WolfskinTitleViewModel @Inject constructor( @Composable fun TitleDestination(route: String, shell: ShellState, preferences: UserPreferences, modifier: Modifier = Modifier, viewModel: WolfskinTitleViewModel = hiltViewModel(), fixtures: Boolean = ConductarrPreference.fixtures) { val identity by viewModel.conductarr.identity.collectAsStateWithLifecycle() - val watchRefresh = rememberWatchRefresh(viewModel.watchScope) - LaunchedEffect(route, shell.person.key, identity?.client, identity?.signedIn, fixtures, watchRefresh) { viewModel.load(route, shell.person, preferences, fixtures, force = true) } + LaunchedEffect(route, shell.person.key, identity?.client, identity?.signedIn, fixtures) { viewModel.load(route, shell.person, preferences, fixtures, force = true) } val title = viewModel.title?.takeIf { it.person.key == shell.person.key } val requests = if (route.startsWith("title/")) rememberTitleRequests(viewModel, shell, route, identity, fixtures, title) else null LaunchedEffect(title?.data?.status) { diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WatchRefresh.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WatchRefresh.kt deleted file mode 100644 index fb44b681..00000000 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WatchRefresh.kt +++ /dev/null @@ -1,32 +0,0 @@ -package org.justinvisser.wolfskin.tv - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.DisposableEffect -import androidx.compose.runtime.collectAsState -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableIntStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.lifecycle.Lifecycle -import androidx.lifecycle.LifecycleEventObserver -import androidx.lifecycle.compose.LocalLifecycleOwner -import com.github.damontecres.wholphin.util.PlaybackWatchState - -/** Re-read on entry, foreground and successful stop, even when a screen remains composed. */ -@Composable -internal fun rememberWatchRefresh(scope: String?): Pair { - val revisions by PlaybackWatchState.revisions.collectAsState() - var foreground by remember(scope) { mutableIntStateOf(0) } - val owner = LocalLifecycleOwner.current - DisposableEffect(owner, scope) { - var initialResume = owner.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED) - val observer = LifecycleEventObserver { _, event -> - if (event == Lifecycle.Event.ON_RESUME) { - if (initialResume) initialResume = false else foreground++ - } - } - owner.lifecycle.addObserver(observer) - onDispose { owner.lifecycle.removeObserver(observer) } - } - return (revisions[scope] ?: 0L) to foreground -} diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WolfskinApp.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WolfskinApp.kt index aed8ec7b..abc0089c 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WolfskinApp.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WolfskinApp.kt @@ -63,7 +63,6 @@ import org.justinvisser.wolfskin.design.DiscoverScreen class WolfskinSession @Inject constructor() { var state by mutableStateOf(null) var serverId: String? = null - internal var fixtureMode: Boolean? = null var onAction: (ShellAction) -> Unit = {} } @@ -91,6 +90,7 @@ class WolfskinShellViewModel @Inject constructor( private var identityJob: kotlinx.coroutines.Job? = null private var personSwitchJob: kotlinx.coroutines.Job? = null private val personSwitchMutex = Mutex() + private var fixtureMode: Boolean? = null suspend fun load(server: JellyfinServer, user: JellyfinUser) { withContext(Dispatchers.IO) { @@ -103,9 +103,9 @@ class WolfskinShellViewModel @Inject constructor( else withContext(Dispatchers.IO) { conductarr.select("${server.id}:${user.id}", user.accessToken, ConductarrPreference.baseUrl) } signedInPerson = session.state?.people?.firstOrNull { it.jellyfinUserId == user.id.toString() }?.key ?: user.name.orEmpty().lowercase() session.onAction = { action -> handleAction(action, server, user) } - if (session.state == null || session.serverId != server.id.toString() || session.fixtureMode != ConductarrPreference.fixtures) { + if (session.state == null || session.serverId != server.id.toString() || fixtureMode != ConductarrPreference.fixtures) { session.serverId = server.id.toString() - session.fixtureMode = ConductarrPreference.fixtures + fixtureMode = ConductarrPreference.fixtures val people = withContext(Dispatchers.IO) { readShellPeople(context, listOf(user)) } session.state = ShellState(people, signedInPerson) { session.onAction(it) } val saved = withContext(Dispatchers.IO) { repository.serverDao.getServer(server.id)?.users.orEmpty() } diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WolfskinLibrary.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WolfskinLibrary.kt index c73a68ee..0301d3dc 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WolfskinLibrary.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WolfskinLibrary.kt @@ -72,8 +72,7 @@ fun WolfskinLibraryContent( ShellPlaceholder("See all list unavailable", modifier) return } - val watchRefresh = rememberWatchRefresh(cacheScope) - LaunchedEffect(grid, grid.refreshRevision, fixture, if (route in LIBRARY_DESTINATIONS) facade.audiences else null, watchRefresh) { + LaunchedEffect(grid, grid.refreshRevision, fixture, if (route in LIBRARY_DESTINATIONS) facade.audiences else null) { if (route in LIBRARY_DESTINATIONS && (!ConductarrPreference.fixtures || fixture != null)) { val wasLoading = grid.status == LibraryStatus.Loading if (wasLoading && !shell.navFocused) shell.focusNav(shell.currentTab) @@ -83,7 +82,7 @@ fun WolfskinLibraryContent( grid.status = LibraryStatus.Ready } else { val store = withContext(Dispatchers.IO) { snapshots.value } - store.read(cacheScope, route, force = grid.refreshRevision > 0, invalidatedAtMillis = watchRefresh.first) { facade.readLibrary(user.id, route) }.collect { snapshot -> + store.read(cacheScope, route, force = grid.refreshRevision > 0) { facade.readLibrary(user.id, route) }.collect { snapshot -> val focusedId = grid.focusedTitle?.id grid.source = snapshot.items focusedId?.let { id -> grid.items.indexOfFirst { it.id == id }.takeIf { it >= 0 }?.let { grid.index = it } } diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/HomeReadFacade.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/HomeReadFacade.kt index bb86e68a..1867ae60 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/HomeReadFacade.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/HomeReadFacade.kt @@ -23,8 +23,7 @@ import org.justinvisser.wolfskin.design.HomeTitle /** All Home SDK calls and image URLs stay behind this facade, with their own required field list. */ class HomeReadFacade @Inject constructor(private val api: ApiClient, private val images: ImageUrlService, private val libraries: LibraryReadFacade) { val audiences get() = libraries.audiences - /** Watch rows are publishable without waiting for any library shelf. */ - suspend fun readWatch(userId: UUID): HomeLibrary { + suspend fun read(userId: UUID): HomeLibrary { val resumeItems = api.itemsApi.getResumeItems(userId = userId, fields = FIELDS, mediaTypes = listOf(MediaType.VIDEO), limit = 20).content.items val nextItems = api.tvShowsApi.getNextUp(userId = userId, fields = FIELDS, limit = 20, enableUserData = true).content.items val series = (resumeItems + nextItems).mapNotNull { it.seriesId }.distinct().associateWith { id -> @@ -36,11 +35,6 @@ class HomeReadFacade @Inject constructor(private val api: ApiClient, private val } val resume = resumeItems.map { title(it, series) } val next = nextItems.map { title(it, series) } - return HomeLibrary(resume = resume, nextUp = next) - } - - /** Library failures do not discard an already successful watch read. */ - suspend fun readLibrary(userId: UUID): HomeLibrary { val libraries = api.userViewsApi.getUserViews(userId = userId).content.items val destinations = linkedMapOf>() val newest = mutableListOf() @@ -52,18 +46,23 @@ class HomeReadFacade @Inject constructor(private val api: ApiClient, private val totals[key] = (totals[key] ?: 0) + response.totalRecordCount newest.addAll(api.itemsApi.getItems(userId = userId, parentId = library.id, recursive = true, includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES), fields = FIELDS, sortBy = listOf(ItemSortBy.DATE_CREATED), sortOrder = listOf(SortOrder.DESCENDING), limit = 12).content.items.map { title(it) }) } - return HomeLibrary(newest = newest.sortedByDescending { it.addedAt }.take(12), destinations = destinations, destinationTotals = totals) + return HomeLibrary(resume, next, newest.sortedByDescending { it.addedAt }.take(12), destinations, totals) } - /** Resolve the current checkpoint even when the hero was painted from disk. */ - suspend fun preparePlayback(userId: UUID, title: HomeTitle): BaseItemDto? { - val id = runCatching { UUID.fromString(title.id) }.getOrNull() ?: run { - val kinds = if (title.isEpisode) listOf(BaseItemKind.EPISODE) else listOf(BaseItemKind.MOVIE) - api.itemsApi.getItems(userId = userId, recursive = true, searchTerm = title.title, includeItemTypes = kinds, fields = FIELDS, limit = 20).content.items.firstOrNull { - it.name == title.title && (!title.isEpisode || (it.seriesName == title.seriesTitle && it.parentIndexNumber == title.season && it.indexNumber == title.episode)) - }?.id - } ?: return null - return readPlayback(api, userId, id) + suspend fun playableId(userId: UUID, title: HomeTitle): UUID? { + title.id.let { runCatching { UUID.fromString(it) }.getOrNull() }?.let { id -> + val item = api.userLibraryApi.getItem(userId = userId, itemId = id).content + if (item.type == BaseItemKind.SERIES) { + return (api.tvShowsApi.getNextUp(userId = userId, seriesId = id, limit = 1).content.items.firstOrNull() + ?: api.tvShowsApi.getEpisodes(seriesId = id, userId = userId, limit = 1).content.items.firstOrNull()) + ?.takeIf { it.type == BaseItemKind.EPISODE }?.id + } + return item.id.takeIf { item.type == BaseItemKind.MOVIE || item.type == BaseItemKind.EPISODE } + } + val kinds = if (title.isEpisode) listOf(BaseItemKind.EPISODE) else listOf(BaseItemKind.MOVIE) + return api.itemsApi.getItems(userId = userId, recursive = true, searchTerm = title.title, includeItemTypes = kinds, fields = FIELDS, limit = 20).content.items.firstOrNull { + it.name == title.title && (!title.isEpisode || (it.seriesName == title.seriesTitle && it.parentIndexNumber == title.season && it.indexNumber == title.episode)) + }?.id } private fun title(item: BaseItemDto, series: Map = emptyMap()): HomeTitle { diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/LibraryReadFacade.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/LibraryReadFacade.kt index 3c1d01ce..775235f2 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/LibraryReadFacade.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/LibraryReadFacade.kt @@ -72,7 +72,7 @@ class LibraryReadFacade @Inject constructor(private val api: ApiClient) { val response = api.itemsApi.getItems( userId = userId, parentId = library.id, recursive = true, includeItemTypes = listOf(if (destination == "movies") BaseItemKind.MOVIE else BaseItemKind.SERIES), - fields = listOf(ItemFields.PROVIDER_IDS, ItemFields.DATE_CREATED), + fields = listOf(ItemFields.PROVIDER_IDS, ItemFields.SORT_NAME, ItemFields.DATE_CREATED), sortBy = listOf(ItemSortBy.SORT_NAME), startIndex = offset, limit = WolfskinTokens.Behaviour.libraryChunk.toInt(), ).content diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/LibrarySnapshotStore.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/LibrarySnapshotStore.kt index fffe1f2c..85395ba0 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/LibrarySnapshotStore.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/LibrarySnapshotStore.kt @@ -19,13 +19,13 @@ data class LibrarySnapshot(val items: List, val savedAtMillis: Lon /** Library snapshots share the existing atomic disk store, partitioned by server and person. */ class LibrarySnapshotStore(private val cache: CacheStore, private val now: () -> Long = System::currentTimeMillis) { - fun read(scope: String, destination: String, force: Boolean = false, invalidatedAtMillis: Long = 0L, load: () -> Flow>): Flow = flow { + fun read(scope: String, destination: String, force: Boolean = false, load: () -> Flow>): Flow = flow { val key = "library:$destination" val saved = try { cache.read(scope, key) } catch (_: IOException) { null } val titles = saved?.let { try { decode(it.body) } catch (_: JSONException) { null } } if (saved != null && titles != null) emit(LibrarySnapshot(titles, saved.savedAtMillis, false)) val lifetime = (WolfskinTokens.Behaviour.libraryRefreshMinutes * 60_000).toLong() - if (!force && saved != null && titles != null && saved.validatedAtMillis > invalidatedAtMillis && now() - saved.validatedAtMillis < lifetime) return@flow + if (!force && saved != null && titles != null && now() - saved.validatedAtMillis < lifetime) return@flow var current: List = emptyList() try { load().collect { chunk -> diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/PlaybackRead.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/PlaybackRead.kt deleted file mode 100644 index ad17d57b..00000000 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/PlaybackRead.kt +++ /dev/null @@ -1,23 +0,0 @@ -package org.justinvisser.wolfskin.tv.read - -import org.jellyfin.sdk.api.client.ApiClient -import org.jellyfin.sdk.api.client.extensions.tvShowsApi -import org.jellyfin.sdk.api.client.extensions.userLibraryApi -import org.jellyfin.sdk.model.api.BaseItemDto -import org.jellyfin.sdk.model.api.BaseItemKind -import java.util.UUID - -/** A click resolves its target and checkpoint from Jellyfin, never from a painted projection. */ -internal suspend fun readPlayback(api: ApiClient, userId: UUID?, id: UUID): BaseItemDto? { - val opened = api.userLibraryApi.getItem(itemId = id, userId = userId).content - val target = if (opened.type == BaseItemKind.SERIES) { - api.tvShowsApi.getNextUp(userId = userId, seriesId = id, limit = 1, enableResumable = true, enableUserData = true) - .content.items.firstOrNull()?.id - ?: api.tvShowsApi.getEpisodes(seriesId = id, userId = userId, limit = 1, enableUserData = true).content.items.firstOrNull()?.id - } else opened.id - val item = if (target == opened.id) opened else target?.let { api.userLibraryApi.getItem(itemId = it, userId = userId).content } - return item?.takeIf { it.type == BaseItemKind.EPISODE || it.type == BaseItemKind.MOVIE } -} - -/** Preserve subsecond server checkpoints, including resumable rewatches marked Played. */ -internal fun BaseItemDto.playbackPositionMs(): Long = (userData?.playbackPositionTicks ?: 0L) / 10_000L diff --git a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/TitleReadFacade.kt b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/TitleReadFacade.kt index 1530b8df..4b3a3a4a 100644 --- a/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/TitleReadFacade.kt +++ b/app/src/wolfskin/java/org/justinvisser/wolfskin/tv/read/TitleReadFacade.kt @@ -35,7 +35,6 @@ import org.justinvisser.wolfskin.design.TitlePageData import org.justinvisser.wolfskin.design.TitlePerson import org.justinvisser.wolfskin.design.TitleTrack import org.justinvisser.wolfskin.design.TitleVersion -import org.justinvisser.wolfskin.design.WolfskinTokens import java.io.File import java.util.Locale import java.util.UUID @@ -53,8 +52,7 @@ class TitleReadFacade @Inject constructor( @param:ApplicationContext private val context: Context, ) { private val json = Json { ignoreUnknownKeys = true } - private val episodeFields = listOf(ItemFields.PROVIDER_IDS, ItemFields.OVERVIEW) - private val creditFields = listOf(ItemFields.PROVIDER_IDS, ItemFields.OVERVIEW, ItemFields.PEOPLE) + private val fields = listOf(ItemFields.PROVIDER_IDS, ItemFields.MEDIA_SOURCES, ItemFields.MEDIA_STREAMS, ItemFields.OVERVIEW, ItemFields.PEOPLE, ItemFields.PARENT_ID) /** Resolve through this user's Jellyfin permissions before granting a catalogue card playback. */ suspend fun findHeld(tmdb: Long, media: String): UUID? { @@ -78,7 +76,7 @@ class TitleReadFacade @Inject constructor( val rows = json.decodeFromString(ListSerializer(BaseItemDto.serializer()), saved.getString("items")) val numbers = saved.getJSONArray("seasonNumbers").let { array -> List(array.length()) { array.getInt(it) } } build(rows, numbers, saved.optInt("selectedSeason"), saved.getString("watch"), saved.optString("target").takeIf { it.isNotEmpty() }, preferences) - .copy(savedAt = savedTime(file), trailerUrl = saved.optString("trailer").takeIf { it.isNotEmpty() }, watchReady = false) + .copy(savedAt = savedTime(file), trailerUrl = saved.optString("trailer").takeIf { it.isNotEmpty() }) } catch (_: java.io.IOException) { null } catch (_: IllegalArgumentException) { null } catch (_: org.json.JSONException) { null } } @@ -89,12 +87,12 @@ class TitleReadFacade @Inject constructor( val series = if (opened.type == BaseItemKind.EPISODE && opened.seriesId != null) readItem(opened.seriesId!!) else opened val seasons = if (series.type == BaseItemKind.SERIES) api.itemsApi.getItems(GetItemsRequest(parentId = series.id, includeItemTypes = listOf(BaseItemKind.SEASON), recursive = false, sortBy = listOf(ItemSortBy.INDEX_NUMBER))).content.items.orEmpty() else emptyList() val next = if (opened.type == BaseItemKind.EPISODE || opened.type == BaseItemKind.MOVIE) opened else { - api.tvShowsApi.getNextUp(GetNextUpRequest(seriesId = series.id, userId = repository.currentUser?.id, limit = 1, enableResumable = true)).content.items.firstOrNull()?.let { readItem(it.id) } + api.tvShowsApi.getNextUp(GetNextUpRequest(seriesId = series.id, userId = repository.currentUser?.id, limit = 1, fields = fields, enableResumable = true)).content.items.firstOrNull()?.let { api.userLibraryApi.getItem(it.id).content } } val selectedNumber = season ?: next?.parentIndexNumber ?: seasons.firstOrNull()?.indexNumber val selected = seasons.firstOrNull { it.indexNumber == selectedNumber } ?: seasons.firstOrNull() - val episodes = selected?.let { api.tvShowsApi.getEpisodes(GetEpisodesRequest(seriesId = series.id, seasonId = it.id, fields = episodeFields)).content.items.orEmpty() }.orEmpty() - val target = next ?: episodes.firstOrNull { it.type == BaseItemKind.EPISODE }?.let { readItem(it.id) } + val episodes = selected?.let { api.tvShowsApi.getEpisodes(GetEpisodesRequest(seriesId = series.id, seasonId = it.id, fields = fields)).content.items.orEmpty() }.orEmpty() + val target = next ?: episodes.firstOrNull { it.type == BaseItemKind.EPISODE } val rows = (listOf(series, opened) + listOfNotNull(target) + episodes).distinctBy { it.id } val numbers = seasons.mapNotNull { it.indexNumber } val result = build(rows, numbers, selected?.indexNumber, opened.id.toString(), target?.id?.toString(), preferences) @@ -123,9 +121,8 @@ class TitleReadFacade @Inject constructor( return item.copy(providerIds = metadata.providerIds ?: item.providerIds, people = item.people ?: metadata.people) } - /** Series actions re-resolve NextUp; explicit episodes and Restart retain their exact identity. */ - suspend fun preparePlayback(id: UUID): BaseItemDto? = - readPlayback(api, repository.currentUser?.id, id) + /** A failed reachability read leaves navigation on the title instead of opening a dead player. */ + suspend fun preparePlayback(id: UUID) { api.userLibraryApi.getItem(id) } /** Track selection uses the same repository consumed by the upstream player. */ suspend fun apply(action: TitleAction) = withContext(Dispatchers.IO) { @@ -166,7 +163,7 @@ class TitleReadFacade @Inject constructor( } else emptyList() val person = previous.firstOrNull() ?: api.userLibraryApi.getItem(id).content val credits = api.itemsApi.getItems(GetItemsRequest(personIds = listOf(id), recursive = true, - includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES), fields = creditFields, startIndex = start, limit = 200, + includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES), fields = fields, startIndex = start, limit = 200, sortBy = listOf(ItemSortBy.PRODUCTION_YEAR, ItemSortBy.SORT_NAME))).content.items.orEmpty() val rows = listOf(person) + (previous.drop(1) + credits).distinctBy { it.id } if (personCacheFile(id) != file) throw kotlinx.coroutines.CancellationException("Performer identity changed") @@ -192,44 +189,27 @@ class TitleReadFacade @Inject constructor( streams.filter { it.type == MediaStreamType.AUDIO }.map { TitleTrack(it.index, it.displayTitle ?: it.language ?: it.codec.orEmpty(), it.isDefault) }, streams.filter { it.type == MediaStreamType.SUBTITLE }.map { TitleTrack(it.index, it.displayTitle ?: it.language ?: it.codec.orEmpty(), it.isDefault) }) } - val pageItem = mapItem(item).copy(seasons = seasonNumbers.size) - return TitlePageData(pageItem, target?.takeIf { it.type == BaseItemKind.EPISODE || (it.userData?.playbackPositionTicks ?: 0) > 0 }?.let { mapItem(it, pageItem.backdrop) }, - rows.first { it.id.toString() == watchId }.let { mapItem(it, pageItem.backdrop) }, versions, chosen?.source?.id, chosen?.audioStream?.stream?.index, + return TitlePageData(mapItem(item).copy(seasons = seasonNumbers.size), target?.takeIf { it.type == BaseItemKind.EPISODE || (it.userData?.playbackPositionTicks ?: 0) > 0 }?.let { mapItem(it) }, + rows.first { it.id.toString() == watchId }.let { mapItem(it) }, versions, chosen?.source?.id, chosen?.audioStream?.stream?.index, if (chosen?.subtitlesDisabled == true) -1 else chosen?.subtitleStream?.stream?.index ?: -1, item.remoteTrailers.orEmpty().firstNotNullOfOrNull { it.url }, cast = item.people.orEmpty().filter { it.type.toString().equals("Actor", true) }.map { person -> TitlePerson(person.id.toString(), person.name.orEmpty(), person.role.orEmpty(), person.primaryImageTag?.let { images.getItemImageUrl(person.id, ImageType.PRIMARY, maxWidth = 200, maxHeight = 200, tag = it) }) }, - episodes = rows.filter { it.type == BaseItemKind.EPISODE && it.parentIndexNumber == selectedSeason }.map { mapItem(it, pageItem.backdrop) }, + episodes = rows.filter { it.type == BaseItemKind.EPISODE && it.parentIndexNumber == selectedSeason }.map { mapItem(it) }, connection = TitleConnection.SignedOut, seasonNumbers = seasonNumbers, selectedSeason = selectedSeason) } - private fun mapItem(item: BaseItemDto, seriesBackdrop: String? = null): TitleItem = TitleItem( + private fun mapItem(item: BaseItemDto): TitleItem = TitleItem( item.id.toString(), item.name.orEmpty(), when (item.type) { BaseItemKind.MOVIE -> "movie"; BaseItemKind.EPISODE -> "episode"; else -> "tv" }, item.productionYear, (item.runTimeTicks ?: 0) / 10_000_000, overview = item.overview.orEmpty(), genres = item.genres.orEmpty(), poster = item.imageTags?.get(ImageType.PRIMARY)?.let { images.getItemImageUrl(item.id, ImageType.PRIMARY, maxWidth = 256, maxHeight = 384, tag = it) }, - backdrop = if (item.type == BaseItemKind.EPISODE) episodeArtwork(item, seriesBackdrop) else item.backdropImageTags?.firstOrNull()?.let { images.getItemImageUrl(item.id, ImageType.BACKDROP, maxWidth = WolfskinTokens.Image.heroRequestWidth, maxHeight = WolfskinTokens.Image.heroRequestHeight, tag = it) }, + backdrop = item.backdropImageTags?.firstOrNull()?.let { images.getItemImageUrl(item.id, ImageType.BACKDROP, maxWidth = 1280, maxHeight = 720, tag = it) }, held = true, watched = item.userData?.played == true, resumeSeconds = (item.userData?.playbackPositionTicks ?: 0) / 10_000_000, seriesId = item.seriesId?.toString(), seriesName = item.seriesName, season = item.parentIndexNumber ?: 0, episode = item.indexNumber ?: 0, tmdbId = item.providerIds?.entries?.firstOrNull { it.key.equals("Tmdb", true) }?.value?.toLongOrNull(), ) - private fun episodeArtwork(item: BaseItemDto, seriesBackdrop: String?): String? { - val type = when { - item.imageTags?.get(ImageType.PRIMARY) != null -> ImageType.PRIMARY - item.imageTags?.get(ImageType.THUMB) != null -> ImageType.THUMB - else -> null - } - if (type != null) return images.getItemImageUrl(item.id, type, - maxWidth = WolfskinTokens.Image.episodeRequestWidth, maxHeight = WolfskinTokens.Image.episodeRequestHeight, tag = item.imageTags?.get(type)) - return seriesBackdrop ?: item.parentBackdropItemId?.let { parent -> - item.parentBackdropImageTags?.firstOrNull()?.let { tag -> - images.getItemImageUrl(parent, ImageType.BACKDROP, - maxWidth = WolfskinTokens.Image.episodeRequestWidth, maxHeight = WolfskinTokens.Image.episodeRequestHeight, tag = tag) - } - } - } - private fun cacheFile(id: UUID): File = File(context.filesDir, "wolfskin-title/${repository.currentServer?.id}/${repository.currentUser?.id}/$id.json") private fun personCacheFile(id: UUID): File = File(cacheFile(id).parentFile, "person-$id.json") private fun savedTime(file: File): String = java.text.SimpleDateFormat("HH:mm", Locale.getDefault()).format(java.util.Date(file.lastModified())) diff --git a/conductarr-client/src/main/kotlin/org/justinvisser/wolfskin/conductarr/ConductarrClient.kt b/conductarr-client/src/main/kotlin/org/justinvisser/wolfskin/conductarr/ConductarrClient.kt index 8030fcb9..5559f15a 100644 --- a/conductarr-client/src/main/kotlin/org/justinvisser/wolfskin/conductarr/ConductarrClient.kt +++ b/conductarr-client/src/main/kotlin/org/justinvisser/wolfskin/conductarr/ConductarrClient.kt @@ -67,7 +67,6 @@ class ConductarrClient( timeouts: ClientTimeouts = ClientTimeouts(), private val nowMillis: () -> Long = System::currentTimeMillis, private val onEvent: (ClientEvent) -> Unit = {}, - dns: PersistentDns? = null, ) : Closeable { private val base = baseUrl.toHttpUrl() private val scope: String @@ -75,7 +74,6 @@ class ConductarrClient( private val cacheIdentityLock = Any() private val catalogueReads = Semaphore(2) private val http = OkHttpClient.Builder() - .apply { if (dns != null) DnsConnectionRetry.configure(this, dns) } .connectTimeout(timeouts.connectSeconds, TimeUnit.SECONDS) .readTimeout(timeouts.readSeconds, TimeUnit.SECONDS) .callTimeout(timeouts.callSeconds, TimeUnit.SECONDS) diff --git a/conductarr-client/src/main/kotlin/org/justinvisser/wolfskin/conductarr/DnsConnectionRetry.kt b/conductarr-client/src/main/kotlin/org/justinvisser/wolfskin/conductarr/DnsConnectionRetry.kt deleted file mode 100644 index 4248a4c0..00000000 --- a/conductarr-client/src/main/kotlin/org/justinvisser/wolfskin/conductarr/DnsConnectionRetry.kt +++ /dev/null @@ -1,60 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -package org.justinvisser.wolfskin.conductarr - -import java.io.IOException -import java.net.InetSocketAddress -import java.net.Proxy -import java.util.concurrent.ConcurrentHashMap -import okhttp3.Call -import okhttp3.EventListener -import okhttp3.Interceptor -import okhttp3.OkHttpClient -import okhttp3.Protocol -import okhttp3.Response - -/** Retry once with fresh DNS only if connection establishment failed before any HTTP headers were sent. */ -class DnsConnectionRetry(private val dns: PersistentDns) : Interceptor, EventListener.Factory { - private class Attempt { - @Volatile var connectionFailed = false - @Volatile var headersSent = false - } - private val attempts = ConcurrentHashMap() - - override fun create(call: Call): EventListener { - val attempt = Attempt() - attempts[call] = attempt - return object : EventListener() { - override fun connectFailed(call: Call, inetSocketAddress: InetSocketAddress, proxy: Proxy, protocol: Protocol?, ioe: IOException) { - attempt.connectionFailed = true - } - override fun requestHeadersStart(call: Call) { attempt.headersSent = true } - override fun callEnd(call: Call) { attempts.remove(call) } - override fun callFailed(call: Call, ioe: IOException) { attempts.remove(call) } - } - } - - override fun intercept(chain: Interceptor.Chain): Response { - // OkHttp deliberately disables event listeners on its derived WebSocket client. - val attempt = attempts[chain.call()] ?: return chain.proceed(chain.request()) - return try { - chain.proceed(chain.request()) - } catch (failure: IOException) { - if (!attempt.connectionFailed || attempt.headersSent || chain.call().isCanceled()) throw failure - try { - dns.lookupFresh(chain.request().url.host) - } catch (lookupFailure: IOException) { - lookupFailure.addSuppressed(failure) - throw lookupFailure - } - chain.proceed(chain.request()) - } - } - - companion object { - /** Install the same resolver and its pre-request recovery on a separately owned client. */ - fun configure(builder: OkHttpClient.Builder, dns: PersistentDns): OkHttpClient.Builder { - val retry = DnsConnectionRetry(dns) - return builder.dns(dns).eventListenerFactory(retry).addInterceptor(retry) - } - } -} diff --git a/conductarr-client/src/main/kotlin/org/justinvisser/wolfskin/conductarr/PersistentDns.kt b/conductarr-client/src/main/kotlin/org/justinvisser/wolfskin/conductarr/PersistentDns.kt deleted file mode 100644 index 2c65b657..00000000 --- a/conductarr-client/src/main/kotlin/org/justinvisser/wolfskin/conductarr/PersistentDns.kt +++ /dev/null @@ -1,142 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -package org.justinvisser.wolfskin.conductarr - -import java.io.File -import java.io.IOException -import java.net.InetAddress -import java.net.UnknownHostException -import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.Executor -import java.util.concurrent.Executors -import kotlinx.serialization.Serializable -import kotlinx.serialization.Transient -import kotlinx.serialization.encodeToString -import okhttp3.Dns - -/** Last-known system answers stay usable for one day while a single background lookup refreshes them. */ -class PersistentDns( - private val file: () -> File, - private val resolver: Dns = Dns.SYSTEM, - private val executor: Executor = Executors.newFixedThreadPool(2) { task -> Thread(task, "wolfskin-dns").apply { isDaemon = true } }, - private val nowMillis: () -> Long = System::currentTimeMillis, -) : Dns { - private class Host { - @Volatile var answer: Answer? = null - @Volatile var refreshAfter = 0L - var refreshing = false - val resolutionLock = Any() - } - - @Serializable - private data class Answer( - val addresses: List, - val savedAtMillis: Long, - @Transient val resolvedAddresses: List = decodeAddresses(addresses), - ) - private val hosts = ConcurrentHashMap() - private val diskLock = Any() - @Volatile private var loaded = false - - override fun lookup(hostname: String): List { - load() - val host = hosts.computeIfAbsent(hostname) { Host() } - val saved = host.answer - if (saved != null && nowMillis() - saved.savedAtMillis in 0..MAX_STALENESS_MILLIS) { - refresh(hostname, host) - return saved.resolvedAddresses - } - return synchronized(host.resolutionLock) { - val current = host.answer - if (current != null && current !== saved && nowMillis() - current.savedAtMillis in 0..MAX_STALENESS_MILLIS) { - current.resolvedAddresses - } else resolve(hostname, host) - } - } - - /** A failed connection bypasses the cached answer and any completed background refresh. */ - fun lookupFresh(hostname: String): List { - load() - val host = hosts.computeIfAbsent(hostname) { Host() } - return synchronized(host.resolutionLock) { - host.answer = null - resolve(hostname, host) - } - } - - private fun refresh(hostname: String, host: Host) { - synchronized(host) { - if (host.refreshing || nowMillis() < host.refreshAfter) return - host.refreshing = true - } - executor.execute { - try { - synchronized(host.resolutionLock) { resolve(hostname, host) } - } catch (_: Exception) { - // Failed refreshes do not extend the lifetime of the last successful answer. - host.refreshAfter = nowMillis() + FAILURE_BACKOFF_MILLIS - } finally { - synchronized(host) { host.refreshing = false } - } - } - } - - private fun resolve(hostname: String, host: Host): List { - val addresses = resolver.lookup(hostname) - if (addresses.isEmpty()) throw UnknownHostException(hostname) - host.answer = Answer(addresses.map { it.hostAddress!! }, nowMillis(), addresses) - host.refreshAfter = nowMillis() + REFRESH_INTERVAL_MILLIS - persist() - return addresses - } - - private fun load() { - if (loaded) return - synchronized(diskLock) { - if (loaded) return - try { - val saved = file() - if (saved.isFile && saved.length() <= MAX_FILE_BYTES) { - val entries = WireJson.decodeFromString>(saved.readText()) - require(entries.size <= MAX_HOSTS) - entries.forEach { (name, answer) -> hosts[name] = Host().apply { this.answer = answer } } - } - } catch (_: IOException) { - // A missing or damaged hint file cannot prevent normal system resolution. - } catch (_: IllegalArgumentException) { - // Serialization and literal-validation errors invalidate the entire hint file. - } - loaded = true - } - } - - private fun persist() = synchronized(diskLock) { - try { - val entries = hosts.entries.mapNotNull { (name, host) -> host.answer?.let { name to it } } - .sortedByDescending { it.second.savedAtMillis }.take(MAX_HOSTS).toMap() - val target = file() - target.parentFile?.mkdirs() - val temporary = File(target.path + ".tmp") - temporary.writeText(WireJson.encodeToString(entries)) - if (!temporary.renameTo(target)) temporary.delete() - } catch (_: IOException) { - // The in-memory answer remains usable when private storage is unavailable. - } - } - - companion object { - const val MAX_STALENESS_MILLIS = 24 * 60 * 60 * 1000L - private const val REFRESH_INTERVAL_MILLIS = 60_000L - private const val FAILURE_BACKOFF_MILLIS = 2_000L - private const val MAX_HOSTS = 32 - private const val MAX_ADDRESSES = 32 - private const val MAX_FILE_BYTES = 64 * 1024L - private fun decodeAddresses(addresses: List): List { - require(addresses.isNotEmpty() && addresses.size <= MAX_ADDRESSES) - return addresses.map { address -> - // Numeric literals only: decoding the hint file must never perform DNS. - require(address.contains(':') || address.matches(Regex("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+"))) - InetAddress.getByName(address) - } - } - } -} diff --git a/conductarr-client/src/test/kotlin/org/justinvisser/wolfskin/conductarr/ClientSmoke.kt b/conductarr-client/src/test/kotlin/org/justinvisser/wolfskin/conductarr/ClientSmoke.kt index 8c8495fb..98173fce 100644 --- a/conductarr-client/src/test/kotlin/org/justinvisser/wolfskin/conductarr/ClientSmoke.kt +++ b/conductarr-client/src/test/kotlin/org/justinvisser/wolfskin/conductarr/ClientSmoke.kt @@ -2,10 +2,6 @@ package org.justinvisser.wolfskin.conductarr import java.nio.file.Files -import java.io.File -import java.net.InetAddress -import java.util.concurrent.Executor -import okhttp3.Dns import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking @@ -18,24 +14,13 @@ fun main() = runBlocking { try { MockWebServer().use { server -> server.start() - val baseUrl = server.url("/").newBuilder().host("localhost").build().toString() - var resolutions = 0 - val dead = InetAddress.getByName("127.0.0.2") - val live = InetAddress.getByName("127.0.0.1") - val dns = PersistentDns({ File(directory, "dns.json") }, Dns { - resolutions++ - if (resolutions == 1) listOf(dead) else listOf(live) - }, Executor { it.run() }) - check(dns.lookup("localhost") == listOf(dead)) + val baseUrl = server.url("/").toString() server.enqueue(MockResponse.Builder().body(PROFILES_JSON).addHeader("ETag", "\"smoke\"").build()) - ConductarrClient(baseUrl, TEST_TOKEN, FileCacheStore(directory), dns = dns).use { client -> + ConductarrClient(baseUrl, TEST_TOKEN, FileCacheStore(directory)).use { client -> val live = client.read(TvRoutes.profiles()).toList().single() as ReadResult.Value check(live.saved.value!!.profiles!!.single().name == "Justin") - check(resolutions == 2) - println("DNS SMOKE: cached 127.0.0.2 refused -> fresh 127.0.0.1 -> profile Justin; requests=${server.requestCount}, resolutions=$resolutions") } - val reopened = PersistentDns({ File(directory, "dns.json") }, Dns { listOf(live) }, Executor { it.run() }) - ConductarrClient(baseUrl, TEST_TOKEN, FileCacheStore(directory), dns = reopened).use { client -> + ConductarrClient(baseUrl, TEST_TOKEN, FileCacheStore(directory)).use { client -> val saved = client.read(TvRoutes.profiles(), ReadTrigger.CACHE_ONLY).first() as ReadResult.Value check(saved.saved.fromDisk) server.enqueue(MockResponse.Builder().code(304).build()) diff --git a/conductarr-client/src/test/kotlin/org/justinvisser/wolfskin/conductarr/DnsConnectionRetryTest.kt b/conductarr-client/src/test/kotlin/org/justinvisser/wolfskin/conductarr/DnsConnectionRetryTest.kt deleted file mode 100644 index 58b72d98..00000000 --- a/conductarr-client/src/test/kotlin/org/justinvisser/wolfskin/conductarr/DnsConnectionRetryTest.kt +++ /dev/null @@ -1,68 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -package org.justinvisser.wolfskin.conductarr - -import java.net.InetAddress -import java.util.concurrent.CompletableFuture -import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicReference -import mockwebserver3.MockResponse -import mockwebserver3.MockWebServer -import okhttp3.Dispatcher -import okhttp3.Dns -import okhttp3.OkHttpClient -import okhttp3.Request -import okhttp3.Response -import okhttp3.WebSocket -import okhttp3.WebSocketListener -import org.junit.Assert.* -import org.junit.Rule -import org.junit.Test -import org.junit.rules.TemporaryFolder - -/** OkHttp's listener-free WebSocket client must retain a working upgrade and message path. */ -class DnsConnectionRetryTest { - @get:Rule val directory = TemporaryFolder() - - @Test fun derivedClientOpensWebSocketWithoutAnUncaughtDispatcherException() { - val opened = CompletableFuture() - val message = CompletableFuture() - val uncaught = AtomicReference() - val executor = Executors.newCachedThreadPool { task -> - Thread(task, "dns-websocket-test").apply { - uncaughtExceptionHandler = Thread.UncaughtExceptionHandler { _, failure -> - uncaught.set(failure) - opened.completeExceptionally(failure) - message.completeExceptionally(failure) - } - } - } - MockWebServer().use { server -> - server.enqueue(MockResponse.Builder().webSocketUpgrade(object : WebSocketListener() { - override fun onOpen(webSocket: WebSocket, response: Response) { webSocket.send("ready") } - }).build()) - server.start() - val dns = PersistentDns({ directory.root.resolve("dns.json") }, Dns { listOf(InetAddress.getByName("127.0.0.1")) }) - val client = DnsConnectionRetry.configure(OkHttpClient.Builder(), dns) - .dispatcher(Dispatcher(executor)).build().newBuilder().build() - val socket = client.newWebSocket(Request.Builder().url(server.url("/events")).build(), object : WebSocketListener() { - override fun onOpen(webSocket: WebSocket, response: Response) { opened.complete(response.code) } - override fun onMessage(webSocket: WebSocket, text: String) { message.complete(text) } - override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) { - opened.completeExceptionally(t) - message.completeExceptionally(t) - } - }) - try { - assertEquals(101, opened.get(5, TimeUnit.SECONDS).toInt()) - assertEquals("ready", message.get(5, TimeUnit.SECONDS)) - assertNull(uncaught.get()) - println("WEBSOCKET SMOKE: derived cached-DNS client opened HTTP 101, received ready, no uncaught dispatcher exception") - } finally { - socket.cancel() - client.connectionPool.evictAll() - executor.shutdownNow() - } - } - } -} diff --git a/conductarr-client/src/test/kotlin/org/justinvisser/wolfskin/conductarr/PersistentDnsTest.kt b/conductarr-client/src/test/kotlin/org/justinvisser/wolfskin/conductarr/PersistentDnsTest.kt deleted file mode 100644 index b167b354..00000000 --- a/conductarr-client/src/test/kotlin/org/justinvisser/wolfskin/conductarr/PersistentDnsTest.kt +++ /dev/null @@ -1,160 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -package org.justinvisser.wolfskin.conductarr - -import java.io.File -import java.net.InetAddress -import java.net.Proxy -import java.net.UnknownHostException -import java.util.concurrent.Executor -import java.util.concurrent.TimeUnit -import mockwebserver3.MockResponse -import mockwebserver3.MockWebServer -import okhttp3.ConnectionPool -import okhttp3.Dns -import okhttp3.OkHttpClient -import okhttp3.Request -import okhttp3.RequestBody.Companion.toRequestBody -import org.junit.Assert.* -import org.junit.Rule -import org.junit.Test -import org.junit.rules.TemporaryFolder - -/** Fake time and queued refreshes prove stale answers, disk hints and dead-address recovery. */ -class PersistentDnsTest { - @get:Rule val directory = TemporaryFolder() - private var now = 1_000_000L - private val queued = ArrayDeque() - private val background = Executor { queued.add(it) } - private val old = InetAddress.getByName("127.0.0.2") - private val fresh = InetAddress.getByName("127.0.0.1") - private var answer = listOf(old) - private var lookups = 0 - private val resolver = Dns { lookups++; answer } - private val file get() = File(directory.root, "dns.json") - private fun cache(resolve: Dns = resolver) = PersistentDns({ file }, resolve, background, { now }) - - @Test fun staleAnswerReturnsBeforeBackgroundRefreshAndNextLookupUsesChangedIp() { - val dns = cache() - assertEquals(listOf(old), dns.lookup("jellyfin.test")) - now += 120_000 - answer = listOf(fresh) - assertEquals(listOf(old), dns.lookup("jellyfin.test")) - assertEquals(1, lookups) - assertEquals(listOf(old), dns.lookup("jellyfin.test")) - assertEquals(1, queued.size) - queued.removeFirst().run() - assertEquals(listOf(fresh), dns.lookup("jellyfin.test")) - assertEquals(2, lookups) - } - - @Test fun answersOlderThanOneDayCannotBeServedEvenWhenRefreshFails() { - val dns = cache() - dns.lookup("jellyfin.test") - now += PersistentDns.MAX_STALENESS_MILLIS + 1 - val expired = cache(Dns { throw UnknownHostException() }) - assertThrows(UnknownHostException::class.java) { expired.lookup("jellyfin.test") } - } - - @Test fun persistedAnswersRetainTimestampAndSystemAddressOrdering() { - answer = listOf(InetAddress.getByName("::1"), fresh) - cache().lookup("jellyfin.test") - now += 120_000 - val reopened = cache(Dns { error("Disk answer must return before resolving") }) - assertEquals(answer, reopened.lookup("jellyfin.test")) - assertEquals(1, queued.size) - now += PersistentDns.MAX_STALENESS_MILLIS - assertThrows(UnknownHostException::class.java) { - cache(Dns { throw UnknownHostException() }).lookup("jellyfin.test") - } - } - - @Test fun corruptOrNonnumericDiskAnswersAreIgnored() { - for (contents in listOf("not json", "{\"jellyfin.test\":{\"addresses\":[\"not-an-ip.test\"],\"savedAtMillis\":1000000}}")) { - file.writeText(contents) - answer = listOf(fresh) - assertEquals(listOf(fresh), cache().lookup("jellyfin.test")) - } - assertEquals(2, lookups) - } - - @Test fun negativeAnswersDoNotDelayRecoveryAndFailedRefreshDoesNotExtendStaleness() { - var offline = true - val dns = cache(Dns { if (offline) throw UnknownHostException(); listOf(fresh) }) - assertThrows(UnknownHostException::class.java) { dns.lookup("jellyfin.test") } - offline = false - assertEquals(listOf(fresh), dns.lookup("jellyfin.test")) - offline = true - now += 120_000 - assertEquals(listOf(fresh), dns.lookup("jellyfin.test")) - queued.removeFirst().run() - assertEquals(listOf(fresh), dns.lookup("jellyfin.test")) - assertTrue(queued.isEmpty()) - now += 2_001 - dns.lookup("jellyfin.test") - assertEquals(1, queued.size) - } - - @Test fun unexpectedRefreshExceptionKeepsTheLastAnswerAndAllowsAnotherRefresh() { - var failing = false - val dns = cache(Dns { if (failing) throw IllegalStateException("resolver unavailable"); answer }) - dns.lookup("jellyfin.test") - now += 120_000 - failing = true - assertEquals(listOf(old), dns.lookup("jellyfin.test")) - queued.removeFirst().run() - now += 2_001 - failing = false - answer = listOf(fresh) - assertEquals(listOf(old), dns.lookup("jellyfin.test")) - queued.removeFirst().run() - assertEquals(listOf(fresh), dns.lookup("jellyfin.test")) - } - - @Test fun failedCachedAddressForcesFreshResolutionAndRetriesBeforeSendingPost() { - MockWebServer().use { server -> - server.start() - val dns = cache() - dns.lookup("jellyfin.test") - answer = listOf(fresh) - server.enqueue(MockResponse.Builder().body("new address").build()) - val client = DnsConnectionRetry.configure(OkHttpClient.Builder(), dns) - .proxy(Proxy.NO_PROXY).retryOnConnectionFailure(false).connectTimeout(1, TimeUnit.SECONDS) - .connectionPool(ConnectionPool(0, 1, TimeUnit.MILLISECONDS)).build() - try { - val url = server.url("/").newBuilder().host("jellyfin.test").build() - client.newCall(Request.Builder().url(url).post("body".toRequestBody()).build()).execute().use { - assertEquals("new address", it.body.string()) - } - assertEquals(2, lookups) - assertEquals(1, server.requestCount) - assertEquals(listOf(fresh), dns.lookup("jellyfin.test")) - } finally { - client.connectionPool.evictAll() - client.dispatcher.executorService.shutdown() - } - } - } - - @Test fun backgroundIpChangeIsUsedByTheNextHttpCall() { - MockWebServer().use { server -> - server.start() - val dns = cache() - dns.lookup("jellyfin.test") - now += 120_000 - answer = listOf(fresh) - assertEquals(listOf(old), dns.lookup("jellyfin.test")) - queued.removeFirst().run() - server.enqueue(MockResponse.Builder().body("refreshed").build()) - val client = DnsConnectionRetry.configure(OkHttpClient.Builder(), dns).proxy(Proxy.NO_PROXY).build() - try { - val url = server.url("/").newBuilder().host("jellyfin.test").build() - client.newCall(Request.Builder().url(url).build()).execute().use { assertEquals("refreshed", it.body.string()) } - assertEquals(2, lookups) - assertEquals(1, server.requestCount) - } finally { - client.connectionPool.evictAll() - client.dispatcher.executorService.shutdown() - } - } - } -} diff --git a/data/tv-spec/spec.md b/data/tv-spec/spec.md deleted file mode 100644 index 913f31f5..00000000 --- a/data/tv-spec/spec.md +++ /dev/null @@ -1,115 +0,0 @@ -# Wolfskin TV specification — revision 6 - -2026-11-07. Revision 6 adds the approved direction-A motion and loading states from [the motion reference](https://pages.justinvisser.org/wolfskin/tv-motion-speed.html), frozen with SHA-256 checksums at `data/tv-v2/motion-2026-11-06/`, and the subsequently approved **option B** [card metadata frames](https://pages.justinvisser.org/wolfskin/tv-card-meta-frames.html). Revision-5 feedback below still applies except where the card amendment explicitly supersedes it. Unchanged navigation, typography and colours remain governed by the [written specification](https://pages.justinvisser.org/wolfskin/tv-spec). The revision-5 prototype delta remains `data/tv-v2/feedback-2026-11-06/`. - -## Who’s watching - -The Settings gear is horizontally centred beneath the complete people row, independent of person count or selection. Justin confirmed this placement. It uses the same 4 px accent straddle ring as the people, with the existing 1.08 scale and focus-only Settings caption. Down still reaches it only from the final person; Up returns to that person. - -## Focus visibility - -“Centered” means consistent visibility, not geometric centering. Keep the approved shelf rule: one-card lookahead, shifting after the second-last visible slot, with first/last positions clamped to the actual contents. Short rows do not manufacture empty scroll space. Poster, tile, wide, service, episode, cast and related shelves follow the same rule. - -The focused card and its ring remain fully inside the viewport, with at least the Level 2 gap (40 px) of horizontal clearance at each screen edge. Focused rows clear the nav band and the bottom edge. Preserve the approved 168 px heading pin and initial fully-visible-row exceptions; hero/header anchors remain zero. First entry, row changes, row ends and Back from a title must reconcile retained logical selection with the actual scroll position. A frame is recorded as positioned only after its scroll finishes. Discover uses the approved six poster slots, not a rounded-down five-slot approximation. - -Library and Person grids retain six columns and the existing Level 2 row spacing. The final Person column keeps the full poster width; horizontal padding must not shrink it. - -## Episode artwork and dimensions - -Episode cards use **400×280 px (200×140 dp)** art: 55 px / 24.4% taller than the previous 400×225 px tile. Other tile and wide-card sizes are unchanged. The episode shelf is `84 + 280 + 68 = 432 px`; its heading band and 68 px clearance before Cast remain Level 2. Cast moves down by the additional card height rather than overlapping it. - -Choose available art in this order: - -1. Episode `Primary` image — Jellyfin stores episode stills under this type. -2. Episode `Thumb` image. -3. Series `Backdrop`, centre-cropped to the episode slot. -4. The existing missing-art treatment when none is available. - -A series-page read supplies its already-read backdrop to the episode projection; it does not make one series request per episode. Saved pages rebuild the same projection from cached metadata. Thumbnail reads and prefetch use the 400×280 px episode request, not the unrelated poster dimensions. - -Read-only Jellyfin evidence: all ten The Bear season-three episodes have Primary tags and no episode Backdrop tags. Tomorrow’s Primary source is 2100×1182; the series Backdrop is 3840×2160. These are existing aired files, not missing/unaired episode placeholders. - -## Episode summaries and series header spacing - -In episode context, the summary belongs to the episode: focused episode first, explicitly opened episode next, otherwise the Up-next episode. Use the show overview only when no episode context is selected. An absent episode overview stays absent instead of substituting the show's description. The focused episode card can show two ellipsised lines of its own overview below its episode label. - -A held series header measures its actual copy, actions and action-caption band, then leaves **40 px** before the Seasons row. Remove the unconditional 900 px series-header spacer. Films, non-held titles and loading/error layouts retain their approved fixed header geometry. Measured series geometry also drives the frame offsets and focus-follow calculation, preventing season/episode rows from scrolling to stale offsets. Long titles or summaries may grow the header; controls must never overlap the seasons. - -## Hero image quality and memory - -| Surface | Requested/decode bound | Format policy | -|---|---|---| -| Home and Discover hero; title backdrop | 1920×1080 | ARGB, 7.91 MiB at the bound | -| Upright hero poster | 420×630 | RGB565 where supported, 0.50 MiB | -| Episode card | 400×280 | ARGB, 0.43 MiB | -| Library poster, ordinary tile/wide, cast | Existing slot dimensions | Existing RGB565/ARGB policy | - -Jellyfin image URLs discard conflicting width/height/max/fill caps and request the consuming slot while preserving image tags, quality and other query parameters. Jellyfin quality remains **96**. TMDB heroes use the original source rather than the previous 780 px source; Coil constrains decoding to the panel. Upright TMDB sheets use a suitable poster tier. Intentionally blurred poster-only washes remain bounded to the upright source, not an oversized portrait bitmap. Decode fitting prevents allocation of an oversized off-ratio source merely to fill a crop. - -The shared memory cache remains **64 MiB**, disk cache **128 MiB**, image concurrency **4**. Three 1080p hero bitmaps consume 23.73 MiB, leaving 40.27 MiB of the cache for other art. These are allocation bounds, not measured TV resident-memory claims; do not request or decode 4K hero bitmaps on the 2 GB armv7 box. - -Read-only source measurement: Desperate Housewives has a 2732×1536 Backdrop. With quality 96, Jellyfin returned a 1281×720 JPEG of 438,329 bytes for the old fill request and a 1921×1080 JPEG of 982,435 bytes for the new request; the extra source pixel is Jellyfin aspect-ratio rounding. The display decode stays bounded to 1920×1080. - -## Discover lane spacing - -Every Discover lane, including Movies for you, Series for you, service entries, service-specific lanes and Hidden picks, uses a **104 px heading band**: heading line plus **60 px heading-to-card gap**, up from 40 px. This is a consistent Level 2 extension, not a Series-only exception. Poster shelves become 652 px high and service-entry shelves 316 px. Captions and frame scroll offsets use the same heading band. Home headings remain unchanged. - -## Motion and loading — revision 6 - -Home heroes and shelves, Library rows, Discover hero/lanes, title headers, episodes and cast, and person headers/filmography use shaped placeholders without loading sentences. The placeholder fill is `surface2` (`#1b1b25`). A complete shelf shares **one** alpha layer: **0.55 → 1 → 0.55 over 1400 ms**, CSS ease-in-out (`.42,0,.58,1`), 700 ms each way. All loading shelves under the screen's theme share one clock, so late arrivals join the current phase. The clock stops when the last loading shelf leaves. No per-card clocks, staggered pulse phases, shimmer, moving gradient, or animated blur. - -| Transition | Duration and curve | Transform | -|---|---|---| -| Focus scale/ring | 180 ms, ease-out (`.33,1,.68,1`) | Existing locked focus scale; no geometry change | -| Poster caption in / out | 60 ms delay + 180 ms ease-out / 100 ms ease-out | 10 px rise on entry only; exit holds its position, including when entry was interrupted | -| Network artwork only | 160 ms, Coil painter alpha | None; memory, disk and local hits are instant | -| Row/tab content reveal | 180 ms, ease-out | One layer per row, 24 px rise | -| Initial hero/title copy | 180 ms, ease-out | 16 px rise | -| Hero backdrop hand-off | 320 ms, ease-in-out (`.65,0,.35,1`) | Alpha only; retain previous art until incoming art or its final fallback is ready | -| Hero copy hand-off | Old copy out 120 ms ease (`.25,.1,.25,1`); new copy starts at 140 ms and enters over 200 ms ease-out | 14 px rise on entry | -| Late ratings, genres, overview and readiness | 200 ms, ease | Alpha only, inside existing measured slots; rating plates keep their existing plate fade rather than adding a nested fade | -| Horizontal / vertical focus-follow scroll | 160 ms ease / 180 ms ease-out | Existing scroll geometry | - -Row reveals are grouped rather than the browser prototype's per-card staging: the armv7 frame budget permits one animated layer per shelf, not one per card. Tabs have no full-screen transition layer. The upper Home hero blend is bounded to **1920×820 px**, Discover to **1920×740 px**; the lower backdrop changes without an animated screen-sized layer. Hero copy is a separate bounded block. Image reveal uses Coil's painter, not a new full-screen compositing layer. Existing poster-only blur is static. - -The title page's scroll dim is a draw-only colour overlay, not an alpha-animated full-screen layer. Discover scrolls its backdrop through placement offsets rather than a full-screen translation layer. Initial loading animated layers are Home **2**, Library **up to 3** lazy rows, Discover **2**, title header **1**, person **2**; pending title episode/cast shelves add **1 each**, and each pending Discover lane owns **1**. Deep Home loading is bounded to **4** visible shelf layers. These are animated layers, not independent pulse clocks or every static display-list node: one shared pulse clock drives the loading screen without adding a layer. A hero hand-off adds at most **2** bounded owners (outgoing art and copy). Focus changes can animate **2** card transforms, **1** caption and at most **2** rating plates; artwork fades are painter draws without additional compositing layers. Late title metadata adds at most **4** bounded alpha layers: title ratings, play-target ratings, genres and overview. No animated owner is full-screen. - -The series readiness band reserves **56 px (28 dp)** from its first content paint, including when empty or when readiness later disappears. Ratings remain inside the fixed-height facts band. The series header's measured height therefore cannot change when late ratings/readiness arrive; overview, actions, season and episode anchors retain their coordinates. Skeletons have no click/hover focus targets; pending episode/cast rows remain absent from the key-navigation state until real cards exist. Initial loading keeps nav focus and Back still pops the title/person route. - -Discover key traversal skips pending lanes in both directions. If every remaining lane is pending, Down stays on the real filter chips and Back returns to nav; a skeleton must never create an empty-column focus range. - -`Settings.Global.ANIMATOR_DURATION_SCALE == 0`, exposed by Compose's window `MotionDurationScale`, or the host's `LocalReducedMotion` flag disables pulse and translation/scroll motion. Focus scale and nav geometry snap; permitted fades are capped at **80 ms**. The window context supplies live scale state without settings or disk reads on the main thread. Fetch/decode dispatchers and image URL logic are unchanged. - -Native **1920×1080** before/after frames and the frame-budget inventory are published at [the motion build proof](https://pages.justinvisser.org/wolfskin/tv-motion-build/). Before frames use the pre-change surface sources in this same isolated worktree; after frames use the shipped Compose surfaces. No device access, installation or optimized APK is part of this lane. On-box acceptance remains: no series layout change after first content, Home scrolling no worse than **39.6% janky / p90 65 ms**. Native JVM rendering does not measure that GPU/frame-timing target. - - -## Card metadata and bottom state line — revision 6, option B - -Film cards show year, duration and a **24 px watched check**. Episodes show their own duration and check, without a year; series show year and check, never an aggregate runtime. Resuming and unwatched cards have no check. Compact metadata omits media-type words, season counts, character roles, ownership and remaining-time prose. Duration rounds total minutes before formatting hours/minutes; narrow layouts tighten metadata gaps from **12 → 8 → 4 px**, never shrink text or ellipsise duration. - -Movies, Shows, Anime, Home See all and person filmography always show their card-width title/subtitle. Titles are one-line ellipses: **28 px / 32 px line**, medium muted at rest, bold foreground when focused. Metadata is **24 px / 26 px line**. The **96 px** poster caption band starts its text **38 px** below unscaled art. Home poster captions remain focus-only; Home landscape titles stay on the art with focus-only metadata below it. Landscape shelves reserve **64 px** below art. Loading placeholders reserve identical **blank** caption bands: only art-sized blocks are painted, with no title/subtitle pills. Each shelf still shares the motion lane's single pulse layer. - -| Geometry at 1920×1080 | Pixels | -|---|---:| -| Library row pitch | 524 | -| Home poster shelf pitch | 632 | -| Home wide / tile shelf pitch | 522 / 441 | -| Initial library art row tops | 372 / 896 | -| Pinned library art row tops / second-row bottom | 168 / 692 / 1076 | -| Focus ring to caption / caption to next focused row ring | 20.48 / 26.48 | - -One bottom state line replaces the independent resume bar. Unwatched and Discover have no state line; watched has a full-width **3 px accent** line; resume has proportional **6 px accent** fill on a full-width `color.progressTrack` track. Left/right are zero, with **2 px bottom backing** and **2 px opaque separator** above the fill, clipped by the art's **16 px** radius. Focus scales the art/line by **1.08**, with its **4 px** straddle ring drawn independently above them. - -Completed Home progress (`resumeSeconds / runtimeSeconds >= 1`) follows the same state precedence as library/title cards: it is no longer resuming, so a played title uses the 3 px watched line and an unplayed title has no state line. - -Justin's additional correction is binding even where a reference frame leaks: **the lowest card row must contain card/edge/fill colour, never art**. Clip artwork out of the backing band before painting it; merely overdrawing after a rounded clip can retain poster colours in antialiased corners. The backing is opaque `color.bg` (**#07070a**). Precompose and quantise the track over that backing once to preserve the approved **#3d3d3f** browser pixels instead of native alpha-rounding differences; fill is **#cc9fff**. The approved Annie Hall and Locke treatment frames themselves expose artwork below their inset state line; the native build deliberately makes that row solid. - -Native same-fixture comparisons and the exhaustive real-art bottom-row proof are published in [the card metadata build gallery](https://pages.justinvisser.org/wolfskin/tv-card-meta-build/). `CardBottomPixelTest` checks white Annie Hall, dark Locke, colourful Apocalypse Now and Avatar Aang at rest and individually focused; every pixel across each full bottom row must equal an art-free rendering of the same clipped backing/ring, while straight-edge and fill/track pixels additionally match exact state colours. It also checks Home/library parity when progress reaches or exceeds completion. `CardGeometryTest` measures narrow fitting, the 24 px check, grid/shelf pitches, pinned rows and ring clearances to 0.1 px, and asserts every pixel in reserved loading caption bands remains background-coloured. `CardCaptionMotionTest` compares native glyph pixels after changing a focused title and moving across a focused Home shelf. Reference comparisons retain documented renderer/fixture artifacts; unapproved visible design changes remain merge blockers. - -## Sources and verification - -Authoritative changed values live in `wolfskin-design/tokens.json`, `title-tokens.json` and `discover-tokens.json`; regenerate Kotlin, CSS and the drift manifest with `python3 wolfskin-design/generate_tokens.py`. - -`MotionSurfaceTest`, `HeroMotionTest`, `NetworkArtTransitionTest` and `DiscoverSkeletonKeysTest` cover late-line geometry, loading/ready row eligibility, Back/nav ownership, rendered pulse suppression under both motion controls, strict main-thread I/O policy, network-versus-cache reveal, bounded hero blending, delayed art and interrupted hand-offs. Native follow-up cases compare the pulse pixels of a late-joining shelf, hold caption translation through both settled and interrupted exits, and observe late ratings/genres/overview fading without moving their slots or actions. Manually clocked captures explicitly deliver snapshot changes before advancing animation time; interrupted-exit assertions sample after the hide has committed. The frozen prototype includes `index.html`, its local media, the original CSS/JS/builder and a complete SHA-256 manifest; replay the HTML, not the preserved builder's live-publishing entry point. - -The feedback prototype delta links the native 1920×1080 before/after frames. `HomeViewportTest` exercises short and long poster/tile/wide rows, first focus, both row directions and native Back from the shipped title surface. The real-Bear capture harness reads recorded Jellyfin metadata through `TitleReadFacade`; it is a throwaway proof and is not shipped. The final gates are `make test` and `make apk-debug`. No TV access or optimized-APK build is part of this worker's validation. diff --git a/data/tv-v2/feedback-2026-11-06/delta.json b/data/tv-v2/feedback-2026-11-06/delta.json deleted file mode 100644 index 5e732f73..00000000 --- a/data/tv-v2/feedback-2026-11-06/delta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "specRevision": 5, - "base": "data/tv-v2/focus-2026-11-06/index.html", - "baseSha256": "1bb7f4097a5303a58e45ec5e61cf867fa6cfdcbfe12fc7a196f00acacae5e48d", - "stagePx": [1920, 1080], - "density": 2, - "picker": { - "gearAlignment": "center of the complete people row", - "gearRing": "same accent straddle ring as picker people", - "gearFocusScale": 1.08, - "navigation": "unchanged: Down from the final person only" - }, - "focus": { - "horizontalRule": "second-last-slot lookahead; clamp first/last to real contents", - "minimumScreenSideMarginPx": 40, - "headingPinPx": 168, - "geometricCentering": false, - "discoverPosterSlots": 6 - }, - "episode": { - "artPx": [400, 280], - "shelfHeightPx": 432, - "gapBeforeCastPx": 68, - "artFallback": ["episode Primary", "episode Thumb", "series Backdrop crop", "missing art"], - "summaryContext": ["focused episode", "explicitly opened episode", "up-next episode", "show when no episode context"], - "focusedCardSummaryLines": 2 - }, - "seriesHeader": { - "height": "measured copy, actions and caption band plus gap", - "gapBeforeSeasonsPx": 40, - "otherTitleHeaders": "unchanged" - }, - "discover": { - "allLaneHeadingBandPx": 104, - "allLaneHeadingToCardGapPx": 60, - "posterShelfHeightPx": 652, - "serviceShelfHeightPx": 316, - "homeHeadingBand": "unchanged" - }, - "images": { - "heroDecodeBoundPx": [1920, 1080], - "heroPosterDecodeBoundPx": [420, 630], - "jellyfinQuality": 96, - "memoryCacheMiB": 64, - "diskCacheMiB": 128, - "concurrentReads": 4 - }, - "nativeFrames": "https://pages.justinvisser.org/wolfskin/tv-fb1-visual/", - "specification": "../../tv-spec/spec.md" -} diff --git a/data/tv-v2/feedback-2026-11-06/index.html b/data/tv-v2/feedback-2026-11-06/index.html deleted file mode 100644 index 7b715570..00000000 --- a/data/tv-v2/feedback-2026-11-06/index.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - -Wolfskin TV · feedback delta · revision 5 - -

Wolfskin TV · feedback delta

-

Specification revision 5. The approved frames remain the baseline; these native 1920×1080 frames show only the requested feedback changes. This is a frame prototype, not a simulated Jellyfin client.

- -

Who’s watching

Gear centred beneath everyone, with the person-style focus ring.

-Native picker after: Settings centred below the complete people row -
BeforeNative picker before: gear below the final person
-

Home

Approved edge scrolling retained. Short/long poster, tile and wide rows, row changes and native title Back exercise the same visibility contract.

-Native Home after: focused card safely inside a long shelf -
BeforeNative Home baseline
-
Real-source hero request comparison

Same native renderer and source artwork: old 720p response, then panel-sized response. Intentionally blurred poster washes are unchanged.

Native hero using the old 720p source responseNative hero using the panel-resolution source response
-

Discover

60 px from lane title to cards; all lanes use the same 104 px heading band.

-Native Discover after: more space above every lane's cards -
BeforeNative Discover before: smaller heading gap
-

Series header

Episode-context summary and a measured header instead of the empty fixed-height spacer. Season chips and thumbnail artwork enter the initial view.

-Native Bear series header after: episode overview and visible thumbnail row -
BeforeNative Bear series header before: show overview and empty space before seasons
-

Episode shelf

Real episode Primary artwork, 400×280 px cards and the focused episode's own overview. Cast retains its Level 2 clearance.

-Native Bear episodes after: taller thumbnail cards, focused overview and Cast below -
BeforeNative Bear episodes before: monitor placeholders
-

Person

Six full-width poster columns; no shrinking of the final column.

-Native Person after -
BeforeNative Person before
- diff --git a/data/tv-v2/motion-2026-11-06/SHA256SUMS b/data/tv-v2/motion-2026-11-06/SHA256SUMS deleted file mode 100644 index f1cb8847..00000000 --- a/data/tv-v2/motion-2026-11-06/SHA256SUMS +++ /dev/null @@ -1,47 +0,0 @@ -8cca2384b2ed67b28626a316fb5b9c421c3fe0b48de4438d8c1683f6061db81d build_page.py -924b013c685c8eefe98ba985ec61d45d14a38ddc2c3e4269895ed148cee2e9e5 delta.json -e480b84afed8fbae72df846cc980b309ef3ca9342b89df74eeff8cf031050813 index.html -64ec89bd409e79737e615344ffb19eea2e358c5f61b571b2e8ad989a349cab5c proto.css -bba2e150d5ca24a0a7765cc684a7e39bb5742756e19ff855f1743e3a62950684 proto.js -7cf975a048ca1b9c2f8b2627ee034012c325246d4b6e56048c864f1ced7de09f tv-motion-speed/b1t.webp -c53fd37b2946bf54386883b321925a4d006a5e79d4e07bcb0a02755e0b2f19ec tv-motion-speed/b1.webp -6dd4a715be2361ecaee06b825559fec32432363d302d3b06b1a4d95b1dedf757 tv-motion-speed/b2t.webp -8ec6be1c5d143b5786ed4b811e42585ac92a456cf0e88795f6a2ebcaa734e75d tv-motion-speed/b2.webp -674cb1302d66e930504fcc4dff0f8c9d267c43d5a26f97ace8517dd776100cc9 tv-motion-speed/b3t.webp -261dd7de5e6a204e5b4a0433a9210a3883720be09bab890afbde37d51acf3e06 tv-motion-speed/b3.webp -3a6128506526ce54eb7c9e018880be57a1f2fbe7198f2d0fc47efa9ef82fc700 tv-motion-speed/b4t.webp -71427d171d31b499d406410b51a61a683e5fb1f664e8b483d2a95acd0f69b88c tv-motion-speed/b4.webp -825ef8387d3d035d69dcfdf618b6030dabf560e7bdb4b9f3b473990f3d5eaa48 tv-motion-speed/before-discover-tab.webm -c82bf1e41fa2866ff94369173ffd5af83efe6a6fa8499d0498f6be25682451bf tv-motion-speed/before-home-enter.webm -15d166f0741ae7b5422f466fc8e2001de167deecb81c8b9eff33e9e7ac139ff8 tv-motion-speed/before-launch-fast.webm -bacdbb57858f7f28e7af9f50d70bb3cfeac878f0204ee02b8c94e2abb686a011 tv-motion-speed/before-launch-spinner.webm -d492f500ce464b0a529dce81ed0be09d53c868d554973d61a69097b0a1f6fef5 tv-motion-speed/before-movies-grid.webm -1cfc443f8f67bbdf5acfa1341e2616fd5e0895035c390709b3e11600ea7a37e6 tv-motion-speed/before-person.webm -7d9b7acf81981f2058ef85aaff18aa6f1668dfdceca0991da1480099757baa1a tv-motion-speed/before-title-discover.webm -1a934ff576601de973103145fb00db3059b5bf114b8d36aa49fe2f2a421b324f tv-motion-speed/before-title-movie.webm -6366d9b410b5460eba7348bc9e6356f906fa2b8771931232f9a55ea4e4272c46 tv-motion-speed/before-title-series.webm -65577079db9f4a40e62bd5c676d1c4d51a1ca0c9802e364b314a5b162b9dc90b tv-motion-speed/c1.webp -91a325404fa9e6f925bab3a4370f80065f24efbb314fa75252307cf3c642af1f tv-motion-speed/c2.webp -ff018c6db960483f8a2eb73242b087a41b866e05a5bde3f6f4c76eeb1abec21b tv-motion-speed/c3.webp -75ab6defe098a403999a7a267061346afb29748bd2651791d62eb9ca9cdb1acb tv-motion-speed/c4.webp -b01e96165bc33ff5cf47da086ea966b24d58ef2e995cb16ef4af00375a54efca tv-motion-speed/c5.webp -faa1e271643dc3585c70382988fd609f6522d622887a8595658e96831226837d tv-motion-speed/c6.webp -92c1e9bea498f957e5eda418c9c74698cf693f7e7ca406b8e90cd55357a46499 tv-motion-speed/c7.webp -2a62c58b79b0592ba74498f8b7a0a996cb12b7430d5fe00bf8e8550400c3f619 tv-motion-speed/c8.webp -0366fa40daa0328bca55183b656ffc94dfb7fb1b7433732a2effce093e8e4ab0 tv-motion-speed/e1.webp -9a84c464aa98dba31e1aa0d97665e273305d08fbe33fd579136c8964073f42bb tv-motion-speed/home-before-tab.webp -8903c80b69479a5d8ffc6361628f8117a601fe5b88897f3dcc0a62f9b8a533b7 tv-motion-speed/launcher.webp -1026e09bdbd9a6a7570ebd041c098d04b2bb2e738e7047217dae479efd944120 tv-motion-speed/p10.webp -d862e8a85b49b5128837a58bad4051f460c736702d0ce2befb057ad29448b63e tv-motion-speed/p11.webp -b6f7a0c96949d690124413e7e9df249730d0b5f95cebdb1345e0f91f784577c1 tv-motion-speed/p12.webp -eebb8bec042819923bddedd2abee4841b62c0e1c10f05dc0af4569c98d5a3a54 tv-motion-speed/p1.webp -e5f6079132aa33e0a1741a335cfa00d1a476d7da38a556ac1cbadb0f410df407 tv-motion-speed/p2.webp -af3c62f1acb37a7675594179ae285b3092ca6fd3e40216bbcc442190d87c216f tv-motion-speed/p3.webp -7b303cc200c7f3932b077fcae3908a3c6ec0b75922d2bf048d876177d6c4bf4d tv-motion-speed/p4.webp -8650904e68d4085f1ef1c58a8312ed501bddcca5f5565180861339efa6cf4a92 tv-motion-speed/p5.webp -4c102e76ef046c979f728990cb9ed96a87a67ca570cafd2ead8cc3c3c7fb7900 tv-motion-speed/p6.webp -3a30007a21825461d99732063ce3e9a6dc256cb46937bfd1f29236f95480fb5b tv-motion-speed/p7.webp -9fa546b84609ef91ca43ff943b245eda53ff06715cf75f800d556fd3ba2abb12 tv-motion-speed/p8.webp -6e859f5ce40cfa21702b9458586913affafda1454a295dd6099ebc3b462f7aa4 tv-motion-speed/p9.webp -3ab8a7da1d0c2532933eb1803a3408d23e42cbed5923575deb1db62d7cbbb477 tv-motion-speed/s1t.webp -40fb5827a46bcd9d6c9e2f10190c58e0670e29e0ba908ae28600a2f8cae297cc tv-motion-speed/s1.webp diff --git a/data/tv-v2/motion-2026-11-06/build_page.py b/data/tv-v2/motion-2026-11-06/build_page.py deleted file mode 100755 index 5cb786ca..00000000 --- a/data/tv-v2/motion-2026-11-06/build_page.py +++ /dev/null @@ -1,298 +0,0 @@ -#!/usr/bin/env python3 -"""Build the Wolfskin TV load-states / motion / speed spike page (dark only). - -Inputs : page/proto.css, page/proto.js, page/tv-motion-speed/* (webm clips from the box, fixture art), numbers below - (all from data/tv-spike-motion-speed/raw/ and report.md). -Output : /opt/stacks/pages/store/wolfskin/tv-motion-speed.html + tv-motion-speed/ assets (mode 660). -""" -import os, shutil - -HERE = os.path.dirname(os.path.abspath(__file__)) -STORE = '/opt/stacks/pages/store/wolfskin/' -OUT = STORE + 'tv-motion-speed.html' -ASSETS = STORE + 'tv-motion-speed/' - -CSS = open(os.path.join(HERE, 'proto.css')).read() -JS = open(os.path.join(HERE, 'proto.js')).read() - - -def table(head, rows, cls=''): - h = ''.join(f'{c}' for c in head) - b = ''.join('' + ''.join(f'{c}' for c in r) + '' for r in rows) - return f'
{h}{b}
' - - -def pair(pid, scene, before, after_title, lead, note='', variants=False, before2=None): - vids = ''.join(f'

{lab}

' - for src, lab in ([before] + ([before2] if before2 else []))) - var = f'
' if variants else '' - return f'''
{f'{note}' if note else ''}
-
{vids}

{after_title}

{var}
''' - - -def opt(title, gain, effort, risk, see, where='TV'): - return [title, gain, effort, risk, see, where] - - -OPT_HEAD = ['Option', 'Expected gain (measured basis)', 'Effort', 'Risk', 'What you would see', 'Ships in'] - -page = f'''Wolfskin TV: faster, quieter, smoother
-

Wolfskin TV: faster, quieter, smoother

-

Measured on your Xiaomi box with Wolfskin (Opt) 1.1.0-133 and from tank, on 2026-11-06. This page has the options, the plan, and live prototypes of the loading and motion. Each prototype sits next to a recording of the real app doing the same thing today.

- -
The short version
    -
  • The biggest wait isn't the app. Two of four cold launches showed a spinner for 1.5 s, and the other two showed none. The box looks up jelly.justinvisser.org through AdGuard Private DNS, and an uncached lookup takes 0.45–1.35 s. The address only stays cached for 60 s, so the first launch after a minute's pause pays it, and so does the first title page that fetches TMDB art. A small TV-side DNS cache (or one box setting) removes it.
    • -
  • The second biggest is Conductarr. On a title page, the detail, season and "Ready for you" reads take 1.1 s, 1.1 s and 2.9 s at the median. Each one re-lists the whole Radarr/Sonarr library on every request, with no cache. A title page can't settle until the slowest arrives (3.4 s on a series). This needs a Conductarr release.
    • -
  • Screens are already quick, but they pop. Home, the grids, Discover and Settings settle in 0.2–0.75 s. What makes the wait visible is art and fields arriving in steps, and the layout jumping when a late line lands. That's fixable on the TV alone: fade art in, reserve space for late lines, keep last-known screens, and prefetch.
    • -
  • Frames are slow for two reasons. At the median a frame takes 30–46 ms during moves, where 60 fps needs 16.7 ms. On grid and row scrolls, 30–44 % of frames miss. The GPU alone takes 14–21 ms per frame, so motion here has to be cheap: fades, small rises and scale on one layer. No full-screen blur or shimmer sweeps.
    • -
- -
Prototypes loop. "Replay together" restarts the recording and the prototype in step. Counters are ms after the screen first reacts to the key.
- -

1. Where the time goes today

-

Per screen, from the first frame that reacts to the key until the screen stops changing

-

Method: on-device screenrecord (it only emits frames on change), scene-change detection with ffmpeg, logcat (OkHttp and ActivityManager) and Conductarr's own request log for the same seconds. "Settled" is the last visible change. Raw clips and sheets are in data/tv-spike-motion-speed/.

-{table(['Screen', 'First content', 'Settled', 'What arrives late', 'Repeat visit'], [ - ['Cold start (am start -W TotalTime, 4 runs)', '583 / 538 / 438 / 453 ms to first frame', 'picker at +0.3–0.4 s (DNS warm) or +1.65 s (DNS cold)', 'Spinner while Users/Me then System/Info/Public run one after the other (ServerRepository.kt:104,107)', 'same, bimodal on the 60 s DNS cache'], - ['Who\'s watching → Home', 'hero text 135 ms', '430 ms', 'shelf tiles flat grey until 400 ms, then all images pop', '370 ms'], - ['Home → Discover tab', 'content 270 ms (dims first)', '700 ms', 'posters pop in over 0.4 s', '600 ms'], - ['Movies grid', '230 ms (blank tiles)', '750 ms', 'posters fill row by row', '500 ms'], - ['Shows grid', '280 ms', '640 ms', 'posters', '—'], - ['Title, movie in library (American Gangster)', '430 ms (text)', '2.69 s', 'backdrop 470 ms; cast portraits 2.7 s (initials until then)', '450 ms total'], - ['Title, Discover pick (Donnie Brasco)', '980 ms (blank skeleton until then)', '1.53 s', 'backdrop 1.37 s, cast 1.5 s', '—'], - ['Title, series (Adults)', '620 ms', '3.42 s', 'ratings and "Ready for you · by Mindel" land at 3.4 s and push the overview down', '—'], - ['Person page (Martin Sheen)', '620 ms', '720 ms', 'filmography posters', '—'], - ['Back from title / series / person', '260 / 300 / 450 ms', '', '', ''], - ['Settings', '220 ms', '220 ms', '—', ''], - ['Coming in sheet', '74 ms', '74 ms (from cache)', 'posters refresh silently', ''], -], 'num')} - -

Frame timing per interaction (dumpsys gfxinfo, ART status speed)

-{table(['Interaction', 'Frames', 'Janky', 'p50', 'p90', 'p99', 'Main thread slow / GPU slow'], [ - ['Home rows scroll (down 7, up 6, right 5), run 1 / 2', '149 / 115', '38.9 % / 34.8 %', '44 / 46 ms', '69 / 65', '89 / 101', '43 / 52 · 27 / 35'], - ['Movies grid scroll (down 8, up 8), run 1 / 2', '180 / 159', '43.9 % / 32.1 %', '30 / 30 ms', '53 / 46', '93 / 73', '30 / 69 · 20 / 48'], - ['Discover scroll', '146', '30.1 %', '34 ms', '57', '73', '34 / 35'], - ['Tab switch ×4', '158', '18.4 %', '28 ms', '65', '150', '15 / 29'], - ['Title open + back ×3', '103', '33.0 %', '48 ms', '113', '150', '29 / 34'], - ['Who\'s watching → Home', '15', '53.3 %', '61 ms', '117', '133', '7 / 8'], - ['Open title (movie, first time)', '20', '60.0 %', '57 ms', '150', '200', '9 / 12'], - ['Back from person', '12', '75.0 %', '93 ms', '150', '150', '8 / 9'], -], 'num')} -

Frame phases on the Shows grid (framestats, 68 frames): record p50 0.5 / p90 10.3 ms, GPU issue p50 4.3 / p90 8.9 ms, GPU complete p50 14.3 / p90 21.2 ms, total p50 25.6 / p90 41.4 ms. The app renders at 1920×1080 and the box outputs 3840×2160 at 59.94 Hz. Today's grid is worse than the earlier Opt measurement (17.7 % janky), which was taken before the spacing and focus-ring builds.

- -

Network, from tank (10 runs each; cold = new connection, warm = kept-alive)

-{table(['Call', 'Bytes', 'Cold p50 / p95', 'Warm p50 / p95', 'Cache headers'], [ - ['Jellyfin UserViews (called 4–5× per launch)', '2.3 KB', '65 / 166 ms', '46 / 51 ms', 'none'], - ['Home Resume (20)', '1.4 KB', '58 / 66', '30 / 41', 'none'], - ['Home NextUp (20)', '6.2 KB', '71 / 91', '47 / 52', 'none'], - ['Home Items/{{id}} per series (sequential)', '4.0 KB', '43 / 60', '24 / 28', 'none'], - ['Home library shelf (20)', '18.7 KB', '85 / 116', '74 / 84', 'none'], - ['Movies grid page (200)', '51 KB', '68 / 148', '61 / 64', 'none'], - ['Title episodes with MediaSources + People', '96.8 KB', '142 / 185', '122 / 169', 'none'], - ['Title episodes, lean fields', '6.5 KB', '26 / 65', '11 / 12', 'none'], - ['Grid poster, no size (today, LibraryReadFacade.kt:86)', '626 KB', '26 / 30', '8 / 9', 'max-age 1 y, immutable, ETag'], - ['Grid poster fillWidth 256×384 q96', '31.6 KB', '19 / 131', '2 / 4', 'same'], - ['Grid poster 256×384 q80 WebP', '11.2 KB', '19 / 118', '1 / 2', 'same'], - ['Backdrop 1280 q96 / q80 WebP', '91 / 31 KB', '19 / 25', '2 / 2', 'same'], - ['TMDB poster w780 (today, ConductarrProjection.kt:9)', '131 KB', '128 / 144', '49 / 70', 'max-age 1 y'], - ['TMDB poster w342 / w185', '41 / 15 KB', '100 / 76', '31 / 30', 'max-age 1 y'], -], 'num')} -

Box-side DNS (ping timing, 6 samples 70 s apart): uncached jelly.justinvisser.org 490–1390 ms, wolfskin-tv 460–490 ms, image.tmdb.org 60–1170 ms; cached 40–50 ms. The box uses Private DNS dns.adguard.com. The LAN resolver 192.168.1.2 answers uncached names in 136–160 ms and cached in 0 ms. The A record behind both hosts has a 60 s TTL. Cold launches 1 and 3 were more than 60 s after the previous lookup, and 2 and 4 were within it.

-

Conductarr TV routes, server-side (Conductarr request log, 22 h, 200/304)

-{table(['Route', 'n', 'p50', 'p95', 'Body p50', 'Why'], [ - ['activity/titles/{{tmdb}}/{{type}} (Ready for you)', '45', '2856 ms', '5002 ms', '1.7 KB', 'Re-reads the held title twice, the Seerr requests and a Jellyfin GET per episode; no cache (activity/detail.go:21, request_evidence.go:45, users.go:262). The 5002 ms p95 is most likely the TV giving up: its read timeout is 5 s (ConductarrSession.kt:53), so on the slowest titles the line never appears'], - ['catalogue/titles/{{tmdb}}/{{type}} (detail)', '51', '1198 ms', '3217 ms', '11.9 KB', 'Held-title read lists every Arr library unpaged, then Seerr details, then ratings; sequential (catalogue/detail.go:14-17, library_detail.go:81)'], - ['catalogue/tv/{{tmdb}}/seasons/{{n}}', '76 / 17 (304)', '1084 / 2282 ms', '2664 ms', '1 KB', 'Same held-title read; a 304 still renders and hashes the full body first (read_validators.go)'], - ['…/ratings', '265', '147 ms', '449 ms', '0.5 KB', '6 h server cache, 300 titles'], - ['…/enrichment · …/related · …/cast', '46 · 42 · 26', '103 · 124 · 33 ms', '465 · 261 · 78', '3 · 14 · 12.5 KB', 'enrichment uncached'], - ['recommendations feed', '42', '16 ms', '40 ms', '204 KB, uncompressed', 'no gzip/br on the TV door (Caddyfile.base:316-333, serve.go:140)'], - ['activity (polled every 30 s)', '713 × 304', '52 ms', '83 ms', '62.5 KB when 200', ''], - ['operator · profiles · dismissals · options · display', '', '12–25 ms', '30–93 ms', '', 'cheap; display is called ≈1 400×/day, once per poster'], -], 'num')} -

Every TV request also costs Conductarr an uncached Jellyfin /Users/Me to check the token (clients/jellyfin/token.go:42). Every authenticated response is Cache-Control: no-store (authority.go:32). The TV client revalidates with its own ETag store instead.

- -

Caches the app has today

-{table(['Cache', 'Where', 'Behaviour', 'Observed'], [ - ['Wolfskin image loader (Coil 3)', 'WolfskinImages.kt:46-61', '64 MiB memory, 128 MiB disk, 4 parallel reads, crossfade off', 'repeat visits paint art from memory; first grid visit downloads 626 KB per poster (no size)'], - ['Upstream Wholphin image loader', 'CoilConfig.kt:80-101', 'separate memory + 200 MB disk', 'a second copy of the same art in memory'], - ['Conductarr JSON', 'FileCacheStore, noBackupFilesDir/conductarr', 'saved copy shown first, then revalidated with ETag; no memory layer', 'title re-open: every ON_OPEN route re-fetched (cast 304, detail 875 ms again)'], - ['Home, library, title, person snapshots', 'filesDir/wolfskin-home, -library-cache, -title', 'disk JSON, painted first', 'repeat visits 370–500 ms instead of 430–750'], - ['HTTP cache (OkHttp)', 'none', '—', 'Jellyfin JSON never cached; images rely on Coil only'], - ['DNS', 'system only', '60 s TTL through Private DNS', '1.5 s launch spinner when expired'], -])} - -

2. Load states

-

Today: a spinner on launch, flat grey blocks on Home, the grids and title pages, and a blank title page until Conductarr answers on Discover picks. Images snap in because crossfade is off in both loaders. Nothing shows a "loading" sentence; that rule already holds.

-{table(OPT_HEAD, [ - opt('Picker from the saved people list, verify in the background', 'Removes the 1.5 s spinner on every DNS-cold launch (2 of 4 measured)', 'S', 'Low. A revoked session must still land on the recovery picker', 'The launcher fades straight into Who\'s watching'), - opt('Shaped skeletons that breathe (opacity only, staggered)', 'No speed change; replaces the flat grey and spinner states', 'S', 'Low. One alpha layer per row', 'Card-shaped tiles gently pulsing until the art lands'), - opt('Art fades in (120–160 ms) instead of popping', 'Removes the pop on every first visit', 'XS', 'Low. Keep it off for memory-cache hits so repeat visits stay instant', 'Posters settle instead of flickering in'), - opt('Reserve space for late fields (ratings, Ready for you, genres, overview)', 'No layout jump at 3.4 s on series pages', 'S', 'Low', 'The line fades into a gap that was already there'), - opt('Title page paints what the card already knew', 'First content 430–980 ms → about 60 ms', 'M', 'Medium. Card data must match detail (year, runtime, ratings)', 'Title, year, ratings and Play at once, over a colour wash of the poster'), - opt('Shimmer sweep skeletons', 'None', 'S', 'High on this GPU: a moving gradient over every card, every frame', 'Light sweeps across the tiles. Not recommended'), -])} -

See it: launch

-{pair('p-launch', 'launch', ('before-launch-spinner', 'Today, DNS cold (2 of 4 launches): 1.5 s spinner'), 'After: no spinner, people from the saved list', 180, '', False, ('before-launch-fast', 'Today, DNS warm'))} -

See it: skeleton styles

-

Pick a style. Content lands at 900 ms in each, about the Movies grid's first visit.

-{pair('p-skel', 'skeleton', ('before-movies-grid', 'Today: Movies grid, first visit'), 'Options', 140, '', True)} - -

3. Motion and transitions

-

Today's motion tokens: focus scale 1.08 over 140 ms, ring and caption fades of 140 ms, a nav blob spring, and 160–180 ms row scrolls. There are no screen transitions or hero cross-fades, and reduced motion is defined but nothing reads it (WolfskinTokens.kt:218). At 30–46 ms per frame, a 140 ms tween is drawn in 3–4 frames. Tick box frame rate at the top to see that.

-{table(OPT_HEAD, [ - opt('Staged reveal on screen entry (hero copy rises 16 px, rows rise 24 px, staggered 30–40 ms, 180 ms ease-out)', 'Perceived: art arrives into motion instead of popping. Cost: translate + alpha on one layer per row', 'S', 'Low. Stagger must not delay focus', 'Home and Discover settle like a curtain rather than tiles snapping'), - opt('Hero cross-fade (backdrop 320 ms, copy hands off)', 'Removes the hard cut when the hero changes', 'S', 'Medium. Two 1080p bitmaps for 320 ms; the GPU is already at 14–21 ms/frame, so fade the backdrop only and keep the scrim static', 'The next pick dissolves in'), - opt('Focus: 180 ms ease-out, caption rises 10 px', 'Same frame cost as today; the curve hides dropped frames better', 'XS', 'Low', 'Focus glides rather than ticks'), - opt('Title entry: grid fades 160 ms, page builds from the poster colour', 'Hides the 470 ms backdrop fetch', 'M', 'Medium (see load states)', 'No black gap between grid and title'), - opt('Shared-element poster → title sheet', 'None measurable', 'L', 'High. Compose shared elements across NavHost destinations on this GPU; the movie page has no poster sheet when a backdrop exists', 'The card flies into place. Not recommended now'), - opt('Honour reduced motion (system animator scale 0 or a Wolfskin toggle)', 'Accessibility', 'S', 'Low', 'Fades only, ≤100 ms; the toggle at the top shows it'), -])} -

See it: Who's watching → Home

-{pair('p-home', 'home', ('before-home-enter', 'Today: grey tiles, then art pops at 400 ms'), 'After', 200)} -

See it: tab switch and row reveal (Home → Discover)

-{pair('p-tab', 'tab', ('before-discover-tab', 'Today'), 'After', 150)} -

See it: title page entry

-{pair('p-title', 'title', ('before-title-movie', 'Today: American Gangster, first open (cast at 2.7 s)'), 'After: Apocalypse Now from the same grid', 170, '', False, ('before-title-discover', 'Today: Donnie Brasco from Discover, blank until 980 ms'))} -

See it: a late line on a series page

-{pair('p-series', 'series', ('before-title-series', 'Today: Adults, the readiness line lands at 3.4 s and pushes the text down'), 'After', 150, '', True)} -

See it: focus move

-{pair('p-focus', 'focus', ('before-movies-grid', 'Today, real grid'), 'Focus along a row', 0, 'Tick box frame rate to compare at 25 fps.', True)} -

See it: hero cross-fade

-{pair('p-hero', 'hero', ('before-discover-tab', 'Today (Discover hero)'), 'Hero advances', 0, '', True)} - -

4. Caching

-{table(OPT_HEAD, [ - opt('Persisted DNS answers (OkHttp Dns: serve the last address at once, refresh behind)', 'Removes 0.45–1.35 s on launch and on the first TMDB image after any 60 s pause', 'S', 'Low. Fall back to the system lookup if the cached address fails', 'No spinner on launch; first cast photos in ≈0.6 s instead of 2.7 s [inference: DNS is the cast delay]'), - opt('Warm the connections at process start (Jellyfin, Conductarr door, TMDB) in parallel', 'Overlaps DNS + TLS with the 450 ms first frame', 'XS', 'Low', 'Same as above, smaller'), - opt('Memory layer over the Conductarr disk cache', 'Skips disk read and JSON decode on back and re-open (title re-open settles at 450 ms today; ~250 expected) [inference]', 'S', 'Low', 'Back and re-open feel instant'), - opt('Stale-while-revalidate for ON_OPEN title routes (skip refetch if validated in the last 5 min)', 'Re-opening a title stops costing the server 875–2 900 ms', 'S', 'Low. Requests and readiness may be 5 min old; keep requests on FORCE', 'Nothing visible; less churn'), - opt('Prefetch the focused card\'s title page (detail JSON + backdrop) after 350 ms of dwell', 'Title first content 430 ms → about 60 ms; backdrop already decoded', 'M', 'Medium. Bandwidth: at most one title per dwell; cancel on move', 'Opening a title is instant'), - opt('Pre-decode last-known Home art while Who\'s watching is up', 'Home settles at 430 ms → about 250 ms with no pops', 'S', 'Low. Memory: 6 backdrops ≈ 21 MiB of the 64 MiB', 'Home appears whole'), - opt('One image loader instead of two', 'Frees a second memory cache (Coil default ≈ 25 % of the heap) [inference]', 'M', 'Medium. Upstream screens use their own', 'Fewer re-downloads after big screens'), - opt('OkHttp HTTP cache for Jellyfin JSON', 'Small. Jellyfin sends no cache headers, so only conditional revalidation is possible', 'S', 'Low', 'Nothing visible'), -])} - -

5. Backend retrieval

-{table(OPT_HEAD, [ - opt('Cache the held-title read in Conductarr (Arr library list, queue, history) for 30–60 s, shared across routes', 'Title detail 1.2 s → ≈0.1 s, season 1.1 s → ≈0.1 s, readiness 2.9 s → <1 s [inference from the code path]', 'M', 'Medium. Freshness of "Ready" after an import; invalidate on Arr webhook (already received)', 'Series pages settle in under a second; no late line', 'Conductarr release'), - opt('Readiness: drop the duplicate held-title read and the per-episode Jellyfin GETs', 'The 5 s tail on readiness', 'M', 'Medium', '"Ready for you" appears with the page', 'Conductarr release'), - opt('Compress the TV door (Caddy encode zstd gzip)', 'Feed 204 KB → ~25–35 KB [inference: JSON typically 6–8×], activity 62 KB → ~8 KB', 'XS', 'Low', 'Discover opens a little faster on Wi-Fi', 'Caddy change (server-docs)'), - opt('304 before rendering (keep a per-route version, not a hash of the full body)', 'Season 304 2.3 s → ms', 'M', 'Medium', 'Nothing visible except speed', 'Conductarr release'), - opt('Cache the token check (/Users/Me) for 60 s per token', 'Removes a Jellyfin round trip from every TV request (~10–40 ms each, 6–10 per title page)', 'S', 'Low. Revocation lag 60 s', 'Nothing visible', 'Conductarr release'), - opt('Batch display reads (one call for a row of posters)', '≈1 400 display calls/day → a few dozen', 'M', 'Low', 'Coming in and Discover rows fill together', 'Conductarr release + TV'), - opt('Size the grid posters (fillWidth=256&fillHeight=384&quality=80&format=Webp)', '626 KB → 11 KB per poster (57×); 85 films 53 MB → 1 MB', 'XS', 'Low', 'Movies and Shows fill at once on first visit', 'TV'), - opt('Ask TMDB for w342 posters, not w780', '131 KB → 41 KB per Discover poster', 'XS', 'Low. 342 px for a 256 px card', 'Discover rows fill sooner', 'TV'), - opt('Lean episode fields (drop MediaSources/MediaStreams/People from the list; fetch them on Play)', '96.8 KB → 6.5 KB per season, 142 → 26 ms', 'S', 'Medium. The episode row shows file chips', 'Series pages settle sooner', 'TV'), - opt('Fewer launch calls: UserViews 4–5× and LiveTv/Recordings/Folders 2× per launch', '≈250 ms of serial calls', 'S', 'Low', 'Nothing visible', 'TV'), -])} - -

6. Kotlin and Compose

-{table(OPT_HEAD, [ - opt('Library load re-emits the full list per 200-item page and re-sorts each time (LibraryReadFacade.kt:96, LibraryGridState.kt:99)', 'Grid first visit; matters more as the library grows', 'S', 'Low', 'Grid appears in one step', 'TV'), - opt('Hoist the Regex in titleFallbackBackground / titleAmbientBackground (TitleArtwork.kt:152,167)', 'Draw-time cost per card', 'XS', 'Low', '—', 'TV'), - opt('Discover reads firstVisibleItemIndex in composition (DiscoverScreen.kt:107) → derivedStateOf', 'Fewer recompositions while scrolling Discover (34 of 44 janky frames were UI-thread)', 'XS', 'Low', 'Smoother Discover scroll', 'TV'), - opt('NavBar label colour read in composition (NavBar.kt:86) → draw-phase', 'Tab switch frames', 'XS', 'Low', '—', 'TV'), - opt('WolfskinImages.loader() is @Synchronized and called in composition', 'Lock on every poster recomposition', 'XS', 'Low', '—', 'TV'), - opt('Cut full-screen layers: hero blur (RenderEffect) + two full-screen gradient scrims + ambient', 'GPU 14–21 ms/frame is the floor today; pre-blurred tiny art and one combined scrim drawn once', 'M', 'Medium. Must match the approved frames', 'Smoother scroll on Home and Discover', 'TV'), - opt('Keys and contentType', 'Already done everywhere', '—', '—', '—', ''), -])} - -

7. Baseline profile

-

Today: a hand seed of 6 lines (app/src/optimized/baselineProfiles/baseline-prof.txt), no generator and no Macrobenchmark. The box is at speed only because it was forced with cmd package compile. Every new install starts at verify (interpreted/JIT) until background dexopt runs.

-{table(['State (same box, earlier tv-perf run)', 'Cold start', 'Home scroll janky / p50 / p90', 'Movies grid'], [ - ['Opt just installed (verify)', '0.5–1.0 s', '51.4 % / 65 / 117 ms', '—'], - ['Opt after forced AOT (speed)', '0.39–0.44 s', '29.2 % / 38 / 61 ms', '17.7 % / 19 / 36 ms'], -], 'num')} -

Expected from a recorded profile (Baseline Profile Gradle plugin plus one UiAutomator journey through picker, Home, Discover, the grids, a title and a person page): a fresh install behaves like the AOT row from the first launch. That is roughly −40 % janky frames on Home scroll and up to half a second off cold start, for every build the second mate installs. It does not change steady state on a box already at speed. Effort M: the journey can run on an emulator in the build container; the box itself isn't needed. Risk low.

- -

8. Recommended plan

-
    -
  1. DNS and launch (TV, S, ~1 day). Persisted DNS answers plus parallel connection warm-up at process start. Show the picker from saved people and check the session in the background. Prove it: 6 cold launches spaced >60 s apart, picker at ≤0.5 s every time (today 1.65 s in half); first cast photos on a new title ≤1 s.
    2. -
  2. Image sizes (TV, XS, hours). Sized WebP grid posters, TMDB w342, lean episode fields. Prove it: first Movies visit settles ≤400 ms (today 750); tank payload table.
    3. -
  3. Load states and motion (TV, M, 2–3 days, against your pick on this page). Breathing shaped skeletons, art fade-in for network loads only, reserved late-line slots, staged reveal, hero cross-fade, reduced motion. Prove it: recordings like the ones above, no layout change after first content, gfxinfo janky no worse than today.
    4. -
  4. Prefetch and memory cache (TV, M, 2 days). Dwell prefetch of title pages, a memory layer over the Conductarr cache, pre-decoded Home art behind the picker. Prove it: title first content ≤100 ms and Home settled ≤250 ms.
    5. -
  5. Conductarr release (M–L, 2–4 days): held-title cache with webhook invalidation, readiness without duplicate reads or per-episode GETs, 304 before render, token-check cache. Caddy: compress the TV door. Prove it: the route table above for 24 h, with detail, season and readiness p50 ≤200 ms and p95 ≤600 ms, and the feed on the wire ≤40 KB.
    6. -
  6. Baseline profile (TV build, M, 1–2 days). Recorded journey profile. Prove it: fresh install without a forced compile, Home scroll janky ≤30 %, cold start ≤0.5 s.
    7. -
  7. Frame cost (TV, M, 2–3 days). The Compose fixes in section 6 and fewer full-screen layers. Prove it: Home and grid scroll janky ≤20 %, GPU p90 ≤16 ms in framestats.
    8. -
-

Total: about 2 weeks of TV work and 3–4 days for a Conductarr release. Steps 1–2 alone remove the two waits you can feel today (the launch spinner and grids filling slowly), in about a day and a half.

-

A box-side alternative to step 1's DNS part: switch the box's Private DNS from dns.adguard.com to Automatic, so it uses the LAN resolver (136–160 ms uncached, 0 ms cached). That changes the whole box, not just Wolfskin, so it's your call; the TV-side fix works either way.

-

9. Your picks (all of them on one page)

-

Six decisions. Each locks the moment you send it and the build lanes start on it. Nothing here touches the TV while you are playing.

-

1. Load-state and motion direction

-

Decides plan step 3 (skeletons and motion). The prototypes above show each part.

- - - - -

-

2. The two quick speed fixes (about a day and a half, TV only)

-

(a) DNS cache with stale-serve plus a picker painted from saved people, so the launch spinner goes away; (b) sized WebP grid posters, smaller TMDB art, lean episode fields, so grids fill fast. Both ship in the next TV build.

- - - - -

-

3. Change the box Private DNS (your call, system setting)

-

Today the box uses dns.adguard.com: an uncached lookup costs 450 to 1350 ms. Automatic uses the LAN resolver (136 to 160 ms uncached, 0 ms cached). It changes DNS for the whole box, not just Wolfskin. I do it with ADB only when the TV is free and you say so; the TV-side fix in 2(a) works either way.

- - - -

-

4. Later plan steps to queue (TV, after the build above)

-

Prefetch and memory cache (title pages, 2 days); recorded Baseline Profile (1 to 2 days); frame cost and Compose fixes (2 to 3 days). Each has its own proof target in section 8.

- - - -

-

5. Conductarr title-read speed-up (needs a Conductarr release)

-

Held-title cache with Arr webhook invalidation, readiness without duplicate reads or per-episode calls, 304 before render, token-check cache, compression on the TV door. 3 to 4 days, plus a release and a server-docs update. Title pages are slow because of this (readiness p50 2.9 s).

- - - -

-

6. When should these land on the TV?

-

You said you will not be using the TV during this session.

- - -

-

Method, raw numbers and files: data/tv-spike-motion-speed/report.md. Nothing was changed in the app or on the server. The box was left on the Movies tab.

-
''' - -os.makedirs(ASSETS, exist_ok=True) -src = os.path.join(HERE, 'tv-motion-speed') -for f in os.listdir(src): - shutil.copyfile(os.path.join(src, f), ASSETS + f) - os.chmod(ASSETS + f, 0o660) -with open(OUT, 'w') as fh: - fh.write(page) -os.chmod(OUT, 0o660) -print(OUT, len(page)) diff --git a/data/tv-v2/motion-2026-11-06/delta.json b/data/tv-v2/motion-2026-11-06/delta.json deleted file mode 100644 index ba6f4faa..00000000 --- a/data/tv-v2/motion-2026-11-06/delta.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "specRevision": 6, - "direction": "A — As recommended", - "approvedReference": "https://pages.justinvisser.org/wolfskin/tv-motion-speed.html", - "frozenInputs": ["index.html", "proto.css", "proto.js", "build_page.py", "tv-motion-speed/"], - "checksums": "SHA256SUMS", - "stagePx": [1920, 1080], - "density": 2, - "skeleton": { - "fill": "#1b1b25", - "alpha": [0.55, 1, 0.55], - "cycleMs": 1400, - "halfCycleEasing": [0.42, 0, 0.58, 1], - "layerScope": "one layer per shelf or bounded header block; no per-card stagger", - "shimmer": false, - "focusable": false - }, - "art": { - "networkRevealMs": 160, - "memoryDiskLocalRevealMs": 0, - "loaders": ["WolfskinImages", "upstream CoilConfig"], - "requestUrlChanges": false - }, - "hero": { - "backdropFadeMs": 320, - "backdropEasing": [0.65, 0, 0.35, 1], - "homeBlendBoundsPx": [1920, 820], - "discoverBlendBoundsPx": [1920, 740], - "holdPreviousUntilIncomingArtOrFallback": true, - "copyOutMs": 120, - "copyEntryAtMs": 140, - "copyInMs": 200, - "copyRisePx": 14 - }, - "focus": { - "durationMs": 180, - "easing": [0.33, 1, 0.68, 1], - "captionDelayMs": 60, - "captionRisePx": 10, - "captionOutMs": 100, - "geometry": "unchanged" - }, - "rowEntry": {"durationMs": 180, "risePx": 24, "scope": "one row, never full screen"}, - "lateSeriesReadiness": {"reservedHeightPx": 56, "fadeMs": 200, "translationPx": 0}, - "reducedMotion": { - "sources": ["Compose window MotionDurationScale == 0", "LocalReducedMotion host flag"], - "maximumFadeMs": 80, - "pulse": false, - "translation": false, - "scrollAnimation": false - }, - "nativeFrames": "https://pages.justinvisser.org/wolfskin/tv-motion-build/", - "onDeviceAcceptance": {"homeJankyPercentMaximum": 39.6, "homeP90MsMaximum": 65, "lateSeriesLayoutShiftPx": 0}, - "deviceAccess": "not performed by this worker", - "specification": "../../tv-spec/spec.md" -} diff --git a/data/tv-v2/motion-2026-11-06/index.html b/data/tv-v2/motion-2026-11-06/index.html deleted file mode 100644 index b390e5a0..00000000 --- a/data/tv-v2/motion-2026-11-06/index.html +++ /dev/null @@ -1,483 +0,0 @@ -Wolfskin TV: faster, quieter, smoother
-

Wolfskin TV: faster, quieter, smoother

-

Measured on your Xiaomi box with Wolfskin (Opt) 1.1.0-133 and from tank, on 2026-11-06. This page has the options, the plan, and live prototypes of the loading and motion. Each prototype sits next to a recording of the real app doing the same thing today.

- -
The short version
    -
  • The biggest wait isn't the app. Two of four cold launches showed a spinner for 1.5 s, and the other two showed none. The box looks up jelly.justinvisser.org through AdGuard Private DNS, and an uncached lookup takes 0.45–1.35 s. The address only stays cached for 60 s, so the first launch after a minute's pause pays it, and so does the first title page that fetches TMDB art. A small TV-side DNS cache (or one box setting) removes it.
    • -
  • The second biggest is Conductarr. On a title page, the detail, season and "Ready for you" reads take 1.1 s, 1.1 s and 2.9 s at the median. Each one re-lists the whole Radarr/Sonarr library on every request, with no cache. A title page can't settle until the slowest arrives (3.4 s on a series). This needs a Conductarr release.
    • -
  • Screens are already quick, but they pop. Home, the grids, Discover and Settings settle in 0.2–0.75 s. What makes the wait visible is art and fields arriving in steps, and the layout jumping when a late line lands. That's fixable on the TV alone: fade art in, reserve space for late lines, keep last-known screens, and prefetch.
    • -
  • Frames are slow for two reasons. At the median a frame takes 30–46 ms during moves, where 60 fps needs 16.7 ms. On grid and row scrolls, 30–44 % of frames miss. The GPU alone takes 14–21 ms per frame, so motion here has to be cheap: fades, small rises and scale on one layer. No full-screen blur or shimmer sweeps.
    • -
- -
Prototypes loop. "Replay together" restarts the recording and the prototype in step. Counters are ms after the screen first reacts to the key.
- -

1. Where the time goes today

-

Per screen, from the first frame that reacts to the key until the screen stops changing

-

Method: on-device screenrecord (it only emits frames on change), scene-change detection with ffmpeg, logcat (OkHttp and ActivityManager) and Conductarr's own request log for the same seconds. "Settled" is the last visible change. Raw clips and sheets are in data/tv-spike-motion-speed/.

-
ScreenFirst contentSettledWhat arrives lateRepeat visit
Cold start (am start -W TotalTime, 4 runs)583 / 538 / 438 / 453 ms to first framepicker at +0.3–0.4 s (DNS warm) or +1.65 s (DNS cold)Spinner while Users/Me then System/Info/Public run one after the other (ServerRepository.kt:104,107)same, bimodal on the 60 s DNS cache
Who's watching → Homehero text 135 ms430 msshelf tiles flat grey until 400 ms, then all images pop370 ms
Home → Discover tabcontent 270 ms (dims first)700 msposters pop in over 0.4 s600 ms
Movies grid230 ms (blank tiles)750 msposters fill row by row500 ms
Shows grid280 ms640 msposters—
Title, movie in library (American Gangster)430 ms (text)2.69 sbackdrop 470 ms; cast portraits 2.7 s (initials until then)450 ms total
Title, Discover pick (Donnie Brasco)980 ms (blank skeleton until then)1.53 sbackdrop 1.37 s, cast 1.5 s—
Title, series (Adults)620 ms3.42 sratings and "Ready for you · by Mindel" land at 3.4 s and push the overview down—
Person page (Martin Sheen)620 ms720 msfilmography posters—
Back from title / series / person260 / 300 / 450 ms
Settings220 ms220 ms—
Coming in sheet74 ms74 ms (from cache)posters refresh silently
- -

Frame timing per interaction (dumpsys gfxinfo, ART status speed)

-
InteractionFramesJankyp50p90p99Main thread slow / GPU slow
Home rows scroll (down 7, up 6, right 5), run 1 / 2149 / 11538.9 % / 34.8 %44 / 46 ms69 / 6589 / 10143 / 52 · 27 / 35
Movies grid scroll (down 8, up 8), run 1 / 2180 / 15943.9 % / 32.1 %30 / 30 ms53 / 4693 / 7330 / 69 · 20 / 48
Discover scroll14630.1 %34 ms577334 / 35
Tab switch ×415818.4 %28 ms6515015 / 29
Title open + back ×310333.0 %48 ms11315029 / 34
Who's watching → Home1553.3 %61 ms1171337 / 8
Open title (movie, first time)2060.0 %57 ms1502009 / 12
Back from person1275.0 %93 ms1501508 / 9
-

Frame phases on the Shows grid (framestats, 68 frames): record p50 0.5 / p90 10.3 ms, GPU issue p50 4.3 / p90 8.9 ms, GPU complete p50 14.3 / p90 21.2 ms, total p50 25.6 / p90 41.4 ms. The app renders at 1920×1080 and the box outputs 3840×2160 at 59.94 Hz. Today's grid is worse than the earlier Opt measurement (17.7 % janky), which was taken before the spacing and focus-ring builds.

- -

Network, from tank (10 runs each; cold = new connection, warm = kept-alive)

-
CallBytesCold p50 / p95Warm p50 / p95Cache headers
Jellyfin UserViews (called 4–5× per launch)2.3 KB65 / 166 ms46 / 51 msnone
Home Resume (20)1.4 KB58 / 6630 / 41none
Home NextUp (20)6.2 KB71 / 9147 / 52none
Home Items/{{id}} per series (sequential)4.0 KB43 / 6024 / 28none
Home library shelf (20)18.7 KB85 / 11674 / 84none
Movies grid page (200)51 KB68 / 14861 / 64none
Title episodes with MediaSources + People96.8 KB142 / 185122 / 169none
Title episodes, lean fields6.5 KB26 / 6511 / 12none
Grid poster, no size (today, LibraryReadFacade.kt:86)626 KB26 / 308 / 9max-age 1 y, immutable, ETag
Grid poster fillWidth 256×384 q9631.6 KB19 / 1312 / 4same
Grid poster 256×384 q80 WebP11.2 KB19 / 1181 / 2same
Backdrop 1280 q96 / q80 WebP91 / 31 KB19 / 252 / 2same
TMDB poster w780 (today, ConductarrProjection.kt:9)131 KB128 / 14449 / 70max-age 1 y
TMDB poster w342 / w18541 / 15 KB100 / 7631 / 30max-age 1 y
-

Box-side DNS (ping timing, 6 samples 70 s apart): uncached jelly.justinvisser.org 490–1390 ms, wolfskin-tv 460–490 ms, image.tmdb.org 60–1170 ms; cached 40–50 ms. The box uses Private DNS dns.adguard.com. The LAN resolver 192.168.1.2 answers uncached names in 136–160 ms and cached in 0 ms. The A record behind both hosts has a 60 s TTL. Cold launches 1 and 3 were more than 60 s after the previous lookup, and 2 and 4 were within it.

-

Conductarr TV routes, server-side (Conductarr request log, 22 h, 200/304)

-
Routenp50p95Body p50Why
activity/titles/{{tmdb}}/{{type}} (Ready for you)452856 ms5002 ms1.7 KBRe-reads the held title twice, the Seerr requests and a Jellyfin GET per episode; no cache (activity/detail.go:21, request_evidence.go:45, users.go:262). The 5002 ms p95 is most likely the TV giving up: its read timeout is 5 s (ConductarrSession.kt:53), so on the slowest titles the line never appears
catalogue/titles/{{tmdb}}/{{type}} (detail)511198 ms3217 ms11.9 KBHeld-title read lists every Arr library unpaged, then Seerr details, then ratings; sequential (catalogue/detail.go:14-17, library_detail.go:81)
catalogue/tv/{{tmdb}}/seasons/{{n}}76 / 17 (304)1084 / 2282 ms2664 ms1 KBSame held-title read; a 304 still renders and hashes the full body first (read_validators.go)
…/ratings265147 ms449 ms0.5 KB6 h server cache, 300 titles
…/enrichment · …/related · …/cast46 · 42 · 26103 · 124 · 33 ms465 · 261 · 783 · 14 · 12.5 KBenrichment uncached
recommendations feed4216 ms40 ms204 KB, uncompressedno gzip/br on the TV door (Caddyfile.base:316-333, serve.go:140)
activity (polled every 30 s)713 × 30452 ms83 ms62.5 KB when 200
operator · profiles · dismissals · options · display12–25 ms30–93 mscheap; display is called ≈1 400×/day, once per poster
-

Every TV request also costs Conductarr an uncached Jellyfin /Users/Me to check the token (clients/jellyfin/token.go:42). Every authenticated response is Cache-Control: no-store (authority.go:32). The TV client revalidates with its own ETag store instead.

- -

Caches the app has today

-
CacheWhereBehaviourObserved
Wolfskin image loader (Coil 3)WolfskinImages.kt:46-6164 MiB memory, 128 MiB disk, 4 parallel reads, crossfade offrepeat visits paint art from memory; first grid visit downloads 626 KB per poster (no size)
Upstream Wholphin image loaderCoilConfig.kt:80-101separate memory + 200 MB diska second copy of the same art in memory
Conductarr JSONFileCacheStore, noBackupFilesDir/conductarrsaved copy shown first, then revalidated with ETag; no memory layertitle re-open: every ON_OPEN route re-fetched (cast 304, detail 875 ms again)
Home, library, title, person snapshotsfilesDir/wolfskin-home, -library-cache, -titledisk JSON, painted firstrepeat visits 370–500 ms instead of 430–750
HTTP cache (OkHttp)none—Jellyfin JSON never cached; images rely on Coil only
DNSsystem only60 s TTL through Private DNS1.5 s launch spinner when expired
- -

2. Load states

-

Today: a spinner on launch, flat grey blocks on Home, the grids and title pages, and a blank title page until Conductarr answers on Discover picks. Images snap in because crossfade is off in both loaders. Nothing shows a "loading" sentence; that rule already holds.

-
OptionExpected gain (measured basis)EffortRiskWhat you would seeShips in
Picker from the saved people list, verify in the backgroundRemoves the 1.5 s spinner on every DNS-cold launch (2 of 4 measured)SLow. A revoked session must still land on the recovery pickerThe launcher fades straight into Who's watchingTV
Shaped skeletons that breathe (opacity only, staggered)No speed change; replaces the flat grey and spinner statesSLow. One alpha layer per rowCard-shaped tiles gently pulsing until the art landsTV
Art fades in (120–160 ms) instead of poppingRemoves the pop on every first visitXSLow. Keep it off for memory-cache hits so repeat visits stay instantPosters settle instead of flickering inTV
Reserve space for late fields (ratings, Ready for you, genres, overview)No layout jump at 3.4 s on series pagesSLowThe line fades into a gap that was already thereTV
Title page paints what the card already knewFirst content 430–980 ms → about 60 msMMedium. Card data must match detail (year, runtime, ratings)Title, year, ratings and Play at once, over a colour wash of the posterTV
Shimmer sweep skeletonsNoneSHigh on this GPU: a moving gradient over every card, every frameLight sweeps across the tiles. Not recommendedTV
-

See it: launch

-
-

Today, DNS cold (2 of 4 launches): 1.5 s spinner

Today, DNS warm

After: no spinner, people from the saved list

-

See it: skeleton styles

-

Pick a style. Content lands at 900 ms in each, about the Movies grid's first visit.

-
-

Today: Movies grid, first visit

Options

- -

3. Motion and transitions

-

Today's motion tokens: focus scale 1.08 over 140 ms, ring and caption fades of 140 ms, a nav blob spring, and 160–180 ms row scrolls. There are no screen transitions or hero cross-fades, and reduced motion is defined but nothing reads it (WolfskinTokens.kt:218). At 30–46 ms per frame, a 140 ms tween is drawn in 3–4 frames. Tick box frame rate at the top to see that.

-
OptionExpected gain (measured basis)EffortRiskWhat you would seeShips in
Staged reveal on screen entry (hero copy rises 16 px, rows rise 24 px, staggered 30–40 ms, 180 ms ease-out)Perceived: art arrives into motion instead of popping. Cost: translate + alpha on one layer per rowSLow. Stagger must not delay focusHome and Discover settle like a curtain rather than tiles snappingTV
Hero cross-fade (backdrop 320 ms, copy hands off)Removes the hard cut when the hero changesSMedium. Two 1080p bitmaps for 320 ms; the GPU is already at 14–21 ms/frame, so fade the backdrop only and keep the scrim staticThe next pick dissolves inTV
Focus: 180 ms ease-out, caption rises 10 pxSame frame cost as today; the curve hides dropped frames betterXSLowFocus glides rather than ticksTV
Title entry: grid fades 160 ms, page builds from the poster colourHides the 470 ms backdrop fetchMMedium (see load states)No black gap between grid and titleTV
Shared-element poster → title sheetNone measurableLHigh. Compose shared elements across NavHost destinations on this GPU; the movie page has no poster sheet when a backdrop existsThe card flies into place. Not recommended nowTV
Honour reduced motion (system animator scale 0 or a Wolfskin toggle)AccessibilitySLowFades only, ≤100 ms; the toggle at the top shows itTV
-

See it: Who's watching → Home

-
-

Today: grey tiles, then art pops at 400 ms

After

-

See it: tab switch and row reveal (Home → Discover)

-
-

Today

After

-

See it: title page entry

-
-

Today: American Gangster, first open (cast at 2.7 s)

Today: Donnie Brasco from Discover, blank until 980 ms

After: Apocalypse Now from the same grid

-

See it: a late line on a series page

-
-

Today: Adults, the readiness line lands at 3.4 s and pushes the text down

After

-

See it: focus move

-
Tick box frame rate to compare at 25 fps.
-

Today, real grid

Focus along a row

-

See it: hero cross-fade

-
-

Today (Discover hero)

Hero advances

- -

4. Caching

-
OptionExpected gain (measured basis)EffortRiskWhat you would seeShips in
Persisted DNS answers (OkHttp Dns: serve the last address at once, refresh behind)Removes 0.45–1.35 s on launch and on the first TMDB image after any 60 s pauseSLow. Fall back to the system lookup if the cached address failsNo spinner on launch; first cast photos in ≈0.6 s instead of 2.7 s [inference: DNS is the cast delay]TV
Warm the connections at process start (Jellyfin, Conductarr door, TMDB) in parallelOverlaps DNS + TLS with the 450 ms first frameXSLowSame as above, smallerTV
Memory layer over the Conductarr disk cacheSkips disk read and JSON decode on back and re-open (title re-open settles at 450 ms today; ~250 expected) [inference]SLowBack and re-open feel instantTV
Stale-while-revalidate for ON_OPEN title routes (skip refetch if validated in the last 5 min)Re-opening a title stops costing the server 875–2 900 msSLow. Requests and readiness may be 5 min old; keep requests on FORCENothing visible; less churnTV
Prefetch the focused card's title page (detail JSON + backdrop) after 350 ms of dwellTitle first content 430 ms → about 60 ms; backdrop already decodedMMedium. Bandwidth: at most one title per dwell; cancel on moveOpening a title is instantTV
Pre-decode last-known Home art while Who's watching is upHome settles at 430 ms → about 250 ms with no popsSLow. Memory: 6 backdrops ≈ 21 MiB of the 64 MiBHome appears wholeTV
One image loader instead of twoFrees a second memory cache (Coil default ≈ 25 % of the heap) [inference]MMedium. Upstream screens use their ownFewer re-downloads after big screensTV
OkHttp HTTP cache for Jellyfin JSONSmall. Jellyfin sends no cache headers, so only conditional revalidation is possibleSLowNothing visibleTV
- -

5. Backend retrieval

-
OptionExpected gain (measured basis)EffortRiskWhat you would seeShips in
Cache the held-title read in Conductarr (Arr library list, queue, history) for 30–60 s, shared across routesTitle detail 1.2 s → ≈0.1 s, season 1.1 s → ≈0.1 s, readiness 2.9 s → <1 s [inference from the code path]MMedium. Freshness of "Ready" after an import; invalidate on Arr webhook (already received)Series pages settle in under a second; no late lineConductarr release
Readiness: drop the duplicate held-title read and the per-episode Jellyfin GETsThe 5 s tail on readinessMMedium"Ready for you" appears with the pageConductarr release
Compress the TV door (Caddy encode zstd gzip)Feed 204 KB → ~25–35 KB [inference: JSON typically 6–8×], activity 62 KB → ~8 KBXSLowDiscover opens a little faster on Wi-FiCaddy change (server-docs)
304 before rendering (keep a per-route version, not a hash of the full body)Season 304 2.3 s → msMMediumNothing visible except speedConductarr release
Cache the token check (/Users/Me) for 60 s per tokenRemoves a Jellyfin round trip from every TV request (~10–40 ms each, 6–10 per title page)SLow. Revocation lag 60 sNothing visibleConductarr release
Batch display reads (one call for a row of posters)≈1 400 display calls/day → a few dozenMLowComing in and Discover rows fill togetherConductarr release + TV
Size the grid posters (fillWidth=256&fillHeight=384&quality=80&format=Webp)626 KB → 11 KB per poster (57×); 85 films 53 MB → 1 MBXSLowMovies and Shows fill at once on first visitTV
Ask TMDB for w342 posters, not w780131 KB → 41 KB per Discover posterXSLow. 342 px for a 256 px cardDiscover rows fill soonerTV
Lean episode fields (drop MediaSources/MediaStreams/People from the list; fetch them on Play)96.8 KB → 6.5 KB per season, 142 → 26 msSMedium. The episode row shows file chipsSeries pages settle soonerTV
Fewer launch calls: UserViews 4–5× and LiveTv/Recordings/Folders 2× per launch≈250 ms of serial callsSLowNothing visibleTV
- -

6. Kotlin and Compose

-
OptionExpected gain (measured basis)EffortRiskWhat you would seeShips in
Library load re-emits the full list per 200-item page and re-sorts each time (LibraryReadFacade.kt:96, LibraryGridState.kt:99)Grid first visit; matters more as the library growsSLowGrid appears in one stepTV
Hoist the Regex in titleFallbackBackground / titleAmbientBackground (TitleArtwork.kt:152,167)Draw-time cost per cardXSLow—TV
Discover reads firstVisibleItemIndex in composition (DiscoverScreen.kt:107) → derivedStateOfFewer recompositions while scrolling Discover (34 of 44 janky frames were UI-thread)XSLowSmoother Discover scrollTV
NavBar label colour read in composition (NavBar.kt:86) → draw-phaseTab switch framesXSLow—TV
WolfskinImages.loader() is @Synchronized and called in compositionLock on every poster recompositionXSLow—TV
Cut full-screen layers: hero blur (RenderEffect) + two full-screen gradient scrims + ambientGPU 14–21 ms/frame is the floor today; pre-blurred tiny art and one combined scrim drawn onceMMedium. Must match the approved framesSmoother scroll on Home and DiscoverTV
Keys and contentTypeAlready done everywhere———
- -

7. Baseline profile

-

Today: a hand seed of 6 lines (app/src/optimized/baselineProfiles/baseline-prof.txt), no generator and no Macrobenchmark. The box is at speed only because it was forced with cmd package compile. Every new install starts at verify (interpreted/JIT) until background dexopt runs.

-
State (same box, earlier tv-perf run)Cold startHome scroll janky / p50 / p90Movies grid
Opt just installed (verify)0.5–1.0 s51.4 % / 65 / 117 ms—
Opt after forced AOT (speed)0.39–0.44 s29.2 % / 38 / 61 ms17.7 % / 19 / 36 ms
-

Expected from a recorded profile (Baseline Profile Gradle plugin plus one UiAutomator journey through picker, Home, Discover, the grids, a title and a person page): a fresh install behaves like the AOT row from the first launch. That is roughly −40 % janky frames on Home scroll and up to half a second off cold start, for every build the second mate installs. It does not change steady state on a box already at speed. Effort M: the journey can run on an emulator in the build container; the box itself isn't needed. Risk low.

- -

8. Recommended plan

-
    -
  1. DNS and launch (TV, S, ~1 day). Persisted DNS answers plus parallel connection warm-up at process start. Show the picker from saved people and check the session in the background. Prove it: 6 cold launches spaced >60 s apart, picker at ≤0.5 s every time (today 1.65 s in half); first cast photos on a new title ≤1 s.
    2. -
  2. Image sizes (TV, XS, hours). Sized WebP grid posters, TMDB w342, lean episode fields. Prove it: first Movies visit settles ≤400 ms (today 750); tank payload table.
    3. -
  3. Load states and motion (TV, M, 2–3 days, against your pick on this page). Breathing shaped skeletons, art fade-in for network loads only, reserved late-line slots, staged reveal, hero cross-fade, reduced motion. Prove it: recordings like the ones above, no layout change after first content, gfxinfo janky no worse than today.
    4. -
  4. Prefetch and memory cache (TV, M, 2 days). Dwell prefetch of title pages, a memory layer over the Conductarr cache, pre-decoded Home art behind the picker. Prove it: title first content ≤100 ms and Home settled ≤250 ms.
    5. -
  5. Conductarr release (M–L, 2–4 days): held-title cache with webhook invalidation, readiness without duplicate reads or per-episode GETs, 304 before render, token-check cache. Caddy: compress the TV door. Prove it: the route table above for 24 h, with detail, season and readiness p50 ≤200 ms and p95 ≤600 ms, and the feed on the wire ≤40 KB.
    6. -
  6. Baseline profile (TV build, M, 1–2 days). Recorded journey profile. Prove it: fresh install without a forced compile, Home scroll janky ≤30 %, cold start ≤0.5 s.
    7. -
  7. Frame cost (TV, M, 2–3 days). The Compose fixes in section 6 and fewer full-screen layers. Prove it: Home and grid scroll janky ≤20 %, GPU p90 ≤16 ms in framestats.
    8. -
-

Total: about 2 weeks of TV work and 3–4 days for a Conductarr release. Steps 1–2 alone remove the two waits you can feel today (the launch spinner and grids filling slowly), in about a day and a half.

-

A box-side alternative to step 1's DNS part: switch the box's Private DNS from dns.adguard.com to Automatic, so it uses the LAN resolver (136–160 ms uncached, 0 ms cached). That changes the whole box, not just Wolfskin, so it's your call; the TV-side fix works either way.

-

9. Your picks (all of them on one page)

-

Six decisions. Each locks the moment you send it and the build lanes start on it. Nothing here touches the TV while you are playing.

-

1. Load-state and motion direction

-

Decides plan step 3 (skeletons and motion). The prototypes above show each part.

- - - - -

-

2. The two quick speed fixes (about a day and a half, TV only)

-

(a) DNS cache with stale-serve plus a picker painted from saved people, so the launch spinner goes away; (b) sized WebP grid posters, smaller TMDB art, lean episode fields, so grids fill fast. Both ship in the next TV build.

- - - - -

-

3. Change the box Private DNS (your call, system setting)

-

Today the box uses dns.adguard.com: an uncached lookup costs 450 to 1350 ms. Automatic uses the LAN resolver (136 to 160 ms uncached, 0 ms cached). It changes DNS for the whole box, not just Wolfskin. I do it with ADB only when the TV is free and you say so; the TV-side fix in 2(a) works either way.

- - - -

-

4. Later plan steps to queue (TV, after the build above)

-

Prefetch and memory cache (title pages, 2 days); recorded Baseline Profile (1 to 2 days); frame cost and Compose fixes (2 to 3 days). Each has its own proof target in section 8.

- - - -

-

5. Conductarr title-read speed-up (needs a Conductarr release)

-

Held-title cache with Arr webhook invalidation, readiness without duplicate reads or per-episode calls, 304 before render, token-check cache, compression on the TV door. 3 to 4 days, plus a release and a server-docs update. Title pages are slow because of this (readiness p50 2.9 s).

- - - -

-

6. When should these land on the TV?

-

You said you will not be using the TV during this session.

- - -

-

Method, raw numbers and files: data/tv-spike-motion-speed/report.md. Nothing was changed in the app or on the server. The box was left on the Movies tab.

-
\ No newline at end of file diff --git a/data/tv-v2/motion-2026-11-06/proto.css b/data/tv-v2/motion-2026-11-06/proto.css deleted file mode 100644 index 4f4fd155..00000000 --- a/data/tv-v2/motion-2026-11-06/proto.css +++ /dev/null @@ -1,72 +0,0 @@ -/* Prototype stages: 1920x1080 CSS px, approved tokens from data/tv-v2/focus-2026-11-06 (colors, type, ring, card sizes at Level 2 spacing). */ -.sbox{position:relative;width:100%;aspect-ratio:16/9;overflow:hidden;border-radius:8px;border:1px solid var(--line);background:#000} -.sbox video{position:absolute;inset:0;width:100%;height:100%;object-fit:cover;display:block} -.stage{position:absolute;left:0;top:0;width:1920px;height:1080px;transform-origin:0 0;overflow:hidden;background:#07070a;font-family:system-ui,-apple-system,"Segoe UI",Roboto,"Noto Sans",sans-serif;color:#f4f4f6;font-size:28px;line-height:1.3; - --bg:#07070a;--surface:#13131a;--surface2:#1b1b25;--surface3:#252532;--muted:rgb(244 244 246/.74);--dim:rgb(244 244 246/.56);--accent:oklch(78% 0.14 305);--accent-text:oklch(88% 0.08 305)} -.stage *{box-sizing:border-box} -.stage .abs{position:absolute} -/* nav */ -.stage .nav{position:absolute;left:0;top:0;width:1920px;height:150px;z-index:5;display:flex;align-items:center;gap:12px;padding:44px 96px 0} -.stage .wm{font-size:36px;font-weight:800;letter-spacing:-.02em;margin-right:40px}.stage .wm b{color:var(--accent)} -.stage .ni{height:64px;padding:0 26px;border-radius:32px;display:inline-flex;align-items:center;font-size:30px;font-weight:600;color:var(--muted);position:relative} -.stage .ni.cur{color:#f4f4f6}.stage .ni.cur::after{content:"";position:absolute;left:26px;right:26px;bottom:4px;height:4px;border-radius:2px;background:var(--accent)} -.stage .ni.f{background:#f4f4f6;color:#0b0b10}.stage .ni.f::after{display:none} -.stage .nsp{flex:1}.stage .av{width:64px;height:64px;border-radius:50%;display:grid;place-items:center;font-weight:800;color:#0b0b10;font-size:30px;background:#9be38f} -/* hero */ -.stage .amb{position:absolute;inset:0;background-size:cover;background-position:center;image-rendering:auto} -.stage .bd{position:absolute;inset:0;background-size:cover;background-position:center} -.stage .scrim{position:absolute;inset:0;background:linear-gradient(90deg,rgb(7 7 10/.92) 0%,rgb(7 7 10/.55) 42%,rgb(7 7 10/0) 70%),linear-gradient(0deg,#07070a 0%,rgb(7 7 10/.6) 26%,rgb(7 7 10/0) 48%)} -.stage .copy{position:absolute;left:96px;width:1000px} -.stage .kicker{font-size:26px;font-weight:650;color:var(--accent-text);margin-bottom:10px} -.stage .ht{font-size:84px;line-height:1.02;font-weight:800;letter-spacing:-.02em;margin:0 0 16px} -.stage .hm{font-size:28px;color:var(--muted);margin-bottom:14px;min-height:38px;display:flex;gap:22px;align-items:center} -.stage .ho{font-size:28px;color:var(--muted);margin:0 0 30px;max-width:960px} -.stage .btns{display:flex;gap:20px} -.stage .btn{height:76px;padding:0 38px;border-radius:38px;font-size:28px;font-weight:700;display:inline-flex;align-items:center;background:rgb(255 255 255/.14)} -.stage .btn.pri{background:#f4f4f6;color:#0b0b10} -.stage .btn.f{box-shadow:0 0 0 2px var(--accent),inset 0 0 0 2px var(--accent);transform:scale(1.05)} -.stage .rate{display:inline-flex;gap:10px;align-items:center;font-weight:700;color:#f4f4f6}.stage .rate i{width:24px;height:24px;border-radius:50%;background:#e2483a;display:inline-block} -.stage .rate i.pc{background:#f5c518;border-radius:4px} -.stage .slot{display:inline-block;height:30px;border-radius:15px;background:rgb(255 255 255/.10)} -/* rows + cards */ -.stage .sh{position:absolute;left:96px;font-size:34px;font-weight:700} -.stage .card{position:absolute;border-radius:16px;overflow:hidden;background:var(--surface);background-size:cover;background-position:center} -.stage .card.poster{width:256px;height:384px}.stage .card.tile{width:400px;height:225px} -.stage .card .img{position:absolute;inset:0;background-size:cover;background-position:center} -.stage .card .cap{position:absolute;left:0;right:0;bottom:0;padding:14px 18px;background:linear-gradient(rgb(7 7 10/0),rgb(7 7 10/.92));font-size:26px;font-weight:700} -.stage .ring{box-shadow:0 0 0 2px var(--accent),inset 0 0 0 2px var(--accent),0 18px 40px rgb(0 0 0/.55)} -.stage .circle{position:absolute;width:200px;height:200px;border-radius:50%;overflow:hidden;background:var(--surface2);display:grid;place-items:center;font-size:44px;font-weight:800;color:var(--dim)} -.stage .circle .img{position:absolute;inset:0;background-size:cover;background-position:center} -.stage .bar{position:absolute;height:28px;border-radius:14px;background:var(--surface2)} -.stage .spin{position:absolute;left:940px;top:520px;width:40px;height:40px;border-radius:50%;border:4px solid rgb(155 120 255/.25);border-top-color:oklch(65% 0.2 300);animation:spin .8s linear infinite} -/* picker */ -.stage .pk{position:absolute;top:290px;left:0;width:1920px;text-align:center;font-size:72px;font-weight:800;letter-spacing:-.02em} -.stage .person{position:absolute;top:426px;width:220px;height:220px;border-radius:50%;display:grid;place-items:center;font-size:110px;font-weight:800;color:#0b0b10} -.stage .pname{position:absolute;top:670px;width:220px;text-align:center;font-size:34px;font-weight:700;color:var(--muted)} -/* replay label */ -.stage .tl{position:absolute;right:14px;bottom:10px;font:22px/1 ui-monospace,Menlo,monospace;background:rgb(0 0 0/.6);padding:6px 8px;border-radius:6px;color:#fff;z-index:20} - -/* keyframes */ -@keyframes spin{to{transform:rotate(360deg)}} -@keyframes fade{from{opacity:0}to{opacity:1}} -@keyframes fadeout{from{opacity:1}to{opacity:0}} -@keyframes rise{from{opacity:0;transform:translateY(16px)}to{opacity:1;transform:none}} -@keyframes breathe{0%,100%{opacity:.55}50%{opacity:1}} -@keyframes shimmer{from{transform:translateX(-100%)}to{transform:translateX(100%)}} -@keyframes hide{to{opacity:0;visibility:hidden}} -@keyframes show{from{opacity:0}to{opacity:1}} - -/* anything with .an waits for .play */ -.stage .an{opacity:0} -.stage.play .an{animation-fill-mode:both} -.stage .gone{animation-fill-mode:both} -/* skeleton styles */ -.stage .sk{background:var(--surface2)} -.stage .sk.breathe{animation:breathe 1.4s ease-in-out infinite} -.stage .sk.shim{position:relative;overflow:hidden} -.stage .sk.shim::after{content:"";position:absolute;inset:0;background:linear-gradient(90deg,transparent,rgb(255 255 255/.07),transparent);animation:shimmer 1.3s linear infinite} - -/* reduced motion: no movement, short fades only */ -body.rm .stage.play .an{animation-name:fade!important;animation-duration:.08s!important} -body.rm .stage .sk.breathe,body.rm .stage .sk.shim::after{animation:none} -body.rm .stage .mv{transition:none!important} diff --git a/data/tv-v2/motion-2026-11-06/proto.js b/data/tv-v2/motion-2026-11-06/proto.js deleted file mode 100644 index a9b16047..00000000 --- a/data/tv-v2/motion-2026-11-06/proto.js +++ /dev/null @@ -1,251 +0,0 @@ -// Wolfskin TV motion prototypes. One clock per stage drives Web Animations; "box rate" quantises the clock -// to the measured frame time on the Xiaomi box (p50 40 ms while moving, data/tv-spike-motion-speed/raw/gfx-*), -// so the same motion can be watched at 60 fps and at the rate the box actually draws today. -(() => { -const A = 'tv-motion-speed/'; -const BOX_MS = 40; -const EASE = 'cubic-bezier(.25,.1,.25,1)', OUT = 'cubic-bezier(.33,1,.68,1)', INOUT = 'cubic-bezier(.65,0,.35,1)'; -const POSTERS = [ - ['American Gangster', '2007 · 2h 36m'], ['Annie Hall', '1977 · 1h 33m'], ['Apocalypse Now', '1979 · 2h 27m'], - ['Arrival', '2016 · 1h 56m'], ['Avatar: The Last Airbender', '2026 · 1h 52m'], ['Bohemian Rhapsody', '2018 · 2h 15m'], - ['Braveheart', '1995 · 2h 58m'], ['Citizen Kane', '1941 · 1h 59m'], ['Spirited Away', '2001 · 2h 5m'], - ['12 Years a Slave', '2013 · 2h 14m'], ['A Bronx Tale', '1993 · 2h 1m'], ['All the Money in the World', '2017 · 2h 13m'], -]; -const poster = i => `${A}p${i + 1}.webp`; -const html = (s) => { const t = document.createElement('template'); t.innerHTML = s.trim(); return t.content.firstChild; }; - -function nav(cur, focus) { - const items = ['Home', 'Discover', 'Movies', 'Shows']; - return `
Wolfskin${items.map((n, i) => `${n}`).join('')}S
`; -} -function rate(rt, pc) { return `${rt}${pc}`; } -function heroCopy(o) { - return `
${o.kicker}
${o.title}
${o.meta}
${o.ov ? `
${o.ov}
` : ''}
${o.btns}
`; -} - -// ---------- scenes: build(stage, T, v) where v is the selected variant ---------- -const SCENES = { - // 1. launch -> Who's watching - launch: { len: 1400, variants: { after: 'After: people from the saved list' }, build(s, T) { - s.append(html(`
`)); - const bg = s.appendChild(html(`
`)); - T.a(bg, [{ opacity: 0 }, { opacity: 1 }], 0, 160); - const pk = s.appendChild(html(`
Wolfskin
Who’s watching?
- ${[['J', '#64c3ff', 'justin', 540], ['M', '#ffa47a', 'mindel', 850], ['S', '#9be38f', 'shared', 1160]].map(([l, c, n, x]) => `
${l}
${n}
`).join('')}
`)); - T.a(pk, [{ opacity: 0 }, { opacity: 1 }], 450, 160); - } }, - - // 2. picker -> Home - home: { len: 1100, variants: { after: 'After: last Home painted from disk, art pre-decoded' }, build(s, T) { - const home = s.appendChild(html(`
-
-
- ${heroCopy({ kicker: '▸ Continue watching', title: 'Arrival', meta: '2016 · 1h 56m · 38 min left ' + rate('94%', '82%'), ov: 'Taking place after alien crafts land around the world, an expert linguist is recruited by the military to determine whether they come in peace or are a threat.', btns: '▶ Resumeⓘ Details', bottom: 340 })} -
Next up
- ${[3, 4, 1, 2].map((b, i) => `
${['American Gangster', 'Bohemian Rhapsody', 'Apocalypse Now', 'Arrival'][i]}
`).join('')} - ${nav(0)}
`)); - const picker = s.appendChild(html(`
Who’s watching?
- ${[['J', '#64c3ff', 'justin', 540], ['M', '#ffa47a', 'mindel', 850], ['S', '#9be38f', 'shared', 1160]].map(([l, c, n, x]) => `
${l}
${n}
`).join('')}
`)); - T.a(picker, [{ opacity: 1 }, { opacity: 0 }], 0, 140); - T.a(home.querySelector('.amb'), [{ opacity: 0 }, { opacity: 1 }], 40, 120); - T.a(home.querySelector('.bd'), [{ opacity: 0 }, { opacity: 1 }], 120, 220, INOUT); - T.a(home.querySelector('.copy'), [{ opacity: 0, transform: 'translateY(16px)' }, { opacity: 1, transform: 'none' }], 60, 180, OUT); - T.a(home.querySelector('.sh'), [{ opacity: 0 }, { opacity: 1 }], 120, 160); - home.querySelectorAll('.card').forEach((c, i) => { - T.a(c, [{ opacity: 0, transform: 'translateY(24px)' }, { opacity: 1, transform: 'none' }], 140 + i * 40, 180, OUT); - }); - } }, - - // 3. skeleton styles on a poster grid - skeleton: { len: 2200, variants: { breathe: 'Breathe (pick)', flat: 'Flat blocks (today)', shimmer: 'Shimmer sweep', spinner: 'Spinner (today, launch)' }, build(s, T, v) { - s.append(html(nav(2))); - s.append(html(`
Movies 85 films
`)); - const cells = []; - for (let r = 0; r < 2; r++) for (let c = 0; c < 6; c++) cells.push([96 + c * 296, 330 + r * 460, r * 6 + c]); - if (v === 'spinner') { const sp = s.appendChild(html('
')); T.a(sp, [{ opacity: 1 }, { opacity: 0 }], 900, 120); } - cells.forEach(([x, y, i]) => { - if (v !== 'spinner') { - const sk = s.appendChild(html(`
`)); - T.a(sk, [{ opacity: 1 }, { opacity: 0 }], 900 + i * 25, 160); - } - const c = s.appendChild(html(`
`)); - T.a(c, [{ opacity: 0 }, { opacity: 1 }], 900 + i * 25, 160); - }); - } }, - - // 4. tab switch: Home -> Discover, rows reveal - tab: { len: 1100, variants: { after: 'After: last Discover painted, rows rise, art fades' }, build(s, T) { - const disc = s.appendChild(html(`
-
- ${heroCopy({ kicker: '✦ For you', title: 'Bohemian Rhapsody', meta: 'Movie · 2018 · Drama, Music ' + rate('60%', '85%'), ov: 'Singer Freddie Mercury, guitarist Brian May, drummer Roger Taylor and bass guitarist John Deacon take the music world by storm.', btns: 'ⓘ Details', bottom: 520 })} -
Movies for you
- ${[6, 7, 8, 9, 10, 11].map((p, i) => `
`).join('')} -
`)); - const home = s.appendChild(html(`
- ${heroCopy({ kicker: '▸ Continue watching', title: 'Arrival', meta: '2016 · 1h 56m · 38 min left', ov: 'Taking place after alien crafts land around the world, an expert linguist is recruited by the military.', btns: '▶ Resumeⓘ Details', bottom: 340 })}
`)); - const n = s.appendChild(html(nav(1, 1))); - T.a(home, [{ opacity: 1 }, { opacity: 0 }], 0, 200, EASE); - T.a(disc.querySelector('.bd'), [{ opacity: 0 }, { opacity: 1 }], 0, 240, INOUT); - T.a(disc.querySelector('.copy'), [{ opacity: 0, transform: 'translateY(16px)' }, { opacity: 1, transform: 'none' }], 80, 180, OUT); - T.a(disc.querySelector('.sh'), [{ opacity: 0 }, { opacity: 1 }], 140, 160); - disc.querySelectorAll('.card').forEach((c, i) => T.a(c, [{ opacity: 0, transform: 'translateY(24px)' }, { opacity: 1, transform: 'none' }], 160 + i * 30, 180, OUT)); - } }, - - // 5. title page entry from the Movies grid - title: { len: 1600, variants: { after: 'After: what the card knew, at once' }, build(s, T) { - const page = s.appendChild(html(`
-
-
-
✓ Movie · In your library
Apocalypse Now
-
1979 · 2h 27m ${rate('91%', '94%')} Drama, War
-
At the height of the Vietnam war, Captain Benjamin Willard is sent on a dangerous mission that, officially, “does not exist, nor will it ever exist.”
-
▶ Play⋯Add for someone
-
Cast
- ${[0, 1, 2, 3, 4, 5, 6].map(i => `
`).join('')} - ${nav(2)}
`)); - const grid = s.appendChild(html(`
${nav(2)} -
Movies 85 films
- ${[0, 1, 2, 3, 4, 5].map(i => `
`).join('')} - ${[6, 7, 8, 9, 10, 11].map((p, i) => `
`).join('')}
`)); - T.a(grid, [{ opacity: 1 }, { opacity: 0 }], 0, 160); - T.a(page.querySelector('.amb'), [{ opacity: 0 }, { opacity: 1 }], 0, 160); - T.a(page.querySelector('.copy'), [{ opacity: 0, transform: 'translateY(16px)' }, { opacity: 1, transform: 'none' }], 40, 180, OUT); - T.a(page.querySelector('.late'), [{ opacity: 0 }, { opacity: 1 }], 430, 160); - T.a(page.querySelector('.late2'), [{ opacity: 0 }, { opacity: 1 }], 430, 160); - T.a(page.querySelector('.bd'), [{ opacity: 0 }, { opacity: 1 }], 470, 280, INOUT); - T.a(page.querySelector('.sh'), [{ opacity: 0 }, { opacity: 1 }], 120, 160); - page.querySelectorAll('.circle').forEach((c, i) => { - T.a(c, [{ opacity: 0, transform: 'translateY(20px)' }, { opacity: 1, transform: 'none' }], 140 + i * 30, 180, OUT); - T.a(c.querySelector('.img'), [{ opacity: 0 }, { opacity: 1 }], 620 + i * 40, 160); - }); - } }, - - // 6. series title: late readiness line - series: { len: 4000, variants: { tv: 'TV-only: slot reserved, fades in at 3.4 s', conductarr: 'With the Conductarr cache: arrives ≈0.4 s' }, build(s, T, v) { - const late = v === 'conductarr' ? 380 : 3400; - const page = s.appendChild(html(`
-
-
-
✓ Series · In your library · Watched
Adults
-
2025 · 2 seasons · Comedy ${rate('88%', '93%')}
-
✓ Ready for you · by Mindel
-
A group of twenty-somethings in New York trying to be good people, despite being neither “good” nor “people” yet.
-
▶ Play S1 E1⋯Seasons
-
Season 1Season 2
- ${[0, 1, 2, 3].map(i => `
`).join('')} - ${nav(3)}
`)); - T.a(page.querySelector('.copy'), [{ opacity: 0, transform: 'translateY(16px)' }, { opacity: 1, transform: 'none' }], 0, 180, OUT); - T.a(page.querySelector('.amb'), [{ opacity: 0 }, { opacity: 1 }], 0, 160); - T.a(page.querySelector('.bd'), [{ opacity: 0 }, { opacity: 1 }], 620, 280, INOUT); - T.a(page.querySelector('.lr'), [{ opacity: 0 }, { opacity: 1 }], late, 200); - T.a(page.querySelector('.lr2'), [{ opacity: 0 }, { opacity: 1 }], late, 200); - page.querySelectorAll('.card .img').forEach((c, i) => T.a(c, [{ opacity: 0 }, { opacity: 1 }], 700 + i * 40, 160)); - } }, - - // 7. focus move along a row - focus: { len: 3000, variants: { after: 'Proposed: 180 ms ease-out, caption rises', today: 'Today: 140 ms, caption cross-fade' }, build(s, T, v) { - s.append(html(nav(2))); - s.append(html(`
Movies for you
`)); - const dur = v === 'today' ? 140 : 180, ease = v === 'today' ? EASE : OUT; - const cards = [0, 1, 2, 3, 4, 5].map(i => s.appendChild(html(`
`))); - const caps = [0, 1, 2, 3, 4, 5].map(i => s.appendChild(html(`
${POSTERS[i + 6][0]}
${POSTERS[i + 6][1]}
`))); - const step = 600; - cards.forEach((c, i) => { - const on = i * step, off = (i + 1) * step; - const up = [{ transform: 'scale(1)', boxShadow: '0 0 0 0 transparent' }, { transform: 'scale(1.08)', boxShadow: '0 0 0 2px oklch(78% 0.14 305), inset 0 0 0 2px oklch(78% 0.14 305), 0 18px 40px rgb(0 0 0/.55)' }]; - if (i > 0) T.a(c, up, on, dur, ease); else T.a(c, [up[1], up[1]], 0, 1); - if (i < 4) T.a(c, [up[1], up[0]], off, dur, ease); - const capIn = v === 'today' ? [{ opacity: 0 }, { opacity: 1 }] : [{ opacity: 0, transform: 'translateY(10px)' }, { opacity: 1, transform: 'none' }]; - if (i > 0) T.a(caps[i], capIn, on + (v === 'today' ? 0 : 60), dur, ease); else T.a(caps[i], [{ opacity: 1 }, { opacity: 1 }], 0, 1); - if (i < 4) T.a(caps[i], [{ opacity: 1 }, { opacity: 0 }], off, v === 'today' ? dur : 100, ease); - if (i > 4) caps[i].style.opacity = 0; - }); - } }, - - // 8. hero crossfade (Discover hero advances) - hero: { len: 2600, variants: { after: 'Proposed: 320 ms backdrop cross-fade, copy hand-off', today: 'Today: cut' }, build(s, T, v) { - const mk = (b, t, meta, ov) => s.appendChild(html(`
${heroCopy({ kicker: '✦ For you', title: t, meta, ov, btns: 'ⓘ Details', bottom: 520 })}
`)); - const b = mk(2, 'Arrival', 'Movie · 2016 · Drama, Sci-Fi ' + rate('94%', '82%'), 'Taking place after alien crafts land around the world, an expert linguist is recruited by the military to determine whether they come in peace or are a threat.'); - const a = mk(1, 'Apocalypse Now', 'Movie · 1979 · Drama, War ' + rate('91%', '94%'), 'At the height of the Vietnam war, Captain Benjamin Willard is sent on a dangerous mission that, officially, does not exist.'); - s.append(html(nav(1))); - s.append(html(`
Movies for you
`)); - [0, 1, 2, 3, 4, 5].map(i => s.append(html(`
`))); - const at = 900; - if (v === 'today') { T.a(a, [{ opacity: 1 }, { opacity: 0 }], at, 1); return; } - T.a(a.querySelector('.copy'), [{ opacity: 1 }, { opacity: 0 }], at, 120, EASE); - T.a(a.querySelector('.bd'), [{ opacity: 1 }, { opacity: 0 }], at, 320, INOUT); - T.a(a.querySelector('.scrim'), [{ opacity: 1 }, { opacity: 1 }], at, 320); - T.a(a, [{ opacity: 1 }, { opacity: 0 }], at + 300, 20); - T.a(b.querySelector('.copy'), [{ opacity: 0, transform: 'translateY(14px)' }, { opacity: 1, transform: 'none' }], at + 140, 200, OUT); - } }, -}; - -// ---------- player ---------- -const players = []; -let boxRate = false; -function makePlayer(box) { - const name = box.dataset.scene, sc = SCENES[name]; - const lead = +(box.dataset.lead || 300); - let variant = box.dataset.variant || Object.keys(sc.variants)[0]; - let anims = [], t0 = 0, raf = 0, stage, label; - const total = () => lead + sc.len + 1400; - function build() { - box.querySelectorAll('.stage').forEach(e => e.remove()); - stage = html('
'); box.appendChild(stage); - label = stage.appendChild(html('
0 ms
')); - anims = []; - const rm = document.body.classList.contains('rm'); - const seen = new WeakSet(); - const T = { a(el, kf, start, dur, easing = EASE, opt = {}) { - let k = kf, d = dur; - if (rm) { k = kf.map(f => { const g = { ...f }; delete g.transform; return g; }); d = Math.min(dur, 100); } - // only an element's first animation fills backwards; later ones on the same element must not override it while waiting - const fill = seen.has(el) ? 'forwards' : 'both'; seen.add(el); - const an = el.animate(k, { delay: lead + start, duration: Math.max(1, d), easing, fill, ...opt }); - an.pause(); anims.push(an); - } }; - sc.build(stage, T, variant); - fit(); - } - function fit() { if (stage) stage.style.transform = `scale(${box.clientWidth / 1920})`; } - function tick(now) { - let t = now - t0; - if (t > total()) { t0 = now; t = 0; } - const q = boxRate ? Math.floor(t / BOX_MS) * BOX_MS : t; - for (const an of anims) an.currentTime = q; - label.textContent = `${Math.max(0, Math.round(q - lead))} ms`; - raf = requestAnimationFrame(tick); - } - function start() { cancelAnimationFrame(raf); build(); t0 = performance.now(); raf = requestAnimationFrame(tick); } - function stop() { cancelAnimationFrame(raf); raf = 0; } - new ResizeObserver(fit).observe(box); - new IntersectionObserver(es => es.forEach(e => { if (e.isIntersecting) { if (!raf) start(); } else stop(); }), { rootMargin: '100px' }).observe(box); - const p = { box, start, setVariant(v) { variant = v; start(); }, rebuild: start }; - players.push(p); - return p; -} - -document.querySelectorAll('.sbox[data-scene]').forEach(makePlayer); -document.querySelectorAll('[data-variants]').forEach(bar => { - const p = players.find(x => x.box.id === bar.dataset.variants); - const sc = SCENES[p.box.dataset.scene]; - Object.entries(sc.variants).forEach(([k, label], i) => { - const b = document.createElement('button'); b.type = 'button'; b.className = 'tab' + (i === 0 ? ' on' : ''); b.textContent = label; - b.onclick = () => { bar.querySelectorAll('.tab').forEach(x => x.classList.toggle('on', x === b)); p.setVariant(k); }; - bar.appendChild(b); - }); -}); -document.querySelectorAll('button.replay').forEach(b => b.addEventListener('click', () => { - const pair = b.closest('.pair'); - pair.querySelectorAll('video').forEach(v => { v.currentTime = 0; v.play().catch(() => {}); }); - players.filter(p => pair.contains(p.box)).forEach(p => p.start()); -})); -const rate_ = document.getElementById('boxrate'); -if (rate_) rate_.addEventListener('change', () => { boxRate = rate_.checked; }); -const rm = document.getElementById('rm'); -if (rm) { - if (matchMedia('(prefers-reduced-motion: reduce)').matches) { rm.checked = true; document.body.classList.add('rm'); } - rm.addEventListener('change', () => { document.body.classList.toggle('rm', rm.checked); players.forEach(p => p.rebuild()); }); -} -document.body.dataset.ready = '1'; -})(); diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b1.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/b1.webp deleted file mode 100644 index f4bd1f2a..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b1.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b1t.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/b1t.webp deleted file mode 100644 index ad68d431..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b1t.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b2.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/b2.webp deleted file mode 100644 index 446e4237..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b2.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b2t.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/b2t.webp deleted file mode 100644 index e50d9c72..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b2t.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b3.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/b3.webp deleted file mode 100644 index aa262c13..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b3.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b3t.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/b3t.webp deleted file mode 100644 index 5b028e9e..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b3t.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b4.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/b4.webp deleted file mode 100644 index 9f4cd1f4..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b4.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b4t.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/b4t.webp deleted file mode 100644 index fe06736b..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/b4t.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-discover-tab.webm b/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-discover-tab.webm deleted file mode 100644 index 6b54f1f7..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-discover-tab.webm and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-home-enter.webm b/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-home-enter.webm deleted file mode 100644 index ff68388f..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-home-enter.webm and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-launch-fast.webm b/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-launch-fast.webm deleted file mode 100644 index d57e13d0..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-launch-fast.webm and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-launch-spinner.webm b/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-launch-spinner.webm deleted file mode 100644 index a3cb2aef..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-launch-spinner.webm and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-movies-grid.webm b/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-movies-grid.webm deleted file mode 100644 index d264072d..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-movies-grid.webm and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-person.webm b/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-person.webm deleted file mode 100644 index e8f055af..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-person.webm and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-title-discover.webm b/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-title-discover.webm deleted file mode 100644 index 5760fe48..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-title-discover.webm and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-title-movie.webm b/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-title-movie.webm deleted file mode 100644 index 6f986f10..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-title-movie.webm and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-title-series.webm b/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-title-series.webm deleted file mode 100644 index e7836902..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/before-title-series.webm and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c1.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/c1.webp deleted file mode 100644 index d58a113d..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c1.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c2.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/c2.webp deleted file mode 100644 index b028efb8..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c2.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c3.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/c3.webp deleted file mode 100644 index 59d33d47..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c3.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c4.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/c4.webp deleted file mode 100644 index 4f17d331..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c4.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c5.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/c5.webp deleted file mode 100644 index 381097e6..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c5.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c6.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/c6.webp deleted file mode 100644 index 53cb7336..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c6.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c7.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/c7.webp deleted file mode 100644 index ad11538a..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c7.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c8.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/c8.webp deleted file mode 100644 index 89948242..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/c8.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/e1.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/e1.webp deleted file mode 100644 index 4a84766e..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/e1.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/home-before-tab.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/home-before-tab.webp deleted file mode 100644 index e34e9b12..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/home-before-tab.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/launcher.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/launcher.webp deleted file mode 100644 index 11ac96ed..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/launcher.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p1.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p1.webp deleted file mode 100644 index 2634834b..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p1.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p10.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p10.webp deleted file mode 100644 index 320510c8..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p10.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p11.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p11.webp deleted file mode 100644 index 2fc5d448..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p11.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p12.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p12.webp deleted file mode 100644 index 35a4172d..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p12.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p2.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p2.webp deleted file mode 100644 index 69ac5438..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p2.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p3.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p3.webp deleted file mode 100644 index 03f63ebc..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p3.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p4.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p4.webp deleted file mode 100644 index 31ba88de..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p4.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p5.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p5.webp deleted file mode 100644 index 76a3ad92..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p5.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p6.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p6.webp deleted file mode 100644 index 42e77ad2..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p6.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p7.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p7.webp deleted file mode 100644 index 5386939b..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p7.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p8.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p8.webp deleted file mode 100644 index 2e7189e5..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p8.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p9.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/p9.webp deleted file mode 100644 index 285d45d1..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/p9.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/s1.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/s1.webp deleted file mode 100644 index 18759cfc..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/s1.webp and /dev/null differ diff --git a/data/tv-v2/motion-2026-11-06/tv-motion-speed/s1t.webp b/data/tv-v2/motion-2026-11-06/tv-motion-speed/s1t.webp deleted file mode 100644 index bdad8906..00000000 Binary files a/data/tv-v2/motion-2026-11-06/tv-motion-speed/s1t.webp and /dev/null differ diff --git a/docker/README.md b/docker/README.md index 80bffa72..fe872463 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,8 +1,8 @@ # Wolfskin TV container builds Run from a full Git checkout with the upstream `v*` and `p*` tags available. The -host needs Docker, GNU Make, Bash, Git, `realpath` (GNU coreutils), and `flock` -(util-linux), not Java or the Android SDK. +host needs Docker, GNU Make, Bash, Git, and `flock` (util-linux), not Java or the +Android SDK. ```sh git fetch origin --tags @@ -27,143 +27,6 @@ Upstream enables JVM unit tests only for debug variants; there is no `testDefaultReleaseUnitTest` task. `make test` uses the closest default-flavor task without changing upstream's test configuration. -### Full-suite test diagnostics - -The Gradle daemon heap (`org.gradle.jvmargs` in `gradle.properties`) is separate -from the forked test-worker heap. The default test worker uses 512 MiB; changing -the daemon's `-Xmx` does not increase it. A larger worker heap did not resolve -the person-picker fixture's missing Compose snapshot notifications. - -Gradle 9.8.2 runs previously failed test classes first on the next invocation. -An immediate green `make test` rerun can therefore hide an order-sensitive -failure rather than prove a fix. For comparisons, clear only generated binary -test-result history (`build/test-results//binary` in each module) before -each run and record actual class-start order; XML file listing order is not -execution order. Keep worker heap and parallelism unchanged between samples. -`PersonPickerSessionTest` must also pass late in the full app JVM, not just alone -or promoted to the front by previous failures. - -## Saved-person launch and DNS - -Launch restores an unprotected saved Jellyfin login from local storage before -network validation. The existing Wolfskin picker paints the saved names and -identity-derived colors, then refreshes the household in the background. PIN and -require-login profiles still go through the existing protected sign-in flow. -`Users/Me` and `System/Info/Public` now start concurrently; a late launch response -cannot replace a different selected person. Name revalidation updates only the -name column and reloads the saved user, preserving newer settings and PINs. - -Jellyfin, Conductarr, artwork, playback and crash-report clients share one -`PersistentDns` instance through the application graph. It keeps system-ordered -IPv6/IPv4 answers in memory and `noBackupFilesDir/wolfskin-dns.json` (at most 32 hosts). -Saved answers return immediately for up to 24 hours and refresh off main after -60 seconds; failed background lookups back off for 2 seconds without extending -the last successful timestamp. Unexpected resolver exceptions are contained at -the background refresh and warm-up boundaries. Negative answers are not persisted or cached. -Missing, oversized or corrupt hint files fall back to system resolution. -Application creation warms the saved Jellyfin host and configured Conductarr -host on parallel IO jobs; it does not change Android Private DNS. - -A connection-establishment failure before any HTTP request headers were sent -gets one fresh system lookup and one retry. Responses, read failures and -uncertain mutation outcomes are not replayed. Conductarr retains its existing -no-automatic-replay policy after a request starts. A DNS refresh changes the next -new connection; already-working pooled connections are not forcibly closed. -OkHttp's derived WebSocket clients disable event listeners; those calls bypass -the HTTP retry bookkeeping while retaining the shared DNS resolver. - -Device acceptance (not established by JVM tests): with saved people present, -cold-launch six times more than 60 seconds apart and require the picker within -0.5 seconds on every launch. Press Left/Right then one OK; the selected Home must -open without a second picker. Open the avatar picker, change person with one OK, -and repeat after an offline launch to confirm saved people still paint. - -Compare timestamps of the launch pair of SDK log lines -`GET https://jelly.justinvisser.org/Users/Me` and -`GET https://jelly.justinvisser.org/System/Info/Public` (ignore later foreground -`Users/Me` refreshes). The spike's two slow launch gaps were 1.508 and 1.509 -seconds. The requests now overlap, so either may log first; the picker must not -wait for either response. The minified SDK log tag is not stable across builds. - -## Optimized side-by-side comparison - -The `optimized` build type inherits `release`: R8 optimization/minification, -resource shrinking, non-debuggable code, dependency consumer keep rules and -dependency baseline profiles. It changes only signing (the Android debug key), -package (`org.justinvisser.wolfskin.tv.opt`) and launcher label (`Wolfskin (Opt)`). -The launcher icon/banner and release-compatible version name are unchanged: -the shared upgrade/updater parser rejects extra suffixes such as `-opt`. -`make apk` remains the clean, release-key-signed production build. Debug and -optimized containers share the persistent debug key described below; release -signing is unchanged. - -Build all four default-flavor outputs in one invocation through the container -wrapper, without a release keystore. On a host whose Gradle cache already holds -the pinned native extensions and their metadata: - -```sh -bash docker/gradle.sh optimized --offline \ - -PWholphinExtensionsUsername=JustinZeus \ - -PWholphinExtensionsPassword=unused \ - :app:assembleDefaultOptimized -``` - -The unused password is not a credential: offline resolution never contacts -GitHub Packages. A cold cache instead needs a read-packages credential supplied -through the existing `ORG_GRADLE_PROJECT_WholphinExtensionsUsername` and -`ORG_GRADLE_PROJECT_WholphinExtensionsPassword` hooks inside the build container, -or securely seeded cached artifacts. No release signing inputs are needed. -Without native extension configuration, the existing dependency selection uses -the MPV stub and omits ffmpeg/AV1, just like `make apk-debug`; that is not a -playback-complete comparison. Inspect native libraries before installing. - -Outputs are in `app/build/outputs/apk/default/optimized/`: universal, arm64-v8a, -armeabi-v7a and x86_64. Keep -`app/build/outputs/mapping/defaultOptimized/mapping.txt` with those APKs to -deobfuscate crashes. This variant shares release library variants and the release -`debugHomeSnapshot` implementation, not `src/debug` or its preview JSON/artwork. -`BuildConfig.DEBUG` remains false: no preview-fixture setting, debug StrictMode -or Compose diagnostic stack traces. - -This is a fresh app sandbox: sign in with Jellyfin Quick Connect or the normal -server/user flow again; it does not inherit the debug/release app's logins or -preferences. **Wolfskin screens** defaults on, and the same Advanced switch can -restore upstream screens. The same Conductarr door -(`https://wolfskin-tv.justinvisser.org`) and URL override apply. The selected -Jellyfin user's token is borrowed for Conductarr; no app-specific TV credential -or embedded secret is added. All other settings retain release behavior, -including update checks; a production release APK is not an update for this -separate package/debug signer. - -`androidx.profileinstaller` and library-provided profiles already exist. There -is no recorded app baseline-profile source or Macrobenchmark module. -`src/optimized/baselineProfiles/baseline-prof.txt` adds a hand-maintained seed: application and -activity classes plus their `onCreate` methods, `WolfskinAppKt`, -`WolfskinScreenPreference` and `ConductarrPreference`. AGP merges it with library -profiles, rewrites it through R8 and packages `assets/dexopt/baseline.prof` and -`baseline.profm`. It is not a measured navigation profile or evidence of a speedup. -To replace the seed, add an AndroidX Baseline Profile producer/Macrobenchmark -module, record cold launch, Quick Connect/sign-in, person selection, Home, -Libraries, Discover, title pages and playback on a suitable device, then rebuild -and compare startup/frame timings. Device-driven recording and runtime checks -remain separate from an APK build. -The optimized source set explicitly registers that profile directory; a bare -`src/optimized/baseline-prof.txt` is not consumed by this AGP configuration. - -Static verification: use `aapt2 dump badging` for package/label/SDKs and absence -of `application-debuggable`; `apksigner verify --print-certs` for the debug -signer; `unzip -l` for both dexopt assets, native ABI contents and absence of -`assets/wolfskin-*`/`assets/library/` fixtures. Review R8 warnings and effective -consumer rules rather than adding blanket keeps. JVM tests do not prove -minified Hilt/Room/serialization/JNI runtime safety; exercise sign-in, real -Conductarr reads, artwork, database reopen and each player on the comparison box. -`help --task :app:testDefaultOptimizedUnitTest` confirms that this non-debug -variant has no JVM unit-test task, just like release. The existing debug JVM -`VersionCompareTests` receives the actual optimized version name from the variant -API and checks it with the same `Version.fromString` used by upgrade/update handling. -Build logic is otherwise checked through actual APK assembly and static inspection. - - ## Upstream v1.1.0 integration The release merge brings Kotlin `2.4.21`, Gradle `9.8.2`, AGP `9.5.0`, and @@ -185,15 +48,6 @@ not the working tree. An uncommitted merge still builds with the old version nam Neither an upstream merge nor its validation build authorizes a release or TV installation. -## Upstream v1.1.1 integration - -The patch release makes manual Seerr setup available when the optional companion -plugin is absent: setup is marked ready immediately rather than remaining pending. -With the plugin installed, an empty settings response or a failed settings read -still reaches the existing ready-state fallback; plugin URL prefill is unchanged. -There are no new Room migrations (schema remains 41), player, layout, session, -DNS/client, dependency, branding or signing changes relative to v1.1.0. - ## Wolfskin shell Wolfskin UI lives in `app/src/wolfskin/java`, beside upstream source. The signed-in @@ -236,7 +90,7 @@ The stroke is inset within the fixed 20 dp / 40 px height; horizontal border-box padding includes it. The 6 px dash / 4 px gap follows the browser's 3:2 stroke-width ratios. Resting borders are white at 22% opacity; focused borders use ink at 40%. -The small gear centred beneath the complete people row opens Settings with Requests focused. +The small gear under the final person opens Settings with Requests focused. Settings groups hand off to existing upstream pages; Requests opens the household Coming-in sheet described below. **Advanced settings → Wolfskin screens** is the persistent rollout switch: turning it off renders upstream Home and library destinations with @@ -258,14 +112,6 @@ switch. Cleanup outlives the replaced screen. Retry and session replacement use the same disposal owner. Superseded sign-ins are cancelled and serialized so a late reply cannot navigate back to an earlier person. -The fixture-mode marker belongs to the singleton `WolfskinSession`, alongside its -server and shell state, not to the user-scoped ViewModel. Switching people replaces -the upstream app entry and ViewModel but retains the same-server, same-mode shell: -the picker stays closed on Home after the first OK. A cold start still opens it, -and the nav avatar explicitly reopens it. `PersonPickerSessionTest` drives the real -shell and user-entry replacement for launch/avatar Left and Right, the initial -person, gear and back, and fast Left-Left-OK; each selection emits one person action. - Preference and people-fixture reads, Conductarr client construction (including Home/title retries), and private-cache directory initialization run on IO. `PersonSwitchThreadingTest` replays the real picker across Justin → Mindel → @@ -280,14 +126,6 @@ destination is an explicit title-family integration stub exposing only Discover' request and pick actions. Unheld titles have no trailer control until the pinned Conductarr title contract supplies a trailer. -Named “Because you watched” shelves require watched contribution evidence. -Seeds are grouped by media type and TMDB identity, never by caption; repeated -contributions retain both watched/added flags. The current feed has no per-seed -watch timestamp, so eligible shelves keep wire order. Added-only contributions -remain available in the general For-you collections, but make no named shelf. -Titleless contributions do not make a shelf. Recommendations remain acquisition -suggestions, not a filter to the viewer's current library. - The debug-only fixture and local art live in `app/src/debug/assets/wolfskin-discover/`. The Advanced preview switch selects a network-free fixture host; real providers are the default in debug and release. @@ -382,29 +220,16 @@ an untouched fresh entry focuses hero button zero; intervening nav input prevent that automatic transfer. Home, Libraries and Discover use the same `ShellContentFocus` release/repeat guard and Back ladder. -`HomeReadFacade` confines Home SDK reads to the selected user. Resume and Next up -publish independently of slow or failed library shelves; saved metadata still -paints immediately, but a saved hero offers Details until watch data revalidates. -Home and title Play actions resolve the current Jellyfin item and its current -checkpoint at the click, preserving millisecond positions. Series actions use -live NextUp with resumable episodes enabled; an explicitly opened episode stays -that episode, and Restart deliberately starts that displayed episode at zero. -Played flags do not discard a positive checkpoint for an intentional rewatch. -No season, recommendation stub or different person's session becomes playable. +`HomeReadFacade` is the only Home code importing Jellyfin API clients. Release +variants read the selected user's Resume, Next up, newest titles and destination +shelves, with app-private last-known-good projections through the shared atomic +disk cache. A missing saved library becomes a recovery panel; a saved library +stays visible when Jellyfin is unreachable. Playback resolves an actual film or +episode and checks Jellyfin before opening upstream's player. No season, +recommendation stub or different person's session is promoted to playback. An unresolved person switch guards Home and both owned/upstream library content before mounting any source read with the prior person's Jellyfin session. -Home and title watch reads refresh on entry and foreground. A successful -PlaybackStopped acknowledgement publishes a revision for the captured server/user, -so a return read that beat the stop write is refreshed again after that write. -The acknowledgement also removes that user's persisted library grid snapshots -instead of waiting for their ten-minute TTL; an in-memory revision bypasses any -older snapshot that raced invalidation. Stop-report failures remain logged and -do not publish a successful acknowledgement. External players refresh after a -supported stop result; an external app that returns no position cannot supply a -missing checkpoint. Another client's changes after the final read are outside -that click's snapshot. - Debug variants additionally package the locked fixture and local artwork under `wolfskin-design/src/debug/assets/wolfskin-home/`; release variants exclude them. The explicit fixture provider supplies approved household data and Home states @@ -439,24 +264,14 @@ are recorded differences, not a claim of browser pixel equality. ## Requests under Settings -The Requests row and Coming-in sheet share one immutable household history snapshot. -Settings counts returned requests, including Ready, rather than calling every -non-Ready row “open”. An unavailable empty snapshot has no count. Deleted rows -read Removed; absent holdings read Not in any library; unreleased titles read -Not out yet; holdings outside the recipient's libraries read In another library. -Waiting for an import is not evidence of an active download. Downloading and -Searching require explicit acquisition signals. Visibility-proof faults read -Check needed; playback faults read File health needs attention, even when a -library holding is present. Right expands the actual stage evidence and the -relevant summary, including episode/source names when supplied by that summary. -The activity feed currently supplies only a title-level summary for Avatar. - -Attention-needed rows sort first, then active acquisition/checks, waiting and -settled history. The bounded window shows five rows, or four with readiness -expanded. Left collapses; Up/Down collapse while moving. Opening a title preserves -the request for Back, and closing the sheet restores its opener. Selecting a root -or changing person clears the title-return link. Shared's authenticated actor -always reads “by Shared”, never “by you”; absent actors have no “by” clause. +The Requests row and Coming-in sheet share one immutable household snapshot. +Ready requests do not count as open. Rows sort Failed, Downloading/Almost ready, +Checking/Searching, Waiting, Ready. The bounded window shows five rows, or four +with readiness expanded. Right expands Request/Download/Library/Playback; Left +collapses; Up/Down collapse while moving. Opening a title preserves the request +for Back, and closing the sheet restores its opener. Selecting a root or changing +person clears the title-return link. Shared's authenticated actor always reads +“by Shared”, never “by you”. The debug fixture switch loads `app/src/debug/assets/wolfskin-requests.json` and its eight local posters. Shared and focused-rating records also feed the native @@ -508,15 +323,6 @@ type and TMDB identity. Back restores the exact Coming-in row and expansion; the temporary `request-title/...` placeholder is removed. TV sign-in, release and device deployment remain separate. -`ActivityTruthProjectionTest` feeds recorded activity JSON through the TV adapter -for Steins;Gate, Yu Yu Hakusho, Love is Blind, Spider-Man: Homecoming, deleted -One Hour Photo, unreleased The Body, Avatar health and Partition waiting. -`ConductarrTruthCaptureTest` renders those provider snapshots and Mindel's recorded -recommendation feed on the native Compose surfaces at 1920×1080, writing -`build/wolfskin-captures/truth/`. Artwork is deliberately omitted to keep these -captures offline; missing-art rendering, tokens, focus, sheet geometry and shelf -spacing are the shipped components. - ## Libraries and See all Movies, Shows and Anime use the shell's retained view and a continuous six-column @@ -529,9 +335,9 @@ Down clamps a short final title row before entering the separate Try again / Sho more row; an empty slot cannot activate recovery. An unavailable library hides its unknown item count. -Library titles and compact subtitles remain visible at rest, with one-line, -card-width ellipsis rather than a 640 px focused caption. The letter rail uses -bold 24 px letters, with the focused letter bold 28 px. +Caption separators use 40% of the existing muted colour's alpha. The rail follows +the locked prototype CSS: bold 24 px letters, with the focused letter bold 28 px, +overriding the spec table's generic caption style for this component. Library and Settings header initials use the muted colour over the person's fill; navigation and picker avatars retain their dark initials. @@ -570,40 +376,17 @@ Discover and season-chip rows retain their 104 px height. Cards and cast circles draw a single 4 px accent stroke centred on the art edge, above the content, with no background gap. Card lift parameters are unchanged; cast portraits and episode tiles now receive that lift too. The stroke and art -scale together at 1.08. +scale together at 1.08; buttons, avatars, chips and picker focus are unchanged. Title shelves reserve vertical drawing room for the scaled ring. Before scaling the stroke, ring-to-neighbour clearances round to 28/22/16 px for poster/tile/wide cards; including stroke scale they are 27.6/21.8/16.1 px. -Cards use the approved option-B bottom state line instead of a separate inset -resume bar: watched is 3 px accent; resume is 6 px proportional accent over -`color.progressTrack`; unwatched and Discover have no line. Opaque background -backs the entire strip, including its bottom 2 px and the 2 px separator above -the fill. Artwork is clipped out of the backing band before painting it so -rounded-corner antialiasing cannot leak poster pixels into the lowest row. -The separately drawn focus ring stays above the line. - -Film subtitles are year + duration + a 24 px watched check, episode subtitles -are their own duration + check, and series subtitles are year + check with no -single runtime. Resuming cards have no check. The poster caption band remains -96 px; Home poster captions are focus-only. Home landscapes retain titles on -the art and reserve 64 px for focused metadata below it, making wide/tile shelf -pitches 522/441 px; poster shelves remain 632 px and grids remain 524 px. -Loading rows reserve the same blank caption bands and share one pulse layer; -only art-sized blocks are painted, with no title/subtitle placeholder pills. - -`CardBottomPixelTest` samples full native bottom rows on four real posters at -rest and individually focused, including white Annie Hall and dark Locke. -`CardGeometryTest` measures 210/327 px caption fitting, card-width titles, -24 px checks, row pitches, pinned rows and ring clearances to 0.1 px, and checks -that every reserved loading-caption pixel remains background-coloured. -`CardCaptionMotionTest` checks visible native glyph pixels when a still-focused -caption changes title directly or while moving across a Home shelf. -The [native option-B proof gallery](https://pages.justinvisser.org/wolfskin/tv-card-meta-build/) -contains the same illustrative watch-state data as the approved frames and -records renderer/fixture artifacts; unapproved design changes block merge. -`LibrarySpacingRegressionTest` retains the deep focused index across the -199↔200-title letter-rail boundary. +Poster progress uses the independent 18 px title-card inset, not caption spacing: +the track remains 220 px wide on a 256 px poster. Library focus-follow restarts +when the effective column count, focused row or header geometry changes, retaining +deep focus across live snapshots that add or remove the letter rail. +`LibrarySpacingRegressionTest` renders both progress geometry and the unchanged +focused index across the 199↔200-title boundary. `LibraryCaptureTest.spacingShowsFirstFocused`, `HomeCaptureTest.spacingNextUpFirstFocused` and @@ -614,76 +397,6 @@ These captures are recordings, not automated reference-pixel assertions; pair measurements are a separate check. Platform Roboto metrics and fixture ordering are not browser pixel parity. -### Shared focus rings - -The same `focusRing` stroke now covers pill/icon buttons (hero, title, state, -recovery and sheet actions), the nav avatar, picker people and gear. It is always -accent, 4 px / 2 dp wide, centred on the surface edge with no background gap. -The former outside-gap renderer is removed. The stroke draws after opaque -content, so neither half can be covered by the background or portrait. - -Control tokens are `Focus.ringControlGap = 0` and `ringControlRing = 2.dp`; -avatar and picker tokens use the same geometry. Existing scales remain 1.05 for -buttons and 1.08 for picker people/gear; the nav avatar remains unscaled. Card -and button lifts remain; avatars, people and gear gain no shadow. Existing -clearance accommodates the smaller outside reach without layout movement. - -Filled-only chips, nav pills, Settings/sheet/Coming-in rows and the A–Z rail -are unchanged. Selected-only chip/icon/radio borders and decorative borders -are not focus rings. These distinctions are explicit in the inventory and -reference states rather than silently adding rings to filled controls. - -`FocusRingTest.ringStraddlesOpaqueSurfaceAndDisappearsWithoutFocus` checks the -two outside and two inside pixels against opaque content for pill, circle and -card radii, including clearing the stroke on blur. The focused hero Details, -nav avatar, picker, Discover chip, Library toolbar chip and title Request -captures exercise the actual screens at 1920×1080. Browser and native glyph -metrics differ; their ring offsets are measured relative to each surface edge. - -### TV feedback corrections (spec revision 5) - -The [revision-5 amendment](../data/tv-spec/spec.md) and -[native frame prototype delta](../data/tv-v2/feedback-2026-11-06/index.html) -retain the approved frames except for the requested feedback changes: - -- The picker gear is centred under everyone and uses the picker-person ring. -- Shelf tracks share second-last-slot lookahead, count clamping and settled - offsets. Home records completed frame positioning rather than an animation - that may still be cancelled; first mount restores the intended shelf item. - Discover uses all six approved poster slots. Person keeps the final column - at full poster width. -- Episode images choose episode Primary, then Thumb, then the already-read - series Backdrop. Episode cards are 400×280 px; cast retains its 68 px clearance. - Episode context uses the episode overview, with two summary lines on the - focused card. Held-series headers measure their copy/actions and leave 40 px - before seasons instead of reserving a fixed empty 900 px header. -- Every Discover heading uses a 104 px band, including a 60 px title-to-card - gap. Home heading geometry is unchanged. -- Hero/backdrop decoding is bounded to 1920×1080; upright hero sheets request - 420×630. The shared request builder replaces conflicting Jellyfin size/encoding - parameters: cards use WebP quality 80, while hero backdrops/sheets retain JPEG - quality 96. Poster/tile/wide/episode requests are 256×384, 400×225, 544×306 and - 400×280; Jellyfin fill preserves aspect ratio before the UI crops. Tags and - authentication query parameters remain intact. TMDB uses w342 for posters and - portraits, w780 for landscape cards and w1280 for hero backdrops, never original. - Lossy WebP decoding is guaranteed below minSdk 23; API 28+ additionally checks - decoder support and requests JPEG if WebP is unavailable. The 64 MiB memory - cache, 128 MiB disk cache and four image-read limit remain unchanged. - -`HomeViewportTest` covers short/long poster, tile and wide rows, both row -directions, first focus and native Back from the actual title surface. Native -proof records real Bear season-three metadata through the title read facade; -the proof-only harness is not part of the shipped tests or APK. - -Episode lists request only ProviderIds and Overview. Next up reads only identity, -then hydrates the selected playback target through the existing single-item read, -including when Next up is empty. Media sources/streams and cast remain on detail -reads for header track/version controls. Performer credits omit media sources, -streams and ParentId but retain People because their cards show character roles. -Movies/Shows grids retain ProviderIds and DateCreated; server-side SortName -ordering does not require returning SortName on every item. - - ## Title pages and people `TitleSurface` owns the film/series/episode header, season chips, episode tiles, @@ -703,13 +416,6 @@ Selections persist through the same playback repository as the upstream player. Marking a whole series asks first; an explicit episode remains the exact play and watched target even while another season is selected. Nested person/title visits retain their entry's focus and selection state. -Choosing another episode from an episode page replaces only the top navigation -entry, preserving its series/Home parent. Choosing the first episode from a -series, related titles, cast and performer credits still push normal drill-ins. -Down into season chips initially focuses the selected playable season, including -offscreen later seasons; the row scrolls that chip into view and remembers -subsequent deliberate browsing. Saved title watch data cannot enable Play/Resume -or Restart before source revalidation. Hardware and remote Back share the sheet/picker/request-overlay precedence, then pop a pushed title/person from content **or** nav. Initial loading has no content target: Down stays in nav, while Back can still leave the title. A missing rating @@ -996,59 +702,6 @@ whose parent directory already exists. All callers sharing a volume must use the same lock path on the Docker host. Do not delete the file while builds are running or waiting. The lock releases automatically when the invocation exits. -## Persistent debug signing - -`make apk-debug` and non-release `docker/gradle.sh` invocations (including -`:app:assembleDefaultOptimized`) use one host keystore, outside the checkout: - -```text -/root/.treehouse/firstmate-7bab20/2/firstmate/data/signing/debug.keystore -``` - -Set `WOLFSKIN_DEBUG_KEYSTORE` to another file in a dedicated directory outside -the checkout when building on another host, for example: - -```sh -WOLFSKIN_DEBUG_KEYSTORE="$HOME/.local/share/wolfskin-signing/debug.keystore" make apk-debug -``` - -The wrapper creates a missing key once using the build image's `keytool`: RSA -2048, 10,000-day validity, alias `androiddebugkey`, store/key passwords `android`, -and subject `CN=Android Debug`. The containing directory is mode `0700`, the -file mode `0600`. Existing keys are reused, never regenerated; generation errors -abort the build rather than falling back to an ephemeral container key. -The file is bind-mounted read-only at `/tmp/.android/debug.keystore`, with -`ANDROID_USER_HOME=/tmp/.android`, for every non-release Gradle container. -Keep and back up this file across clean builds, disposable worktrees, container -rebuilds and Gradle cache resets. Never commit it. The standard debug passwords -are public; this key is for local debug/optimized builds, not release signing. - -### Preserve household TV data - -Install and update the household TV app only in place with `adb install -r`, -using the same package and persistent debug signer. Its certificate SHA-256 is: - -```text -182bac72e292b9ea4d3d4e6383f92eb2161fa28ba5afcff0337cb7d5a9d5341d -``` - -Never run `adb uninstall`, `pm uninstall` or `pm clear`, or switch signers on -the household box: clearing/removing the app deletes saved people, sign-ins -and settings, and a different signer cannot update the existing app in place. -Do not delete or replace the persistent key. If an uninstall is unavoidable, -use `adb uninstall -k ` to keep app data, then reinstall the same -package with the same signer. - -The manifest sets `android:hasFragileUserData="true"` so Android 10+ can offer -a **keep app data** choice during interactive uninstall. Choose it when -available; older Android versions ignore the attribute. This is a retention -prompt, not an automatic backup or a guarantee against data clearing. - -For an in-place update, compare `dumpsys package ` before and after: -`firstInstallTime` must remain unchanged. The guarded installer that checks -the signer and this timestamp lives in the operator's tooling, not this repo. - - ## Release credentials The default escrow is diff --git a/docker/gradle.sh b/docker/gradle.sh index 461018bc..b5624cbf 100755 --- a/docker/gradle.sh +++ b/docker/gradle.sh @@ -35,36 +35,5 @@ if [[ $mode == release ]]; then exec ./gradlew "$@" ' bash "${gradle_arguments[@]}" "$@" else - debug_keystore=$(realpath -m "${WOLFSKIN_DEBUG_KEYSTORE:-/root/.treehouse/firstmate-7bab20/2/firstmate/data/signing/debug.keystore}") - case "$debug_keystore" in - "$root"|"$root"/*) - printf 'Debug keystore must be outside the checkout: %s\n' "$debug_keystore" >&2 - exit 1 - ;; - esac - signing_directory=$(dirname "$debug_keystore") - mkdir -p "$signing_directory" - chmod 700 "$signing_directory" - if [[ ! -e $debug_keystore ]]; then - temporary_directory=$(mktemp -d "$signing_directory/.debug-keystore.XXXXXX") - trap 'rm -rf -- "$temporary_directory"' EXIT - if ! docker run --rm --platform linux/amd64 --user "$(id -u):$(id -g)" \ - --mount "type=bind,src=$temporary_directory,dst=/run/signing" \ - "$image" keytool -genkeypair -noprompt -keystore /run/signing/debug.keystore \ - -storetype JKS -storepass android -keypass android -alias androiddebugkey \ - -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Debug"; then - printf 'Failed to generate persistent debug keystore: %s\n' "$debug_keystore" >&2 - exit 1 - fi - chmod 600 "$temporary_directory/debug.keystore" - mv "$temporary_directory/debug.keystore" "$debug_keystore" - fi - if [[ ! -s $debug_keystore ]]; then - printf 'Missing or empty persistent debug keystore: %s\n' "$debug_keystore" >&2 - exit 1 - fi - chmod 600 "$debug_keystore" - arguments+=(--env ANDROID_USER_HOME=/tmp/.android - --mount "type=bind,src=$debug_keystore,dst=/tmp/.android/debug.keystore,readonly") docker run "${arguments[@]}" "$image" ./gradlew "${gradle_arguments[@]}" "$@" fi diff --git a/wolfskin-design/discover-tokens.json b/wolfskin-design/discover-tokens.json index bf45e265..83266ff5 100644 --- a/wolfskin-design/discover-tokens.json +++ b/wolfskin-design/discover-tokens.json @@ -1,6 +1,5 @@ { "discover": { - "shelfHeadingBand": {"dp": 52, "px": 104, "source": "feedback-2026-11-06: heading-to-card gap 60 px on every Discover lane"}, "sheetPaddingX": { "$type": "dimension", "px": 64, diff --git a/wolfskin-design/generate_tokens.py b/wolfskin-design/generate_tokens.py index e18bc364..51a49b20 100755 --- a/wolfskin-design/generate_tokens.py +++ b/wolfskin-design/generate_tokens.py @@ -32,7 +32,6 @@ def render_tokens(tokens: dict) -> tuple[str, str]: "// Generated by generate_tokens.py; edit the JSON sources instead.", "package org.justinvisser.wolfskin.design", "", - "import androidx.compose.animation.core.CubicBezierEasing", "import androidx.compose.ui.graphics.Color as ComposeColor", "import androidx.compose.ui.text.TextStyle", "import androidx.compose.ui.text.font.FontWeight", @@ -72,10 +71,6 @@ def render_tokens(tokens: dict) -> tuple[str, str]: elif kind == "duration": lines.append(f" const val {name} = {int(value.removesuffix('ms'))}") css.append(f" --{group_name}-{name}: {value};") - elif kind == "cubicBezier": - points = ", ".join(f"{number(point)}f" for point in value) - lines.append(f" val {name} = CubicBezierEasing({points})") - css.append(f" --{group_name}-{name}: cubic-bezier({', '.join(map(str, value))});") elif kind == "transition" and value.get("type") == "spring": lines.append(f" const val {name}DampingRatio = {number(value['dampingRatio'])}f") lines.append(f" const val {name}Stiffness = {number(value['stiffness'])}f") diff --git a/wolfskin-design/home-tokens.json b/wolfskin-design/home-tokens.json index 7cceeaa7..a574a31d 100644 --- a/wolfskin-design/home-tokens.json +++ b/wolfskin-design/home-tokens.json @@ -114,6 +114,12 @@ "dp": 18.0, "source": "locked index.html:94-165,180-198,1014-1029,1276-1289" }, + "captionWidth": { + "$type": "dimension", + "px": 640, + "dp": 320.0, + "source": "locked index.html:94-165,180-198,1014-1029,1276-1289" + }, "plateTop": { "$type": "dimension", "px": 14, @@ -234,6 +240,18 @@ "dp": 30.0, "source": "locked index.html:94-165,180-198,1014-1029,1276-1289" }, + "progressInset": { + "$type": "dimension", + "px": 18, + "dp": 9.0, + "source": "locked index.html:94-165,180-198,1014-1029,1276-1289" + }, + "progressBottom": { + "$type": "dimension", + "px": 10, + "dp": 5.0, + "source": "locked index.html:94-165,180-198,1014-1029,1276-1289" + }, "endTop": { "$type": "dimension", "px": 40, @@ -298,6 +316,7 @@ "savedPadding": { "$type": "dimension", "px": 20, "dp": 10.0, "source": "locked index.html:87" }, "savedGap": { "$type": "dimension", "px": 10, "dp": 5.0, "source": "locked index.html:87" }, "savedIcon": { "$type": "dimension", "px": 28, "dp": 14.0, "source": "locked index.html:88" }, - "savedRadius": { "$type": "dimension", "px": 28, "dp": 14.0, "source": "locked index.html:87" } + "savedRadius": { "$type": "dimension", "px": 28, "dp": 14.0, "source": "locked index.html:87" }, + "posterProgressBottom": { "$type": "dimension", "px": 12, "dp": 6.0, "source": "locked index.html:138-140" } } } diff --git a/wolfskin-design/shell-tokens.json b/wolfskin-design/shell-tokens.json index 3c29b7ae..e66ac6ec 100644 --- a/wolfskin-design/shell-tokens.json +++ b/wolfskin-design/shell-tokens.json @@ -367,6 +367,9 @@ "chipGap": {"$type":"dimension","px":16,"dp":8,"source":"index.html:184-185"}, "chipTop": {"$type":"dimension","px":16,"dp":8,"source":"index.html:184"}, "chipIcon": {"$type":"dimension","px":26,"dp":13,"source":"index.html:185"}, + "captionWidth": {"$type":"dimension","px":640,"dp":320,"source":"index.html:151"}, + "captionSeparatorOpacity": {"$type":"number","$value":0.4,"source":"index.html:1207; spec 4.4"}, + "captionFactsGap": {"$type":"dimension","px":18,"dp":9,"source":"index.html:154"}, "badgeIcon": {"$type":"dimension","px":28,"dp":14,"source":"index.html:142"}, "plateTop": {"$type":"dimension","px":14,"dp":7,"source":"index.html:162"}, "plateSide": {"$type":"dimension","px":16,"dp":8,"source":"index.html:162"}, diff --git a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/Caption.kt b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/Caption.kt index 065e26e4..5f9a0742 100644 --- a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/Caption.kt +++ b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/Caption.kt @@ -1,34 +1,72 @@ package org.justinvisser.wolfskin.design import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.CubicBezierEasing import androidx.compose.animation.core.tween import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.text.TextStyle import androidx.tv.material3.Text +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.ui.draw.clipToBounds +import androidx.compose.ui.layout.Layout +import androidx.compose.ui.unit.constrainHeight -/** Captions rise inside the reserved band without changing measured geometry. */ +/** Captions fade without moving the reserved band under the focused poster. */ @Composable -fun Caption(title: String, facts: String, visible: Boolean, modifier: Modifier = Modifier) { +fun Caption(title: String, facts: String, visible: Boolean, modifier: Modifier = Modifier, accentLastFact: Boolean = false, accentFirstFact: Boolean = false, + titleStyle: TextStyle = WolfskinTokens.Type.button, factsStyle: TextStyle = WolfskinTokens.Type.caption, + titleOverflow: TextOverflow = TextOverflow.Ellipsis) { val alpha = remember(title, facts) { Animatable(0f) } - val entryProgress = remember(title, facts) { mutableFloatStateOf(0f) } - val reduced = reducedMotion() - val rise = with(androidx.compose.ui.platform.LocalDensity.current) { WolfskinTokens.Motion.captionRise.toPx() } - LaunchedEffect(alpha, visible, reduced) { - if (visible && !reduced) kotlinx.coroutines.delay(WolfskinTokens.Motion.captionDelay.toLong()) - alpha.animateTo(if (visible) 1f else 0f, tween(motionDuration(if (visible) WolfskinTokens.Motion.focusMove else WolfskinTokens.Motion.captionOut, reduced), easing = WolfskinTokens.Motion.easeOut)) { - if (visible) entryProgress.floatValue = value - } + LaunchedEffect(alpha, visible) { + alpha.animateTo(if (visible) 1f else 0f, tween(WolfskinTokens.Motion.fast, easing = CubicBezierEasing(.25f, .1f, .25f, 1f))) } - val titleStyle = WolfskinTokens.Type.button - val factsStyle = WolfskinTokens.Type.caption - Column(modifier.graphicsLayer { this.alpha = alpha.value; translationY = if (reduced) 0f else rise * (1f - entryProgress.floatValue) }) { - Text(title, color = WolfskinTokens.Color.fg, style = titleStyle, modifier = Modifier.exactLineBox(titleStyle), maxLines = 1, overflow = TextOverflow.Ellipsis) - Text(facts, color = WolfskinTokens.Color.muted, style = factsStyle, modifier = Modifier.exactLineBox(factsStyle), maxLines = 1, overflow = TextOverflow.Ellipsis) + Column(modifier.graphicsLayer { this.alpha = alpha.value }) { + Text(title, color = WolfskinTokens.Color.fg, style = titleStyle, modifier = Modifier.exactLineBox(titleStyle), maxLines = 1, overflow = titleOverflow) + CaptionFacts(facts, accentFirstFact, accentLastFact, factsStyle) + } +} + +/** CSS flex facts: only coloured role/ownership spans shrink; ordinary facts and dots keep their width. */ +@Composable +private fun CaptionFacts(facts: String, accentFirst: Boolean, accentLast: Boolean, style: TextStyle) { + val parts = remember(facts) { facts.split(" · ") } + val muted = WolfskinTokens.Color.muted + val colour = WolfskinTokens.Color.accentText + Layout( + content = { + parts.forEachIndexed { index, part -> + val accented = (index == 0 && accentFirst) || (index == parts.lastIndex && accentLast) + Text(part, color = if (accented) colour else muted, style = style, modifier = Modifier.exactLineBox(style), maxLines = 1, overflow = TextOverflow.Clip) + if (index != parts.lastIndex) Text("·", color = muted.copy(alpha = muted.alpha * WolfskinTokens.Library.captionSeparatorOpacity), style = style, modifier = Modifier.exactLineBox(style)) + } + }, + modifier = Modifier.fillMaxWidth().clipToBounds(), + ) { children, constraints -> + val gap = WolfskinTokens.Library.captionFactsGap.roundToPx() + val basis = IntArray(children.size) + var fixed = gap * (children.size - 1).coerceAtLeast(0) + var flexible = 0 + fun shrinks(index: Int) = (index == 0 && accentFirst) || (index == children.lastIndex && accentLast) + children.forEachIndexed { index, child -> + val width = child.maxIntrinsicWidth(constraints.maxHeight) + basis[index] = width + if (shrinks(index)) flexible += width else fixed += width + } + val available = (constraints.maxWidth - fixed).coerceAtLeast(0) + val ratio = if (flexible > available) available.toFloat() / flexible else 1f + val measured = children.mapIndexed { index, child -> + val width = if (shrinks(index)) (basis[index] * ratio).toInt() else basis[index] + child.measure(constraints.copy(minWidth = 0, maxWidth = width, minHeight = 0)) + } + layout(constraints.maxWidth, constraints.constrainHeight(measured.maxOfOrNull { it.height } ?: 0)) { + var x = 0 + measured.forEach { child -> child.placeRelative(x, 0); x += child.width + gap } + } } } diff --git a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/CardCaption.kt b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/CardCaption.kt deleted file mode 100644 index 9d6f28a8..00000000 --- a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/CardCaption.kt +++ /dev/null @@ -1,81 +0,0 @@ -package org.justinvisser.wolfskin.design - -import androidx.compose.animation.core.Animatable -import androidx.compose.animation.core.tween -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.size -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.remember -import androidx.compose.runtime.mutableFloatStateOf -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clipToBounds -import androidx.compose.ui.graphics.graphicsLayer -import androidx.compose.ui.layout.Layout -import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.unit.Constraints -import androidx.compose.ui.res.painterResource -import androidx.tv.material3.Icon -import androidx.tv.material3.Text -import org.justinvisser.wolfskin.design.WolfskinTokens.CardMetadata as M -import org.justinvisser.wolfskin.design.WolfskinTokens.Color as C - -/** Card-width titles never displace runtime or watched metadata into a neighbouring slot. */ -@Composable -fun CardCaption(title: String, year: Int?, duration: String?, watched: Boolean, focused: Boolean, - modifier: Modifier = Modifier, focusOnly: Boolean = false, showTitle: Boolean = true) { - val transition = if (focusOnly) { - val alpha = remember(title) { Animatable(0f) } - val entryProgress = remember(title) { mutableFloatStateOf(0f) } - val reduced = reducedMotion() - val rise = with(LocalDensity.current) { WolfskinTokens.Motion.captionRise.toPx() } - LaunchedEffect(alpha, focused, reduced) { - if (focused && !reduced) kotlinx.coroutines.delay(WolfskinTokens.Motion.captionDelay.toLong()) - alpha.animateTo(if (focused) 1f else 0f, tween(motionDuration(if (focused) WolfskinTokens.Motion.focusMove else WolfskinTokens.Motion.captionOut, reduced), easing = WolfskinTokens.Motion.easeOut)) { - if (focused) entryProgress.floatValue = value - } - } - Modifier.graphicsLayer { - this.alpha = alpha.value - translationY = if (reduced) 0f else rise * (1f - entryProgress.floatValue) - } - } else Modifier - Column(modifier.then(transition)) { - if (showTitle) { - val style = if (focused || focusOnly) M.titleFocus else M.titleRest - Text(title, color = if (focused || focusOnly) C.fg else C.muted, style = style, - modifier = Modifier.fillMaxWidth().exactLineBox(style), maxLines = 1, overflow = TextOverflow.Ellipsis) - } - CardMetadata(year, duration, watched) - } -} - -/** Measured gaps tighten before any fixed-size year, runtime or check can be clipped. */ -@Composable -fun CardMetadata(year: Int?, duration: String?, watched: Boolean, modifier: Modifier = Modifier) { - Layout(content = { - if (year != null) Text(year.toString(), color = C.muted, style = M.subtitle, modifier = Modifier.exactLineBox(M.subtitle), maxLines = 1) - if (duration != null) Text(duration, color = C.muted, style = M.subtitle, modifier = Modifier.exactLineBox(M.subtitle), maxLines = 1) - if (watched) Icon(painterResource(R.drawable.card_watched_check), "Watched", Modifier.size(M.check), tint = C.muted) - }, modifier = modifier.fillMaxWidth().clipToBounds()) { children, constraints -> - val sizes = IntArray(children.size) { children[it].maxIntrinsicWidth(constraints.maxHeight) } - val gaps = (children.size - 1).coerceAtLeast(0) - val textWidth = sizes.sum() - val gap = when { - textWidth + gaps * M.gap.roundToPx() <= constraints.maxWidth -> M.gap.roundToPx() - textWidth + gaps * M.compactGap.roundToPx() <= constraints.maxWidth -> M.compactGap.roundToPx() - else -> M.minimumGap.roundToPx() - } - val measured = Array(children.size) { children[it].measure(Constraints.fixedWidth(sizes[it])) } - val height = with(this) { M.subtitle.lineHeight.toPx().toInt() } - layout(constraints.maxWidth, height) { - var left = 0 - measured.forEach { child -> - child.placeRelative(left, (height - child.height) / 2) - left += child.width + gap - } - } - } -} diff --git a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/CatalogueRecoveryCard.kt b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/CatalogueRecoveryCard.kt index 4c7e5f8d..b2bb7ca4 100644 --- a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/CatalogueRecoveryCard.kt +++ b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/CatalogueRecoveryCard.kt @@ -23,7 +23,7 @@ fun CatalogueRecoveryCard(retry: Boolean, focused: Boolean, onClick: () -> Unit, val shape = RoundedCornerShape(WolfskinTokens.Radius.card) Column(modifier.size(WolfskinTokens.Card.posterW, WolfskinTokens.Card.posterH) .focusScale(focused, WolfskinTokens.Focus.scaleCard) - .focusRing(focused, WolfskinTokens.Radius.card, WolfskinTokens.Focus.ringCardRing, FocusLift.Card) + .focusRing(focused, WolfskinTokens.Radius.card, WolfskinTokens.Focus.ringCardGap, WolfskinTokens.Focus.ringCardRing, C.accent, FocusLift.Card, straddle = true) .background(C.surface, shape).border(G.borderWidth, C.border, shape).clickable(onClick = onClick).padding(G.tailPadding), verticalArrangement = Arrangement.spacedBy(G.tailGap, Alignment.CenterVertically), horizontalAlignment = Alignment.CenterHorizontally) { Glyph(if (retry) "alert" else "down", if (retry) C.warn else C.accentText, Modifier.size(G.tailIcon)) diff --git a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/ComingInSheet.kt b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/ComingInSheet.kt index d02b4835..23c5c596 100644 --- a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/ComingInSheet.kt +++ b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/ComingInSheet.kt @@ -157,8 +157,7 @@ fun ComingInRow(item: ComingInRequest, viewer: ShellPerson, focused: Boolean, ex Column(Modifier.weight(1f)) { Text(item.title, Modifier.comingInLineBox(T.titleLineHeight, T.titleBaseline), style = ComingInTypography.listTitle, color = foreground, maxLines = 1, overflow = TextOverflow.Ellipsis) - val actor = item.actor(viewer) - Text("for ${item.recipient(viewer)}" + (actor?.let { " · by $it" } ?: ""), Modifier.comingInLineBox(T.factsLineHeight, T.factsBaseline), + Text("for ${item.recipient(viewer)} · by ${item.actor(viewer)}", Modifier.comingInLineBox(T.factsLineHeight, T.factsBaseline), style = ComingInTypography.caption, color = secondary) FlowRow(Modifier.padding(top = T.stageMargin).heightIn(min = T.stageLineHeight), horizontalArrangement = Arrangement.spacedBy(T.readinessGlyph)) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(T.stageGap)) { @@ -169,17 +168,14 @@ fun ComingInRow(item: ComingInRequest, viewer: ShellPerson, focused: Boolean, ex } if (expanded) FlowRow(Modifier.padding(top = T.readinessMargin), horizontalArrangement = Arrangement.spacedBy(T.readinessGapX), verticalArrangement = Arrangement.spacedBy(T.readinessGapY)) { - item.readiness.forEachIndexed { index, word -> + item.stage.readiness.forEachIndexed { index, word -> Row { - val glyph = when (word) { "Done", "Files present", "Recorded play", "Another library" -> "check"; "Failed", "Check needed", "Needs attention" -> "alert"; "Not yet", "Unknown", "Not checked yet", "Not in library", "Removed", "Not out yet" -> null; else -> "clock" } + val glyph = when (word) { "Done" -> "check"; "Failed" -> "alert"; "Not yet", "Unknown" -> null; else -> "clock" } if (glyph != null) Glyph(glyph, secondary, Modifier.size(T.readinessGlyph).alignBy { it.measuredHeight }) Text("${READINESS_NAMES[index]} · $word", Modifier.alignByBaseline(), style = ComingInTypography.readiness, color = secondary) } } } - if (expanded) item.summary?.let { summary -> - Text(summary, Modifier.padding(top = T.readinessMargin), style = ComingInTypography.readiness, color = secondary) - } } if (focused && !expanded) Glyph("right", foreground.copy(alpha = T.chevronAlpha), Modifier.size(T.chevron)) } diff --git a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/ComingInState.kt b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/ComingInState.kt index feddf7b8..f8aa27df 100644 --- a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/ComingInState.kt +++ b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/ComingInState.kt @@ -6,21 +6,14 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import kotlinx.coroutines.delay -/** History states distinguish acquisition work from library evidence and playback health. */ +/** Household acquisition stages, ordered independently from their display wording. */ enum class ComingInStage(val label: String, val rank: Int, val glyph: String, val readiness: List) { Failed("Failed", 0, "alert", listOf("Done", "Failed", "Not yet", "Not yet")), - FileHealth("File health needs attention", 0, "alert", listOf("Done", "Files present", "See details", "Needs attention")), - CheckNeeded("Check needed", 0, "alert", listOf("Done", "Files present", "Check needed", "Not checked yet")), Downloading("Downloading", 1, "download", listOf("Done", "Downloading", "Not yet", "Not yet")), AlmostReady("Almost ready", 1, "download", listOf("Done", "Done", "Being added", "Not yet")), Checking("Checking", 2, "clock", listOf("Checking", "Unknown", "Not yet", "Not yet")), Searching("Searching", 2, "clock", listOf("Done", "Searching", "Not yet", "Not yet")), Waiting("Waiting", 3, "clock", listOf("Waiting", "Not yet", "Not yet", "Not yet")), - WaitingForFile("Waiting for a file", 3, "clock", listOf("Done", "Waiting for a file", "Not yet", "Not checked yet")), - NotOutYet("Not out yet", 3, "clock", listOf("Done", "Not out yet", "Not yet", "Not checked yet")), - HeldElsewhere("In another library", 4, "check", listOf("Done", "Files present", "Another library", "Not checked yet")), - Removed("Removed", 4, "clock", listOf("Done", "Removed", "Not in library", "Not checked yet")), - NotInLibrary("Not in any library", 4, "clock", listOf("Done", "Not observed", "Not in library", "Not checked yet")), Ready("Ready", 4, "check", listOf("Done", "Done", "Done", "Not checked yet")), } @@ -40,15 +33,13 @@ data class ComingInRequest( val stage: ComingInStage, val poster: Any? = null, val ratings: List = emptyList(), - val summary: String? = null, - val readiness: List = stage.readiness, ) { val ratingKey = "$mediaType:$tmdbId" fun recipient(viewer: ShellPerson): String = if (requesterKey == viewer.key) "you" else requesterName - fun actor(viewer: ShellPerson): String? = when { + fun actor(viewer: ShellPerson): String = when { actorKey == "shared" -> "Shared" actorKey != null && actorKey == viewer.key -> "you" - else -> actorName?.takeIf { it.isNotBlank() } + else -> actorName ?: "Unknown" } } @@ -63,13 +54,7 @@ data class ComingInSnapshot( val savedAt: String? = null, ) { val ordered = items.sortedBy { it.stage.rank } - val requestCount: Int? get() = if (status == ComingInStatus.Ready || items.isNotEmpty()) items.size else null - val hasUnsettledRequests: Boolean get() = items.any { - when (it.stage) { - ComingInStage.Ready, ComingInStage.Removed, ComingInStage.NotInLibrary, ComingInStage.HeldElsewhere, ComingInStage.NotOutYet -> false - else -> true - } - } + val openCount: Int get() = items.count { it.stage != ComingInStage.Ready } } /** A bounded window and stable request id preserve focus across refreshes and title round trips. */ diff --git a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverArtwork.kt b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverArtwork.kt index 905deb57..92e63ad9 100644 --- a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverArtwork.kt +++ b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverArtwork.kt @@ -50,23 +50,15 @@ fun DiscoverArtwork(path: String?, modifier: Modifier, poster: Boolean = false, this *= ColorMatrix().apply { setToScale(D.ambientBrightness, D.ambientBrightness, D.ambientBrightness, 1f) } }) else null } val context = LocalContext.current - val request = remember(context, path, poster, dim) { - val upright = poster || dim - WolfskinImages.request(context, path, - if (upright) WolfskinTokens.Image.heroPosterRequestWidth else WolfskinTokens.Image.heroRequestWidth, - if (upright) WolfskinTokens.Image.heroPosterRequestHeight else WolfskinTokens.Image.heroRequestHeight, upright) - } - val heroReady = LocalHeroArtReady.current - if (painter != null) { - androidx.compose.runtime.SideEffect { heroReady?.invoke() } - Image(painter, null, modifier, contentScale = ContentScale.Crop, colorFilter = filter) + val request = remember(context, path, poster) { + WolfskinImages.request(context, path, if (poster) 256 else 1280, if (poster) 384 else 720, poster) } + if (painter != null) Image(painter, null, modifier, contentScale = ContentScale.Crop, colorFilter = filter) else AsyncImage( model = request, imageLoader = WolfskinImages.loader(context), contentDescription = null, modifier = modifier, contentScale = ContentScale.Crop, colorFilter = filter, onError = { onError() }, - onSuccess = { heroReady?.invoke() }, ) } @@ -75,11 +67,7 @@ fun DiscoverArtwork(path: String?, modifier: Modifier, poster: Boolean = false, fun DiscoverBackdrop(title: DiscoverTitle, detail: Boolean = false, modifier: Modifier = Modifier) { val failed = remember(title.poster, title.backdrop) { androidx.compose.runtime.mutableStateOf(false) } Box(modifier.size(WolfskinTokens.Shell.stageWidth, WolfskinTokens.Shell.stageHeight).clipToBounds().background(C.surface3)) { - if (failed.value || (title.poster == null && title.backdrop == null)) { - val heroReady = LocalHeroArtReady.current - androidx.compose.runtime.SideEffect { heroReady?.invoke() } - HomeAmbient(Modifier.fillMaxSize().testTag("discover-missing-art")) - } + if (failed.value || (title.poster == null && title.backdrop == null)) HomeAmbient(Modifier.fillMaxSize().testTag("discover-missing-art")) else if (title.posterOnly) { DiscoverArtwork(title.poster, Modifier.offset(-D.ambientInset, -D.ambientInset) .wrapContentSize(Alignment.TopStart, unbounded = true) diff --git a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverFixture.kt b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverFixture.kt index 2136e5ed..396a5862 100644 --- a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverFixture.kt +++ b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverFixture.kt @@ -35,8 +35,7 @@ class DiscoverFixture(json: String, private val artPath: (String) -> String = { val items = pool.filter { genre in normalizedGenres(it.genres) && (genre !in setOf("Science Fiction", "Horror", "Romance") || it.type == "movie") } DiscoverLane("genre-$genre", genre, items.take(20), items.size, fullTitles = items) } - return DiscoverSnapshot(picks, groups.map { (key, group) -> DiscoverSeed(key, group.first, group.second.toList(), watched = true, added = false) }, - services, lanes, status = DiscoverStatus.Ready, reusesFixtureLanes = true) + return DiscoverSnapshot(picks, groups.values.map { DiscoverSeed(it.first, it.second.toList()) }, services, lanes, status = DiscoverStatus.Ready, reusesFixtureLanes = true) } fun service(service: DiscoverService, type: String): List { diff --git a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverLaneProjection.kt b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverLaneProjection.kt index 9558b735..cd66673f 100644 --- a/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverLaneProjection.kt +++ b/wolfskin-design/src/main/java/org/justinvisser/wolfskin/design/DiscoverLaneProjection.kt @@ -10,9 +10,7 @@ internal fun projectDiscoverLanes(snapshot: DiscoverSnapshot, heroes: List() fun take(items: List, limit: Int) = items.filter { matches(it) && it.key !in hidden && it.key !in seen }.take(limit).filter { seen.add(it.key) } if (snapshot.status == DiscoverStatus.Ready) { - val groups = snapshot.seeds.asSequence().filter { it.watched && it.title.isNotBlank() } - .map { seed -> seed.copy(items = seed.items.filter { matches(it) && it.key !in hidden }) } - .filter { it.items.isNotEmpty() }.take(3).toList() + val groups = snapshot.seeds.map { seed -> seed.copy(items = seed.items.filter { matches(it) && it.key !in hidden }) }.filter { it.items.isNotEmpty() }.take(3) for ((type, name) in listOf("movie" to "Movies", "tv" to "Series")) { val all = snapshot.picks.filter { it.type == type && matches(it) && it.key !in hidden } val count = all.count { it.key !in seen } @@ -20,9 +18,9 @@ internal fun projectDiscoverLanes(snapshot: DiscoverSnapshot, heroes: List