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

Fix stale series watched markers

Browse source
This commit is contained in:
tapframe 2026-05-22 18:39:29 +05:30
parent ba5f460002
commit 96010101b8
3 changed files with 43 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -344,6 +344,22 @@ fun MetaDetailsScreen(
val progressByVideoId = remember(watchProgressUiState.entries) {
watchProgressUiState.byVideoId
}
LaunchedEffect(
meta.id,
meta.type,
todayIsoDate,
watchedUiState.isLoaded,
watchProgressUiState.hasLoadedRemoteProgress,
watchedUiState.watchedKeys,
watchProgressUiState.entries,
) {
if (watchedUiState.isLoaded && watchProgressUiState.hasLoadedRemoteProgress) {
WatchingActions.reconcileSeriesWatchedState(
meta = meta,
todayIsoDate = todayIsoDate,
)
}
}
val movieProgress = progressByVideoId[meta.id]
?.takeUnless { it.isCompleted }
val cwPrefs by ContinueWatchingPreferencesRepository.uiState.collectAsStateWithLifecycle()

10
composeApp/src/commonMain/kotlin/com/nuvio/app/features/watched/WatchedRepository.kt
View file

@ -201,6 +201,8 @@ object WatchedRepository {
todayIsoDate: String,
isEpisodeCompleted: (com.nuvio.app.features.details.MetaVideo) -> Boolean = { false },
) {
if (!meta.type.isSeriesLikeWatchedType()) return
ensureLoaded()
val shouldMarkSeriesWatched = meta.hasWatchedAllMainSeasonEpisodes(todayIsoDate) { episode ->
isWatched(
@ -211,11 +213,12 @@ object WatchedRepository {
) || isEpisodeCompleted(episode)
}
val seriesWatchedItem = meta.toSeriesWatchedItem()
val hasSeriesWatchedMarker = isWatched(id = meta.id, type = meta.type)
if (shouldMarkSeriesWatched) {
if (!isWatched(id = meta.id, type = meta.type)) {
if (!hasSeriesWatchedMarker) {
markWatched(seriesWatchedItem)
}
} else if (isWatched(id = meta.id, type = meta.type)) {
} else if (hasSeriesWatchedMarker) {
unmarkWatched(seriesWatchedItem)
}
}
@ -355,3 +358,6 @@ internal fun shouldUseTraktWatchedSync(
isAuthenticated = isAuthenticated,
source = source,
)
private fun String.isSeriesLikeWatchedType(): Boolean =
trim().lowercase() in setOf("series", "show", "tv", "tvshow")

24
composeApp/src/commonMain/kotlin/com/nuvio/app/features/watching/application/WatchingActions.kt
View file

@ -7,7 +7,7 @@ import com.nuvio.app.features.home.MetaPreview
import com.nuvio.app.features.watched.WatchedItem
import com.nuvio.app.features.watched.WatchedRepository
import com.nuvio.app.features.watched.episodePlaybackId
import com.nuvio.app.features.watched.releasedPlayableEpisodes
import com.nuvio.app.features.watched.releasedMainSeasonEpisodes
import com.nuvio.app.features.watched.toEpisodeWatchedItem
import com.nuvio.app.features.watched.toSeriesWatchedItem
import com.nuvio.app.features.watched.toWatchedItem
@ -23,7 +23,7 @@ object WatchingActions {
private val actionScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
suspend fun togglePosterWatched(preview: MetaPreview) {
if (preview.type != "series") {
if (!preview.type.isSeriesLikeType()) {
WatchedRepository.toggleWatched(preview.toWatchedItem(markedAtEpochMs = 0L))
return
}
@ -34,14 +34,23 @@ object WatchingActions {
)
val meta = MetaDetailsRepository.fetch(type = preview.type, id = preview.id)
if (meta == null) {
WatchedRepository.toggleWatched(preview.toWatchedItem(markedAtEpochMs = 0L))
if (isCurrentlyWatched) {
WatchedRepository.unmarkWatched(preview.toWatchedItem(markedAtEpochMs = 0L))
}
return
}
val todayIsoDate = CurrentDateProvider.todayIsoDate()
val releasedMainEpisodes = meta.releasedMainSeasonEpisodes(todayIsoDate)
if (releasedMainEpisodes.isEmpty()) {
if (isCurrentlyWatched) {
WatchedRepository.unmarkWatched(meta.toSeriesWatchedItem())
}
return
}
val seriesItems = buildList {
add(meta.toSeriesWatchedItem())
addAll(meta.releasedPlayableEpisodes(todayIsoDate).map(meta::toEpisodeWatchedItem))
addAll(releasedMainEpisodes.map(meta::toEpisodeWatchedItem))
}
if (isCurrentlyWatched) {
@ -49,7 +58,7 @@ object WatchingActions {
} else {
WatchedRepository.markWatched(seriesItems)
WatchProgressRepository.clearProgress(
meta.releasedPlayableEpisodes(todayIsoDate).map(meta::episodePlaybackId),
releasedMainEpisodes.map(meta::episodePlaybackId),
)
}
}
@ -97,6 +106,8 @@ object WatchingActions {
meta: MetaDetails,
todayIsoDate: String = CurrentDateProvider.todayIsoDate(),
) {
if (!meta.type.isSeriesLikeType()) return
WatchedRepository.reconcileSeriesWatchedState(
meta = meta,
todayIsoDate = todayIsoDate,
@ -149,3 +160,6 @@ object WatchingActions {
reconcileSeriesWatchedState(meta)
}
}
private fun String.isSeriesLikeType(): Boolean =
trim().lowercase() in setOf("series", "show", "tv", "tvshow")