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

fix: ensure series streams use parentId:season:episode format in addon requests

Browse source
This commit is contained in:
Jaidev1805 2026-04-19 21:29:19 +05:30
parent f2e9b27df5
commit 389add4b27
2 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerStreamsRepository.kt
View file

@ -151,6 +151,23 @@ object PlayerStreamsRepository {
return
}
// For series episodes the Stremio protocol requires the id in the request URL to
// be "parentId:season:episode" (e.g. tt1234567:1:2). Append if missing.
val effectiveAddonVideoId = if (type == "series" && season != null && episode != null) {
val suffix = ":$season:$episode"
if (videoId.endsWith(suffix)) videoId else "$videoId$suffix"
} else {
videoId
}
// Strip the suffix when checking idPrefixes so addons with prefix "tt" still match
// when effectiveAddonVideoId is "tt1234567:1:2".
val baseVideoIdForPrefixCheck = if (season != null && episode != null) {
effectiveAddonVideoId.removeSuffix(":$season:$episode")
} else {
effectiveAddonVideoId
}
val installedAddons = AddonRepository.uiState.value.addons
val pluginScrapers = if (AppFeaturePolicy.pluginsEnabled) {
PluginRepository.initialize()
@ -174,7 +191,10 @@ object PlayerStreamsRepository {
resource.name == "stream" &&
resource.types.contains(type) &&
(resource.idPrefixes.isEmpty() ||
resource.idPrefixes.any { videoId.startsWith(it) })
resource.idPrefixes.any { prefix ->
effectiveAddonVideoId.startsWith(prefix) ||
baseVideoIdForPrefixCheck.startsWith(prefix)
})
}
if (!supportsRequestedStream) return@mapNotNull null
@ -221,7 +241,7 @@ object PlayerStreamsRepository {
manifestUrl = addon.manifest.transportUrl,
resource = "stream",
type = type,
id = videoId,
id = effectiveAddonVideoId,
)
val displayName = addon.addonName

30
composeApp/src/commonMain/kotlin/com/nuvio/app/features/streams/StreamsRepository.kt
View file

@ -93,6 +93,18 @@ object StreamsRepository {
)
}
// For series episodes the Stremio protocol requires the id in the request URL to
// be "parentId:season:episode" (e.g. tt1234567:1:2). If the videoId coming from
// the addon meta doesn't already carry the suffix, append it here so that every
// addon gets a correctly-formed stream request.
val effectiveAddonVideoId = if (type == "series" && season != null && episode != null) {
val suffix = ":$season:$episode"
if (videoId.endsWith(suffix)) videoId else "$videoId$suffix"
} else {
videoId
}
log.d { "Effective addon videoId: $effectiveAddonVideoId (original: $videoId, season=$season, episode=$episode)" }
val embeddedStreams = MetaDetailsRepository.findEmbeddedStreams(videoId)
if (embeddedStreams.isNotEmpty()) {
log.d { "Using ${embeddedStreams.size} embedded streams for type=$type id=$videoId" }
@ -129,6 +141,15 @@ object StreamsRepository {
return
}
// When checking idPrefixes, also test the bare parent ID (without :season:episode)
// so that addons with idPrefixes=["tt"] still match when effectiveAddonVideoId is
// "tt1234567:1:2".
val baseVideoIdForPrefixCheck = if (season != null && episode != null) {
effectiveAddonVideoId.removeSuffix(":$season:$episode")
} else {
effectiveAddonVideoId
}
val streamAddons = installedAddons
.mapNotNull { addon ->
val manifest = addon.manifest ?: return@mapNotNull null
@ -136,7 +157,10 @@ object StreamsRepository {
resource.name == "stream" &&
resource.types.contains(type) &&
(resource.idPrefixes.isEmpty() ||
resource.idPrefixes.any { videoId.startsWith(it) })
resource.idPrefixes.any { prefix ->
effectiveAddonVideoId.startsWith(prefix) ||
baseVideoIdForPrefixCheck.startsWith(prefix)
})
}
if (!supportsRequestedStream) return@mapNotNull null
@ -147,7 +171,7 @@ object StreamsRepository {
)
}
log.d { "Found ${streamAddons.size} addons for stream type=$type id=$videoId" }
log.d { "Found ${streamAddons.size} addons for stream type=$type effectiveId=$effectiveAddonVideoId" }
if (streamAddons.isEmpty() && pluginProviderGroups.isEmpty()) {
_uiState.value = StreamsUiState(
@ -243,7 +267,7 @@ object StreamsRepository {
manifestUrl = addon.manifest.transportUrl,
resource = "stream",
type = type,
id = videoId,
id = effectiveAddonVideoId,
)
log.d { "Fetching streams from: $url" }