refactor: update image handling in Episode dto to use imageUrlPrefix and JellyfinImageHelper

app-tv/src/androidTest/java/hu/bbara/purefin/app/content/episode/EpisodeScreenContentTest.kt

@@ -101,7 +101,7 @@ class EpisodeScreenContentTest {
             progress = progress,
             watched = false,
             format = "4K",
-            heroImageUrl = "https://images.unsplash.com/photo-1500530855697-b586d89ba3ee",
+            imageUrlPrefix = "https://images.unsplash.com/photo-1500530855697-b586d89ba3ee",
             cast = listOf(
                 CastMember("Adam Scott", "Mark Scout", null)
             )

app-tv/src/androidTest/java/hu/bbara/purefin/app/content/series/SeriesScreenContentTest.kt

@@ -117,7 +117,7 @@ class SeriesScreenContentTest {
                             progress = 18.0,
                             watched = false,
                             format = "4K",
-                            heroImageUrl = "https://images.unsplash.com/photo-1500530855697-b586d89ba3ee",
+                            imageUrlPrefix = "https://images.unsplash.com/photo-1500530855697-b586d89ba3ee",
                             cast = emptyList()
                         ),
                         Episode(
@@ -133,7 +133,7 @@ class SeriesScreenContentTest {
                             progress = null,
                             watched = false,
                             format = "4K",
-                            heroImageUrl = "https://images.unsplash.com/photo-1500530855697-b586d89ba3ee",
+                            imageUrlPrefix = "https://images.unsplash.com/photo-1500530855697-b586d89ba3ee",
                             cast = emptyList()
                         )
                     )

app-tv/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreen.kt

@@ -19,12 +19,14 @@ import hu.bbara.purefin.common.ui.components.MediaDetailOverviewSection
 import hu.bbara.purefin.common.ui.components.MediaDetailPlaybackSection
 import hu.bbara.purefin.common.ui.components.MediaDetailSectionTitle
 import hu.bbara.purefin.common.ui.components.TvMediaDetailScaffold
+import hu.bbara.purefin.core.data.image.JellyfinImageHelper
 import hu.bbara.purefin.core.data.navigation.EpisodeDto
 import hu.bbara.purefin.core.data.navigation.LocalNavigationBackStack
 import hu.bbara.purefin.core.data.navigation.LocalNavigationManager
 import hu.bbara.purefin.core.data.navigation.Route
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.feature.shared.content.episode.EpisodeScreenViewModel
+import org.jellyfin.sdk.model.api.ImageType
 
 @Composable
 fun EpisodeScreen(
@@ -91,7 +93,7 @@ internal fun EpisodeScreenContent(
     }
 
     TvMediaDetailScaffold(
-        heroImageUrl = episode.heroImageUrl,
+        heroImageUrl = JellyfinImageHelper.finishImageUrl(episode.imageUrlPrefix, ImageType.PRIMARY),
         resetScrollKey = episode.id,
         modifier = modifier,
         topBar = {

app-tv/src/main/java/hu/bbara/purefin/app/content/series/SeriesComponents.kt

@@ -60,11 +60,13 @@ import hu.bbara.purefin.common.ui.components.MediaProgressBar
 import hu.bbara.purefin.common.ui.components.MediaResumeButton
 import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
 import hu.bbara.purefin.common.ui.components.WatchStateIndicator
+import hu.bbara.purefin.core.data.image.JellyfinImageHelper
 import hu.bbara.purefin.core.model.CastMember
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.core.model.Season
 import hu.bbara.purefin.core.model.Series
 import hu.bbara.purefin.feature.shared.content.series.SeriesViewModel
+import org.jellyfin.sdk.model.api.ImageType
 
 internal const val SeriesPlayButtonTag = "series-play-button"
 internal const val SeriesFirstSeasonTabTag = "series-first-season-tab"
@@ -310,7 +312,7 @@ private fun EpisodeCard(
                 )
         ) {
             PurefinAsyncImage(
-                model = episode.heroImageUrl,
+                model = JellyfinImageHelper.finishImageUrl(episode.imageUrlPrefix, ImageType.PRIMARY),
                 contentDescription = null,
                 modifier = Modifier.fillMaxSize(),
                 contentScale = ContentScale.Crop

app-tv/src/main/java/hu/bbara/purefin/tv/home/ui/TvHomeSections.kt

@@ -93,7 +93,10 @@ fun TvContinueWatchingCard(
             prefixImageUrl = item.movie?.imageUrlPrefix,
             imageType = ImageType.PRIMARY
         )
-        BaseItemKind.EPISODE -> item.episode?.heroImageUrl
+        BaseItemKind.EPISODE -> JellyfinImageHelper.finishImageUrl(
+            prefixImageUrl = item.episode?.imageUrlPrefix,
+            imageType = ImageType.PRIMARY
+        )
         else -> null
     }
 
@@ -216,7 +219,7 @@ fun TvNextUpCard(
     var isFocused by remember { mutableStateOf(false) }
     val scale by animateFloatAsState(targetValue = if (isFocused) 1.07f else 1.0f, label = "scale")
 
-    val imageUrl = item.episode.heroImageUrl
+    val imageUrl = JellyfinImageHelper.finishImageUrl(item.episode.imageUrlPrefix, ImageType.PRIMARY)
 
     val cardWidth = 280.dp
 

app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreen.kt

@@ -37,6 +37,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import hu.bbara.purefin.common.ui.MediaMetaChip
 import hu.bbara.purefin.common.ui.PurefinWaitingScreen
 import hu.bbara.purefin.common.ui.components.MediaHero
+import hu.bbara.purefin.core.data.image.JellyfinImageHelper
 import hu.bbara.purefin.core.data.navigation.EpisodeDto
 import hu.bbara.purefin.core.data.navigation.LocalNavigationBackStack
 import hu.bbara.purefin.core.data.navigation.Route
@@ -45,6 +46,7 @@ import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.feature.download.DownloadState
 import hu.bbara.purefin.feature.shared.content.episode.EpisodeScreenViewModel
 import hu.bbara.purefin.ui.theme.AppTheme
+import org.jellyfin.sdk.model.api.ImageType
 import java.util.UUID
 
 @Composable
@@ -162,7 +164,7 @@ private fun EpisodeHeroSection(
             .height(sectionHeight)
     ) {
         MediaHero(
-            imageUrl = episode.heroImageUrl,
+            imageUrl = JellyfinImageHelper.finishImageUrl(episode.imageUrlPrefix, ImageType.PRIMARY),
             backgroundColor = scheme.background,
             modifier = Modifier.fillMaxSize()
         )
@@ -258,7 +260,7 @@ private fun previewEpisode(): Episode {
         progress = 63.0,
         watched = false,
         format = "4K",
-        heroImageUrl = "https://images.unsplash.com/photo-1500530855697-b586d89ba3ee",
+        imageUrlPrefix = "https://images.unsplash.com/photo-1500530855697-b586d89ba3ee",
         cast = listOf(
             CastMember("Adam Scott", "Mark Scout", null),
             CastMember("Britt Lower", "Helly R.", null),

app/src/main/java/hu/bbara/purefin/app/content/series/SeriesComponents.kt

@@ -65,6 +65,7 @@ import hu.bbara.purefin.common.ui.components.MediaProgressBar
 import hu.bbara.purefin.common.ui.components.MediaResumeButton
 import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
 import hu.bbara.purefin.common.ui.components.WatchStateIndicator
+import hu.bbara.purefin.core.data.image.JellyfinImageHelper
 import hu.bbara.purefin.core.data.navigation.EpisodeDto
 import hu.bbara.purefin.core.data.navigation.LocalNavigationManager
 import hu.bbara.purefin.core.data.navigation.Route
@@ -75,6 +76,7 @@ import hu.bbara.purefin.core.model.Series
 import hu.bbara.purefin.feature.download.DownloadState
 import hu.bbara.purefin.feature.shared.content.series.SeriesViewModel
 import hu.bbara.purefin.player.PlayerActivity
+import org.jellyfin.sdk.model.api.ImageType
 
 @Composable
 internal fun SeriesTopBar(
@@ -347,7 +349,7 @@ private fun EpisodeCard(
                 .border(1.dp, scheme.outlineVariant, RoundedCornerShape(12.dp))
         ) {
             PurefinAsyncImage(
-                model = episode.heroImageUrl,
+                model = JellyfinImageHelper.finishImageUrl(episode.imageUrlPrefix, ImageType.PRIMARY),
                 contentDescription = null,
                 modifier = Modifier.fillMaxSize(),
                 contentScale = ContentScale.Crop

app/src/main/java/hu/bbara/purefin/app/content/series/SeriesScreen.kt

@@ -272,7 +272,7 @@ private fun previewSeries(): Series {
             progress = 100.0,
             watched = true,
             format = "4K",
-            heroImageUrl = "https://images.unsplash.com/photo-1497032205916-ac775f0649ae",
+            imageUrlPrefix = "https://images.unsplash.com/photo-1497032205916-ac775f0649ae",
             cast = emptyList()
         ),
         Episode(
@@ -288,7 +288,7 @@ private fun previewSeries(): Series {
             progress = 34.0,
             watched = false,
             format = "4K",
-            heroImageUrl = "https://images.unsplash.com/photo-1520034475321-cbe63696469a",
+            imageUrlPrefix = "https://images.unsplash.com/photo-1520034475321-cbe63696469a",
             cast = emptyList()
         )
     )
@@ -306,7 +306,7 @@ private fun previewSeries(): Series {
             progress = null,
             watched = false,
             format = "4K",
-            heroImageUrl = "https://images.unsplash.com/photo-1500534314209-a25ddb2bd429",
+            imageUrlPrefix = "https://images.unsplash.com/photo-1500534314209-a25ddb2bd429",
             cast = emptyList()
         )
     )

app/src/main/java/hu/bbara/purefin/app/home/ui/continuewatching/ContinueWatchingCard.kt

@@ -57,7 +57,10 @@ internal fun ContinueWatchingCard(
             prefixImageUrl = item.movie?.imageUrlPrefix,
             imageType = ImageType.PRIMARY
         )
-        BaseItemKind.EPISODE -> item.episode?.heroImageUrl
+        BaseItemKind.EPISODE -> JellyfinImageHelper.finishImageUrl(
+            prefixImageUrl = item.episode?.imageUrlPrefix,
+            imageType = ImageType.PRIMARY
+        )
         else -> null
     }
 

app/src/main/java/hu/bbara/purefin/app/home/ui/nextup/NextUpCard.kt

@@ -23,8 +23,10 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
+import hu.bbara.purefin.core.data.image.JellyfinImageHelper
 import hu.bbara.purefin.feature.shared.home.NextUpItem
 import org.jellyfin.sdk.model.UUID
+import org.jellyfin.sdk.model.api.ImageType
 
 @Composable
 internal fun NextUpCard(
@@ -55,7 +57,7 @@ internal fun NextUpCard(
                     .background(scheme.surface)
             ) {
                 PurefinAsyncImage(
-                    model = item.episode.heroImageUrl,
+                    model = JellyfinImageHelper.finishImageUrl(item.episode.imageUrlPrefix, ImageType.PRIMARY),
                     contentDescription = item.primaryText,
                     modifier = Modifier.fillMaxSize(),
                     contentScale = ContentScale.Crop

core/data/src/main/java/hu/bbara/purefin/core/data/InMemoryAppContentRepository.kt

@@ -476,11 +476,10 @@ class InMemoryAppContentRepository @Inject constructor(
 
     private fun BaseItemDto.toEpisode(serverUrl: String): Episode {
         val releaseDate = formatReleaseDate(premiereDate, productionYear)
-        val heroImageUrl = id?.let { itemId ->
+        val imageUrlPrefix = id?.let { itemId ->
-            JellyfinImageHelper.toImageUrl(
+            JellyfinImageHelper.toPrefixImageUrl(
                 url = serverUrl,
-                itemId = itemId,
+                itemId = itemId
-                type = ImageType.PRIMARY
             )
         } ?: ""
         return Episode(
@@ -496,7 +495,7 @@ class InMemoryAppContentRepository @Inject constructor(
             watched = userData!!.played,
             format = container?.uppercase() ?: "VIDEO",
             synopsis = overview ?: "No synopsis available.",
-            heroImageUrl = heroImageUrl,
+            imageUrlPrefix = imageUrlPrefix,
             cast = emptyList()
         )
     }

core/data/src/main/java/hu/bbara/purefin/core/data/InMemoryMediaRepository.kt

@@ -125,8 +125,8 @@ class InMemoryMediaRepository @Inject constructor(
 
     private fun BaseItemDto.toEpisode(serverUrl: String): Episode {
         val releaseDate = formatReleaseDate(premiereDate, productionYear)
-        val heroImageUrl = id?.let { itemId ->
+        val imageUrlPrefix = id?.let { itemId ->
-            JellyfinImageHelper.toImageUrl(url = serverUrl, itemId = itemId, type = ImageType.PRIMARY)
+            JellyfinImageHelper.toPrefixImageUrl(url = serverUrl, itemId = itemId)
         } ?: ""
         return Episode(
             id = id,
@@ -141,7 +141,7 @@ class InMemoryMediaRepository @Inject constructor(
             watched = userData!!.played,
             format = container?.uppercase() ?: "VIDEO",
             synopsis = overview ?: "No synopsis available.",
-            heroImageUrl = heroImageUrl,
+            imageUrlPrefix = imageUrlPrefix,
             cast = emptyList()
         )
     }

core/data/src/main/java/hu/bbara/purefin/core/data/room/entity/EpisodeEntity.kt

@@ -31,5 +31,5 @@ data class EpisodeEntity(
     val progress: Double?,
     val watched: Boolean,
     val format: String,
-    val heroImageUrl: String
+    val imageUrlPrefix: String
 )

core/data/src/main/java/hu/bbara/purefin/core/data/room/offline/OfflineMediaDatabase.kt

@@ -23,7 +23,7 @@ import hu.bbara.purefin.core.data.room.entity.SmartDownloadEntity
         EpisodeEntity::class,
         SmartDownloadEntity::class,
     ],
-    version = 8,
+    version = 9,
     exportSchema = false
 )
 @TypeConverters(UuidConverters::class)

core/data/src/main/java/hu/bbara/purefin/core/data/room/offline/OfflineRoomMediaLocalDataSource.kt

@@ -246,7 +246,7 @@ class OfflineRoomMediaLocalDataSource(
         progress = progress,
         watched = watched,
         format = format,
-        heroImageUrl = heroImageUrl
+        imageUrlPrefix = imageUrlPrefix
     )
 
     private fun MovieEntity.toDomain() = Movie(
@@ -302,7 +302,7 @@ class OfflineRoomMediaLocalDataSource(
         progress = progress,
         watched = watched,
         format = format,
-        heroImageUrl = heroImageUrl,
+        imageUrlPrefix = imageUrlPrefix,
         cast = emptyList()
     )
 }

core/model/src/main/java/hu/bbara/purefin/core/model/Episode.kt

@@ -15,6 +15,6 @@ data class Episode(
     val progress: Double?,
     val watched: Boolean,
     val format: String,
-    val heroImageUrl: String,
+    val imageUrlPrefix: String,
     val cast: List<CastMember>
 )

core/player/src/main/java/hu/bbara/purefin/core/player/data/PlayerMediaRepository.kt

@@ -140,7 +140,7 @@ class PlayerMediaRepository @Inject constructor(
         val subtitle = episode?.let { episodeSubtitle(null, it.index) }
         val artworkUrl = when {
             movie != null -> JellyfinImageHelper.finishImageUrl(movie.imageUrlPrefix, ImageType.PRIMARY)
-            episode != null -> episode.heroImageUrl
+            episode != null -> JellyfinImageHelper.finishImageUrl(episode.imageUrlPrefix, ImageType.PRIMARY)
             else -> JellyfinImageHelper.toImageUrl(serverUrl, mediaId, ImageType.PRIMARY)
         }
         val resumePositionMs = resumePositionFor(movie, episode)

feature/download/src/main/java/hu/bbara/purefin/feature/download/MediaDownloadManager.kt

@@ -369,10 +369,9 @@ class MediaDownloadManager @Inject constructor(
             watched = userData?.played ?: false,
             format = container?.uppercase() ?: "VIDEO",
             synopsis = overview ?: "No synopsis available.",
-            heroImageUrl = JellyfinImageHelper.toImageUrl(
+            imageUrlPrefix = JellyfinImageHelper.toPrefixImageUrl(
                 url = serverUrl,
-                itemId = id,
+                itemId = id
-                type = ImageType.PRIMARY
             ),
             cast = emptyList()
         )

feature/shared/src/main/java/hu/bbara/purefin/feature/shared/download/DownloadsViewModel.kt

@@ -82,7 +82,7 @@ class DownloadsViewModel @Inject constructor(
                         contentId = contentId,
                         title = it.title,
                         subtitle = seriesMap[it.seriesId]?.name ?: "",
-                        imageUrl = it.heroImageUrl,
+                        imageUrl = JellyfinImageHelper.finishImageUrl(it.imageUrlPrefix, ImageType.PRIMARY),
                         progress = progress
                     )
                 }

feature/shared/src/main/java/hu/bbara/purefin/feature/shared/home/HomeModels.kt

@@ -38,7 +38,10 @@ data class SuggestedEpisode (
     override val id: UUID = episode.id,
     override val title: String = episode.title,
     override val description: String = episode.synopsis,
-    override val imageUrl: String = episode.heroImageUrl
+    override val imageUrl: String = JellyfinImageHelper.finishImageUrl(
+        prefixImageUrl = episode.imageUrlPrefix,
+        imageType = ImageType.PRIMARY
+    )
 ) : SuggestedItem
 
 data class SuggestedSeries (
@@ -148,7 +151,7 @@ data class PosterItem(
     }
     val imageUrl: String = when (type) {
         BaseItemKind.MOVIE -> movie!!.imageUrlPrefix
-        BaseItemKind.EPISODE -> episode!!.heroImageUrl
+        BaseItemKind.EPISODE -> episode!!.imageUrlPrefix
         BaseItemKind.SERIES -> series!!.imageUrlPrefix
         else -> throw IllegalArgumentException("Invalid type: $type")
     }