Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

Fix Stalker VOD season selection

David Nashash7231657b3367
diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt b/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt
index 9624e555..dee66411 100644
--- a/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt
+++ b/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt
@@ -589,7 +589,10 @@ class OkHttpStalkerApiService @Inject constructor(
"episode_id" to "0"
)
)
- entry.toSeasonRecord(episodesPayload.extractItemEntries())
+ entry.toSeasonRecord(
+ episodeEntries = episodesPayload.extractItemEntries(),
+ fallbackSeasonNumber = seasonId.toIntOrNull()
+ )
}
} else if (shellSeasonRows.isNotEmpty()) {
shellSeasonRows.map { (seasonId, entry) ->
@@ -607,7 +610,10 @@ class OkHttpStalkerApiService @Inject constructor(
"episode_id" to "0"
)
)
- entry.toSeasonRecord(episodesPayload.extractItemEntries())
+ entry.toSeasonRecord(
+ episodeEntries = episodesPayload.extractItemEntries(),
+ fallbackSeasonNumber = seasonId.toIntOrNull()
+ )
}
} else {
listOf(
@@ -1845,17 +1851,23 @@ class OkHttpStalkerApiService @Inject constructor(
return id.contains(':') && isSeries.not() && cmd.isNullOrBlank().not()
}
- private fun JsonObject.toSeasonRecord(episodeEntries: List<JsonObject>): StalkerSeasonRecord {
+ private fun JsonObject.toSeasonRecord(
+ episodeEntries: List<JsonObject>,
+ fallbackSeasonNumber: Int? = null
+ ): StalkerSeasonRecord {
val seasonNumber = findString("season_id")?.toIntOrNull()
?: findString("season_number")?.toIntOrNull()
?: extractSeasonNumberFromCmd(findString("cmd"))
+ ?: fallbackSeasonNumber
?: 1
val seasonName = findString("title")
?: findString("name")
?: "Season $seasonNumber"
- val explicitEpisodes = episodeEntries.mapIndexedNotNull { index, entry ->
+ val explicitEpisodes = episodeEntries
+ .filterNot { entry -> entry.looksLikeSeasonShellRow() }
+ .mapIndexedNotNull { index, entry ->
entry.toEpisodeRecord(index + 1, seasonNumber)
- }
+ }
return StalkerSeasonRecord(
seasonNumber = seasonNumber,
name = seasonName,
@@ -1918,6 +1930,22 @@ class OkHttpStalkerApiService @Inject constructor(
)
}
+ private fun JsonObject.looksLikeSeasonShellRow(): Boolean {
+ val episodeNumber = findString("series_number")?.toIntOrNull()
+ ?: findString("episode_number")?.toIntOrNull()
+ if (episodeNumber != null) {
+ return false
+ }
+ if (extractSeasonShellEpisodeNumbers().isNotEmpty()) {
+ return true
+ }
+ val title = findString("name") ?: findString("title") ?: ""
+ if (title.trim().startsWith("Season ", ignoreCase = true)) {
+ return true
+ }
+ return extractSeasonNumberFromCmd(findString("cmd")) != null
+ }
+
private fun JsonObject.buildEpisodesFromSeriesShell(
fallbackSeasonNumber: Int,
fallbackSeasonName: String
diff --git a/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt b/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt
index 7b93da6e..72a0a78c 100644
--- a/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt
+++ b/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt
@@ -872,6 +872,81 @@ class OkHttpStalkerApiServiceTest {
assertThat(season.episodes.single().cmd).isEqualTo("ffmpeg http://example.com/episode1.mp4")
}
+ @Test
+ fun getSeriesDetails_preserves_shell_season_numbers_when_followup_rows_omit_them() = runTest {
+ val requestedSeasonIds = mutableListOf<String>()
+ val service = OkHttpStalkerApiService(
+ okHttpClient = OkHttpClient.Builder()
+ .addInterceptor { chain ->
+ val request = chain.request()
+ val action = request.url.queryParameter("action").orEmpty()
+ val seasonId = request.url.queryParameter("season_id").orEmpty()
+ val body = when {
+ action != "get_ordered_list" -> error("Unexpected action '$action'")
+ seasonId == "0" ->
+ """
+ {"js":{"total_items":2,"max_page_items":14,"data":[
+ {"id":"55000:alpha","name":"Season 1","description":"Alpha","series":[1,2],"cmd":"shell-cmd-1"},
+ {"id":"55000:beta","name":"Season 2","description":"Beta","series":[1,2,3],"cmd":"shell-cmd-2"}
+ ]}}
+ """.trimIndent()
+ seasonId == "1" -> {
+ requestedSeasonIds += seasonId
+ """
+ {"js":{"total_items":2,"max_page_items":14,"data":[
+ {"id":"55000:alpha","name":"Season 1","description":"Alpha","series":[1,2],"cmd":"shell-cmd-1"},
+ {"id":"55000:beta","name":"Season 2","description":"Beta","series":[1,2,3],"cmd":"shell-cmd-2"}
+ ]}}
+ """.trimIndent()
+ }
+ seasonId == "2" -> {
+ requestedSeasonIds += seasonId
+ """
+ {"js":{"total_items":2,"max_page_items":14,"data":[
+ {"id":"55000:alpha","name":"Season 1","description":"Alpha","series":[1,2],"cmd":"shell-cmd-1"},
+ {"id":"55000:beta","name":"Season 2","description":"Beta","series":[1,2,3],"cmd":"shell-cmd-2"}
+ ]}}
+ """.trimIndent()
+ }
+ else -> error("Unexpected season_id '$seasonId'")
+ }
+ Response.Builder()
+ .request(request)
+ .protocol(Protocol.HTTP_1_1)
+ .code(200)
+ .message("OK")
+ .body(body.toResponseBody("application/json".toMediaType()))
+ .build()
+ }
+ .build(),
+ json = Json { ignoreUnknownKeys = true }
+ )
+
+ val result = service.getSeriesDetails(
+ session = StalkerSession(
+ loadUrl = "https://portal.example.com/server/load.php",
+ portalReferer = "https://portal.example.com/c/",
+ token = "token-123"
+ ),
+ profile = buildStalkerDeviceProfile(
+ portalUrl = "https://portal.example.com/c",
+ macAddress = "00:1A:79:12:34:56",
+ deviceProfile = "MAG250",
+ timezone = "UTC",
+ locale = "en"
+ ),
+ seriesId = "55000:55000"
+ )
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ val success = result as Result.Success
+ assertThat(requestedSeasonIds).containsExactly("1", "2")
+ assertThat(success.data.seasons.map { it.seasonNumber }).containsExactly(1, 2).inOrder()
+ assertThat(success.data.seasons.map { it.name }).containsExactly("Season 1", "Season 2").inOrder()
+ assertThat(success.data.seasons[0].episodes.map { it.episodeNumber }).containsExactly(1, 2).inOrder()
+ assertThat(success.data.seasons[1].episodes.map { it.episodeNumber }).containsExactly(1, 2, 3).inOrder()
+ }
+
private fun fakeClient(vararg responses: Pair<String, String>): OkHttpClient {
val byAction = responses.toMap()
return OkHttpClient.Builder()