Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-05-04 17:29:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: update videoID handling in cw

Browse source
This commit is contained in:
tapframe 2026-04-09 01:33:59 +05:30
parent 21aed96e3d
commit 47ed75d951
7 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt
View file

@ -845,8 +845,7 @@ private fun MainAppContent(
}
}
val shouldResolveEpisodeVideoId =
route.type == "series" &&
route.parentMetaId != null &&
route.parentMetaId != null &&
route.seasonNumber != null &&
route.episodeNumber != null
var effectiveVideoId by rememberSaveable(

4
composeApp/src/commonMain/kotlin/com/nuvio/app/features/details/MetaDetailsScreen.kt
View file

@ -459,7 +459,7 @@ fun MetaDetailsScreen(
fallbackVideoId = video.id,
)
val streamVideoId = video.id.takeIf { it.isNotBlank() } ?: playbackVideoId
val savedProgress = watchProgressUiState.byVideoId[playbackVideoId]
val savedProgress = watchProgressUiState.byVideoId[streamVideoId]
?.takeUnless { it.isCompleted }
onPlay?.invoke(
meta.type,
@ -488,7 +488,7 @@ fun MetaDetailsScreen(
fallbackVideoId = video.id,
)
val streamVideoId = video.id.takeIf { it.isNotBlank() } ?: playbackVideoId
val savedProgress = watchProgressUiState.byVideoId[playbackVideoId]
val savedProgress = watchProgressUiState.byVideoId[streamVideoId]
?.takeUnless { it.isCompleted }
onPlayManually?.invoke(
meta.type,

6
composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt
View file

@ -255,7 +255,7 @@ fun PlayerScreen(
contentType = contentType ?: parentMetaType,
parentMetaId = parentMetaId,
parentMetaType = parentMetaType,
videoId = buildPlaybackVideoId(
videoId = activeVideoId?.takeIf { it.isNotBlank() } ?: buildPlaybackVideoId(
parentMetaId = parentMetaId,
seasonNumber = activeSeasonNumber,
episodeNumber = activeEpisodeNumber,
@ -567,7 +567,9 @@ fun PlayerScreen(
episodeNumber = episode.episode,
fallbackVideoId = epVideoId,
)
val epEntry = WatchProgressRepository.progressForVideo(epResumeVideoId)
val epEntry = WatchProgressRepository.progressForVideo(
epVideoId.takeIf { it.isNotBlank() } ?: epResumeVideoId,
)
?.takeIf { !it.isCompleted }
val epResumeFraction = epEntry?.progressPercent
?.takeIf { it > 0f }

12
composeApp/src/commonMain/kotlin/com/nuvio/app/features/streams/StreamsScreen.kt
View file

@ -107,22 +107,10 @@ fun StreamsScreen(
}.collectAsStateWithLifecycle()
val isEpisode = seasonNumber != null && episodeNumber != null
var preferredFilterApplied by remember(videoId) { mutableStateOf(false) }
val legacyEpisodeVideoId = remember(type, parentMetaId, seasonNumber, episodeNumber, videoId) {
if (type == "series" && seasonNumber != null && episodeNumber != null) {
buildPlaybackVideoId(
parentMetaId = parentMetaId,
seasonNumber = seasonNumber,
episodeNumber = episodeNumber,
).takeIf { it != videoId }
} else {
null
}
}
val storedProgress = if (startFromBeginning) {
null
} else {
watchProgressUiState.byVideoId[videoId]
?: legacyEpisodeVideoId?.let { legacyId -> watchProgressUiState.byVideoId[legacyId] }
}
val storedProgressFraction = storedProgress?.progressPercent
?.takeIf { it > 0f }

2
composeApp/src/commonMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressModels.kt
View file

@ -244,7 +244,7 @@ internal fun WatchProgressEntry.toUpNextContinueWatchingItem(
return ContinueWatchingItem(
parentMetaId = parentMetaId,
parentMetaType = parentMetaType,
videoId = buildPlaybackVideoId(
videoId = nextEpisode.id.takeIf { it.isNotBlank() } ?: buildPlaybackVideoId(
parentMetaId = parentMetaId,
seasonNumber = nextEpisode.season,
episodeNumber = nextEpisode.episode,

6
composeApp/src/commonMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRepository.kt
View file

@ -288,10 +288,10 @@ object WatchProgressRepository {
fun progressForVideo(videoId: String): WatchProgressEntry? {
ensureLoaded()
return if (shouldUseTraktProgress()) {
TraktProgressRepository.uiState.value.entries.firstOrNull { it.videoId == videoId }
TraktProgressRepository.uiState.value.entries
} else {
entriesByVideoId[videoId]
}
entriesByVideoId.values.toList()
}.firstOrNull { it.videoId == videoId }
}
fun resumeEntryForSeries(metaId: String): WatchProgressEntry? {

20
composeApp/src/commonTest/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRulesTest.kt
View file

@ -1,5 +1,6 @@
package com.nuvio.app.features.watchprogress
import com.nuvio.app.features.details.MetaVideo
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFalse
@ -144,6 +145,25 @@ class WatchProgressRulesTest {
assertEquals("movie", buildPlaybackVideoId(parentMetaId = "movie", seasonNumber = null, episodeNumber = null, fallbackVideoId = null))
}
@Test
fun `up next continue watching uses actual episode id when available`() {
val item = entry(
videoId = "kitsu:244:1",
parentMetaId = "kitsu:244",
seasonNumber = 1,
episodeNumber = 1,
).toUpNextContinueWatchingItem(
MetaVideo(
id = "kitsu:244:2",
title = "Episode 2",
season = 1,
episode = 2,
),
)
assertEquals("kitsu:244:2", item.videoId)
}
private fun entry(
videoId: String,
parentMetaId: String = videoId.substringBefore(':'),