diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/SeerrService.kt b/app/src/main/java/com/github/damontecres/wholphin/services/SeerrService.kt index d60988a2af..038aa95745 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/services/SeerrService.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/services/SeerrService.kt @@ -11,12 +11,14 @@ import com.github.damontecres.wholphin.api.seerr.model.SearchGet200ResponseResul import com.github.damontecres.wholphin.api.seerr.model.ServiceProfile import com.github.damontecres.wholphin.api.seerr.model.TvDetails import com.github.damontecres.wholphin.api.seerr.model.TvResult +import com.github.damontecres.wholphin.api.seerr.model.WatchProviders import com.github.damontecres.wholphin.data.model.BaseItem import com.github.damontecres.wholphin.data.model.DiscoverItem import com.github.damontecres.wholphin.data.model.SeerrAvailability import com.github.damontecres.wholphin.data.model.SeerrItemType import com.github.damontecres.wholphin.data.model.SeerrPermission import com.github.damontecres.wholphin.data.model.hasPermission +import com.github.damontecres.wholphin.ui.components.WatchProviderDisplay import com.github.damontecres.wholphin.ui.detail.discover.SeerrProfile import com.github.damontecres.wholphin.ui.detail.discover.SeerrRequestData import com.github.damontecres.wholphin.ui.detail.discover.SeerrRootFolder @@ -28,6 +30,7 @@ import kotlinx.coroutines.flow.firstOrNull import org.jellyfin.sdk.model.api.BaseItemKind import org.jellyfin.sdk.model.api.ImageType import org.jellyfin.sdk.model.serializer.toUUIDOrNull +import java.util.Locale import java.util.UUID import javax.inject.Inject import javax.inject.Singleton @@ -227,6 +230,18 @@ class SeerrService } } + suspend fun createWatchProviderDisplays(providers: List?): List { + val current = seerrServerRepository.current.firstOrNull() ?: return emptyList() + val base = + if (current.serverConfig.cacheImages == true) { + current.server.url.removeSuffix("/") + "/imageproxy/tmdb" + } else { + "https://image.tmdb.org" + } + + return mapWatchProviderDisplays(providers, base) + } + suspend fun getProfilesAndFolders(type: SeerrItemType): SeerrRequestData { var result = SeerrRequestData() val current = seerrServerRepository.current.firstOrNull() @@ -499,6 +514,39 @@ class SeerrService ) } +/** + * Select the most appropriate watch-provider region for the supplied locale. + * + * The locale's country is preferred, followed by the US region and then the first available + * region. Returns null when no watch-provider regions are available. + */ +internal fun mapWatchProviderDisplays( + providers: List?, + imageBaseUrl: String, +): List = + providers + .selectWatchProviderRegion() + ?.flatrate + .orEmpty() + .mapNotNull { provider -> + val logoPath = + provider.logoPath?.takeIf { it.isNotBlank() } + ?: return@mapNotNull null + WatchProviderDisplay( + name = provider.name, + logoUrl = "$imageBaseUrl/t/p/w92$logoPath", + ) + }.distinctBy { it.logoUrl } + +fun List?.selectWatchProviderRegion(locale: Locale = Locale.getDefault()): WatchProviders? { + val regions = orEmpty() + val country = locale.country.takeIf { it.isNotBlank() } + + return regions.firstOrNull { it.iso31661.equals(country, ignoreCase = true) } + ?: regions.firstOrNull { it.iso31661.equals(Locale.US.country, ignoreCase = true) } + ?: regions.firstOrNull() +} + val MediaInfo.jellyfinId: UUID? get() = jellyfinMediaId4k?.toUUIDOrNull() ?: jellyfinMediaId?.toUUIDOrNull() diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/components/WatchProvidersRow.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/components/WatchProvidersRow.kt new file mode 100644 index 0000000000..be3369e469 --- /dev/null +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/components/WatchProvidersRow.kt @@ -0,0 +1,98 @@ +package com.github.damontecres.wholphin.ui.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.tv.material3.MaterialTheme +import androidx.tv.material3.Text +import coil3.compose.AsyncImage +import coil3.request.ImageRequest +import com.github.damontecres.wholphin.R + +data class WatchProviderDisplay( + val name: String?, + val logoUrl: String, +) + +@Composable +fun WatchProvidersRow( + providers: List, + modifier: Modifier = Modifier, +) { + if (providers.isEmpty()) return + + Column( + verticalArrangement = Arrangement.spacedBy(8.dp), + modifier = modifier, + ) { + Text( + text = stringResource(R.string.currently_streaming_on), + style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.onSurface, + ) + FlowRow( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(12.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + providers.forEach { provider -> + WatchProviderLogo(provider) + } + } + } +} + +@Composable +private fun WatchProviderLogo( + provider: WatchProviderDisplay, + modifier: Modifier = Modifier, +) { + AsyncImage( + model = + ImageRequest + .Builder(LocalContext.current) + .data(provider.logoUrl) + .build(), + contentDescription = provider.name, + contentScale = ContentScale.Crop, + modifier = + modifier + .size(30.dp) + .clip(RoundedCornerShape(10.dp)) + .background(MaterialTheme.colorScheme.surfaceVariant), + ) +} + +@Preview(showBackground = true, backgroundColor = 11119017) +@Composable +private fun WatchProvidersRowPreview() { + WatchProvidersRow( + providers = + listOf( + WatchProviderDisplay( + name = "Netflix", + logoUrl = "https://upload.wikimedia.org/wikipedia/commons/0/08/Netflix_2015_logo.svg", + ), + WatchProviderDisplay( + name = "HBO Max", + logoUrl = "https://upload.wikimedia.org/wikipedia/commons/1/17/HBO_Max_Logo.svg", + ), + WatchProviderDisplay( + name = "Disney+", + logoUrl = "https://upload.wikimedia.org/wikipedia/commons/3/3e/Disney%2B_logo.svg", + ), + ), + ) +} diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/data/ItemDetailsDialogInfo.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/data/ItemDetailsDialogInfo.kt index 08bd0c55c7..73eeb816d5 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/data/ItemDetailsDialogInfo.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/data/ItemDetailsDialogInfo.kt @@ -22,6 +22,8 @@ import com.github.damontecres.wholphin.R import com.github.damontecres.wholphin.data.model.BaseItem import com.github.damontecres.wholphin.data.model.studioNames import com.github.damontecres.wholphin.ui.components.ScrollableDialog +import com.github.damontecres.wholphin.ui.components.WatchProviderDisplay +import com.github.damontecres.wholphin.ui.components.WatchProvidersRow import com.github.damontecres.wholphin.ui.formatBitrate import com.github.damontecres.wholphin.ui.formatBytes import com.github.damontecres.wholphin.ui.formatDate @@ -47,6 +49,7 @@ data class ItemDetailsDialogInfo( val files: List, val studios: List = emptyList(), val lastPlayed: LocalDateTime? = null, + val watchProviders: List = emptyList(), ) { constructor(item: BaseItem) : this( title = item.name ?: "", @@ -109,6 +112,9 @@ fun ItemDetailsDialog( style = MaterialTheme.typography.bodyMedium, ) } + if (info.watchProviders.isNotEmpty()) { + WatchProvidersRow(providers = info.watchProviders) + } val lastPlayed = remember(info.lastPlayed) { info.lastPlayed?.let { formatDate(it) } } if (lastPlayed != null) { diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetails.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetails.kt index 612c35a01a..c0471e2dac 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetails.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetails.kt @@ -132,6 +132,7 @@ fun DiscoverMovieDetails( overview = movie.overview, genres = movie.genres?.mapNotNull { it.name }.orEmpty(), files = listOf(), + watchProviders = state.watchProviders, ) }, goToOnClick = { diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetailsHeader.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetailsHeader.kt index 1c0915ec33..0b0f23f057 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetailsHeader.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetailsHeader.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.relocation.BringIntoViewRequester import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieViewModel.kt index 1728029803..dbc9fb6738 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieViewModel.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieViewModel.kt @@ -22,6 +22,7 @@ import com.github.damontecres.wholphin.services.NavigationManager import com.github.damontecres.wholphin.services.SeerrServerRepository import com.github.damontecres.wholphin.services.SeerrService import com.github.damontecres.wholphin.services.SeerrUserConfig +import com.github.damontecres.wholphin.ui.components.WatchProviderDisplay import com.github.damontecres.wholphin.ui.equalsNotNull import com.github.damontecres.wholphin.ui.isNotNullOrBlank import com.github.damontecres.wholphin.ui.launchDefault @@ -85,7 +86,14 @@ class DiscoverMovieViewModel viewModelScope.async(WholphinDispatchers.IO) { try { val movie = seerrService.api.moviesApi.movieMovieIdGet(movieId = item.id) - _state.update { it.copy(movie = DataLoadingState.Success(movie)) } + val watchProviders = + seerrService.createWatchProviderDisplays(movie.watchProviders) + _state.update { + it.copy( + movie = DataLoadingState.Success(movie), + watchProviders = watchProviders, + ) + } movie } catch (ex: CancellationException) { throw ex @@ -100,7 +108,14 @@ class DiscoverMovieViewModel Timber.v("Init for movie %s", item.id) try { val movie = seerrService.api.moviesApi.movieMovieIdGet(movieId = item.id) - _state.update { it.copy(movie = DataLoadingState.Success(movie)) } + val watchProviders = + seerrService.createWatchProviderDisplays(movie.watchProviders) + _state.update { + it.copy( + movie = DataLoadingState.Success(movie), + watchProviders = watchProviders, + ) + } val discoveredItem = seerrService.createDiscoverItem(movie) backdropService.submit(discoveredItem) @@ -279,6 +294,7 @@ fun canUserCancelRequest( data class DiscoverMovieState( val movie: DataLoadingState = DataLoadingState.Pending, + val watchProviders: List = emptyList(), val rating: DiscoverRating? = null, val seasons: List = emptyList(), val trailers: List = emptyList(), diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt index afafbd2f71..09b08fcdf9 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt @@ -136,6 +136,7 @@ fun DiscoverSeriesDetails( overview = item.overview, genres = item.genres?.mapNotNull { it.name }.orEmpty(), files = listOf(), + watchProviders = state.watchProviders, ) }, trailerOnClick = { diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesViewModel.kt index ab89b16dac..6c7d1dd38c 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesViewModel.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesViewModel.kt @@ -20,6 +20,7 @@ import com.github.damontecres.wholphin.services.BackdropService import com.github.damontecres.wholphin.services.NavigationManager import com.github.damontecres.wholphin.services.SeerrServerRepository import com.github.damontecres.wholphin.services.SeerrService +import com.github.damontecres.wholphin.ui.components.WatchProviderDisplay import com.github.damontecres.wholphin.ui.isNotNullOrBlank import com.github.damontecres.wholphin.ui.launchDefault import com.github.damontecres.wholphin.ui.launchIO @@ -89,7 +90,14 @@ class DiscoverSeriesViewModel viewModelScope.async(WholphinDispatchers.IO) { try { val tv = seerrService.api.tvApi.tvTvIdGet(tvId = item.id) - _state.update { it.copy(tvSeries = DataLoadingState.Success(tv)) } + val watchProviders = + seerrService.createWatchProviderDisplays(tv.watchProviders) + _state.update { + it.copy( + tvSeries = DataLoadingState.Success(tv), + watchProviders = watchProviders, + ) + } tv } catch (ex: CancellationException) { throw ex @@ -104,7 +112,14 @@ class DiscoverSeriesViewModel Timber.v("Init for tv %s", item.id) try { val tv = seerrService.api.tvApi.tvTvIdGet(tvId = item.id) - _state.update { it.copy(tvSeries = DataLoadingState.Success(tv)) } + val watchProviders = + seerrService.createWatchProviderDisplays(tv.watchProviders) + _state.update { + it.copy( + tvSeries = DataLoadingState.Success(tv), + watchProviders = watchProviders, + ) + } val discoveredItem = seerrService.createDiscoverItem(tv) backdropService.submit(discoveredItem) @@ -449,6 +464,7 @@ class DiscoverSeriesViewModel data class DiscoverSeriesState( val tvSeries: DataLoadingState = DataLoadingState.Pending, + val watchProviders: List = emptyList(), val rating: DiscoverRating? = null, val seasons: List = emptyList(), val seasons4k: List = emptyList(), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 974b094a6a..202be44996 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -433,6 +433,7 @@ Show details Image type + Currently Streaming On Guest stars Edge size Refresh rate switching diff --git a/app/src/main/seerr/seerr-api.yml b/app/src/main/seerr/seerr-api.yml index 354f32984a..b549ef1c79 100644 --- a/app/src/main/seerr/seerr-api.yml +++ b/app/src/main/seerr/seerr-api.yml @@ -2052,6 +2052,7 @@ components: items: $ref: '#/components/schemas/WatchProviderDetails' flatrate: + type: array items: $ref: '#/components/schemas/WatchProviderDetails' WatchProviderDetails: diff --git a/app/src/test/java/com/github/damontecres/wholphin/test/TestSeerr.kt b/app/src/test/java/com/github/damontecres/wholphin/test/TestSeerr.kt index c19ffb81e6..585fb5025d 100644 --- a/app/src/test/java/com/github/damontecres/wholphin/test/TestSeerr.kt +++ b/app/src/test/java/com/github/damontecres/wholphin/test/TestSeerr.kt @@ -1,10 +1,16 @@ package com.github.damontecres.wholphin.test +import com.github.damontecres.wholphin.api.seerr.model.WatchProviderDetails +import com.github.damontecres.wholphin.api.seerr.model.WatchProviders +import com.github.damontecres.wholphin.services.mapWatchProviderDisplays +import com.github.damontecres.wholphin.services.selectWatchProviderRegion import com.github.damontecres.wholphin.ui.setup.seerr.createSeerrApiUrl import com.github.damontecres.wholphin.ui.setup.seerr.createUrls import com.github.damontecres.wholphin.ui.setup.seerr.migrateSeerrUrl import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull import org.junit.Test +import java.util.Locale class TestSeerr { @Test @@ -170,4 +176,91 @@ class TestSeerr { assertEquals("http://10.0.0.2/", migrateSeerrUrl("http://10.0.0.2/")) assertEquals("http://10.0.0.2/", migrateSeerrUrl("http://10.0.0.2")) } + + @Test + fun `Select watch provider region prefers the requested locale`() { + val selected = + listOf( + WatchProviders(iso31661 = "US"), + WatchProviders(iso31661 = "CA"), + ).selectWatchProviderRegion(Locale.CANADA) + + assertEquals("CA", selected?.iso31661) + } + + @Test + fun `Select watch provider region falls back to US`() { + val selected = + listOf( + WatchProviders(iso31661 = "US"), + WatchProviders(iso31661 = "CA"), + ).selectWatchProviderRegion(Locale.UK) + + assertEquals("US", selected?.iso31661) + } + + @Test + fun `Select watch provider region falls back to first available region`() { + val selected = + listOf( + WatchProviders(iso31661 = "CA"), + WatchProviders(iso31661 = "GB"), + ).selectWatchProviderRegion(Locale.JAPAN) + + assertEquals("CA", selected?.iso31661) + } + + @Test + fun `Select watch provider region returns null when no regions exist`() { + assertNull(emptyList().selectWatchProviderRegion(Locale.US)) + assertNull(null.selectWatchProviderRegion(Locale.US)) + } + + @Test + fun `Watch provider details expose streaming provider fields`() { + val provider = + WatchProviderDetails( + id = 8, + name = "Netflix", + logoPath = "/netflix.png", + ) + val region = + WatchProviders( + iso31661 = "US", + flatrate = listOf(provider), + ) + + assertEquals("Netflix", region.flatrate?.single()?.name) + assertEquals("/netflix.png", region.flatrate?.single()?.logoPath) + } + + @Test + fun `Watch provider displays deduplicate shared logo URLs`() { + val displays = + mapWatchProviderDisplays( + providers = + listOf( + WatchProviders( + iso31661 = "US", + flatrate = + listOf( + WatchProviderDetails( + id = 8, + name = "Netflix", + logoPath = "/shared.png", + ), + WatchProviderDetails( + id = 9, + name = "Other", + logoPath = "/shared.png", + ), + ), + ), + ), + imageBaseUrl = "https://image.tmdb.org", + ) + + assertEquals(1, displays.size) + assertEquals("https://image.tmdb.org/t/p/w92/shared.png", displays.single().logoUrl) + } }