Creepso/NuvioTV
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

If same timestamp, order latestEpisodeByContent by season/episode & change next up to use watched items instead of watch progress

Browse source
This commit is contained in:
skoruppa 2026-04-08 14:18:17 +02:00
parent 8874ebc07d
commit 4103a450d4
2 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/nuvio/tv/core/sync/WatchProgressSyncService.kt
View file

@ -286,7 +286,11 @@ class WatchProgressSyncService @Inject constructor(
}
}
.groupBy { it.contentId }
.mapValues { (_, episodes) -> episodes.maxByOrNull { it.lastWatched } }
.mapValues { (_, episodes) -> episodes.maxWithOrNull(
compareBy<WatchProgress> { it.lastWatched }
.thenBy { it.season ?: 0 }
.thenBy { it.episode ?: 0 }
) }
latestEpisodeByContent.forEach { (contentId, latestEpisode) ->
val latest = latestEpisode ?: return@forEach

45
app/src/main/java/com/nuvio/tv/data/repository/WatchProgressRepositoryImpl.kt
View file

@ -345,15 +345,42 @@ class WatchProgressRepositoryImpl @Inject constructor(
mergeNextUpSeeds(canonicalSeeds, optimisticSeeds)
}
} else {
watchProgressPreferences.allProgress.map { items ->
items.filter { progress ->
progress.isCompleted() &&
progress.contentType.equals("series", ignoreCase = true) &&
progress.season != null &&
progress.episode != null &&
progress.season != 0 &&
!isMalformedNextUpSeedContentId(progress.contentId)
}
// Use watched items (fully synced with pagination) to build seeds
// instead of watch progress (limited to 1000 entries).
watchedItemsPreferences.allItems.map { items ->
items
.filter { item ->
(item.contentType.equals("series", ignoreCase = true) ||
item.contentType.equals("tv", ignoreCase = true)) &&
item.season != null &&
item.episode != null &&
item.season != 0 &&
!isMalformedNextUpSeedContentId(item.contentId)
}
.groupBy { it.contentId }
.mapNotNull { (_, episodes) ->
val latest = episodes.maxWithOrNull(
compareBy<WatchedItem> { it.watchedAt }
.thenBy { it.season ?: 0 }
.thenBy { it.episode ?: 0 }
) ?: return@mapNotNull null
WatchProgress(
contentId = latest.contentId,
contentType = latest.contentType,
name = latest.title,
poster = null,
backdrop = null,
logo = null,
videoId = latest.contentId,
season = latest.season,
episode = latest.episode,
episodeTitle = null,
position = 1L,
duration = 1L,
lastWatched = latest.watchedAt,
progressPercent = 100f
)
}
}
}
}