Skip to content

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

fixed vod ordering

David Nashash8d9ffc1c9c72
diff --git a/data/src/main/java/com/streamvault/data/local/dao/Daos.kt b/data/src/main/java/com/streamvault/data/local/dao/Daos.kt
index a298846e..90bbe201 100644
--- a/data/src/main/java/com/streamvault/data/local/dao/Daos.kt
+++ b/data/src/main/java/com/streamvault/data/local/dao/Daos.kt
@@ -756,14 +756,14 @@ interface TmdbIdentityDao {
@Dao
@RewriteQueriesToDropUnusedColumns
interface MovieDao {
- @Query("SELECT * FROM movies WHERE provider_id = :providerId ORDER BY name ASC")
+ @Query("SELECT * FROM movies WHERE provider_id = :providerId ORDER BY added_at DESC, name ASC, id ASC")
fun getByProvider(providerId: Long): Flow<List<MovieBrowseEntity>>
/** SQL-level parental filter — avoids loading protected items into memory. */
- @Query("SELECT * FROM movies WHERE provider_id = :providerId AND is_user_protected = 0 ORDER BY name ASC")
+ @Query("SELECT * FROM movies WHERE provider_id = :providerId AND is_user_protected = 0 ORDER BY added_at DESC, name ASC, id ASC")
fun getByProviderUnprotected(providerId: Long): Flow<List<MovieBrowseEntity>>
- @Query("SELECT * FROM movies WHERE provider_id = :providerId ORDER BY name ASC LIMIT :limit OFFSET :offset")
+ @Query("SELECT * FROM movies WHERE provider_id = :providerId ORDER BY added_at DESC, name ASC, id ASC LIMIT :limit OFFSET :offset")
fun getByProviderPage(providerId: Long, limit: Int, offset: Int): Flow<List<MovieBrowseEntity>>
@Query("SELECT * FROM movies WHERE provider_id = :providerId ORDER BY name ASC, id ASC LIMIT :limit")
@@ -930,7 +930,7 @@ interface MovieDao {
limit: Int
): List<MovieBrowseEntity>
- @Query("SELECT * FROM movies WHERE provider_id = :providerId AND category_id = :categoryId ORDER BY name ASC")
+ @Query("SELECT * FROM movies WHERE provider_id = :providerId AND category_id = :categoryId ORDER BY added_at DESC, name ASC, id ASC")
fun getByCategory(providerId: Long, categoryId: Long): Flow<List<MovieBrowseEntity>>
@Query("SELECT * FROM movies WHERE provider_id = :providerId AND category_id = :categoryId ORDER BY name ASC, id ASC LIMIT :limit")
@@ -1632,10 +1632,10 @@ interface MovieDao {
@Dao
@RewriteQueriesToDropUnusedColumns
interface SeriesDao {
- @Query("SELECT * FROM series WHERE provider_id = :providerId ORDER BY name ASC")
+ @Query("SELECT * FROM series WHERE provider_id = :providerId ORDER BY last_modified DESC, name ASC, id ASC")
fun getByProvider(providerId: Long): Flow<List<SeriesBrowseEntity>>
- @Query("SELECT * FROM series WHERE provider_id = :providerId ORDER BY name ASC LIMIT :limit OFFSET :offset")
+ @Query("SELECT * FROM series WHERE provider_id = :providerId ORDER BY last_modified DESC, name ASC, id ASC LIMIT :limit OFFSET :offset")
fun getByProviderPage(providerId: Long, limit: Int, offset: Int): Flow<List<SeriesBrowseEntity>>
@Query("SELECT * FROM series WHERE provider_id = :providerId ORDER BY name ASC, id ASC LIMIT :limit")
@@ -1921,7 +1921,7 @@ interface SeriesDao {
limit: Int
): List<SeriesBrowseEntity>
- @Query("SELECT * FROM series WHERE provider_id = :providerId AND category_id = :categoryId ORDER BY name ASC")
+ @Query("SELECT * FROM series WHERE provider_id = :providerId AND category_id = :categoryId ORDER BY last_modified DESC, name ASC, id ASC")
fun getByCategory(providerId: Long, categoryId: Long): Flow<List<SeriesBrowseEntity>>
@Query(
@@ -2107,7 +2107,7 @@ interface SeriesDao {
)
fun getByWatchCountCategoryPage(providerId: Long, categoryId: Long, limit: Int, offset: Int): Flow<List<SeriesBrowseEntity>>
- @Query("SELECT * FROM series WHERE provider_id = :providerId AND category_id = :categoryId ORDER BY name ASC LIMIT :limit OFFSET :offset")
+ @Query("SELECT * FROM series WHERE provider_id = :providerId AND category_id = :categoryId ORDER BY last_modified DESC, name ASC, id ASC LIMIT :limit OFFSET :offset")
fun getByCategoryPage(providerId: Long, categoryId: Long, limit: Int, offset: Int): Flow<List<SeriesBrowseEntity>>
@Query("SELECT * FROM series WHERE provider_id = :providerId AND category_id = :categoryId ORDER BY name ASC, id ASC LIMIT :limit")
@@ -2131,7 +2131,7 @@ interface SeriesDao {
limit: Int
): List<SeriesBrowseEntity>
- @Query("SELECT * FROM series WHERE provider_id = :providerId AND category_id = :categoryId ORDER BY name ASC LIMIT :limit")
+ @Query("SELECT * FROM series WHERE provider_id = :providerId AND category_id = :categoryId ORDER BY last_modified DESC, name ASC, id ASC LIMIT :limit")
fun getByCategoryPreview(providerId: Long, categoryId: Long, limit: Int): Flow<List<SeriesBrowseEntity>>
@Query("SELECT * FROM series WHERE provider_id = :providerId ORDER BY rating DESC, name ASC LIMIT :limit")
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 594dab05..a2aa902b 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
@@ -1753,7 +1753,7 @@ class OkHttpStalkerApiService @Inject constructor(
findString("cmd"),
findString("container_extension")
),
- addedAt = findString("added")?.toLongOrNull() ?: 0L,
+ addedAt = parseDateTime(findString("added")) ?: 0L,
isAdult = findBoolean("censored") == true,
isSeries = findBoolean("is_series") == true || findString("is_series") == "1"
)
@@ -1829,7 +1829,7 @@ class OkHttpStalkerApiService @Inject constructor(
findString("cmd"),
findString("container_extension")
),
- addedAt = findString("added")?.toLongOrNull() ?: 0L,
+ addedAt = parseDateTime(findString("added")) ?: 0L,
isAdult = findBoolean("censored") == true,
isSeries = findBoolean("is_series") == true || findString("is_series") == "1"
)
diff --git a/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt
index 2dba0009..b26a288c 100644
--- a/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt
@@ -1023,7 +1023,15 @@ class MovieRepositoryImpl @Inject constructor(
when {
query.filterBy.type == LibraryFilterType.ALL &&
- query.sortBy in setOf(LibrarySortBy.LIBRARY, LibrarySortBy.TITLE) -> {
+ query.sortBy == LibrarySortBy.LIBRARY -> {
+ collectMoviePages<FreshCursor>(query, parentalLevel, collected, favoriteIds,
+ extractCursor = { FreshCursor(it.addedAt, it.name, it.id) }
+ ) { limit, cursor ->
+ loadMovieFreshPage(query, limit, cursor)
+ }
+ }
+ query.filterBy.type == LibraryFilterType.ALL &&
+ query.sortBy == LibrarySortBy.TITLE -> {
collectMoviePages<NameCursor>(query, parentalLevel, collected, favoriteIds,
extractCursor = { NameCursor(it.name, it.id) }
) { limit, cursor ->
@@ -1130,7 +1138,7 @@ class MovieRepositoryImpl @Inject constructor(
LibrarySortBy.TITLE,
LibrarySortBy.UPDATED,
LibrarySortBy.RATING
- ) -> query.categoryId == null || query.sortBy != LibrarySortBy.LIBRARY
+ ) -> true
else -> false
}
}
diff --git a/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt
index 2ecfa23e..c3ba6b89 100644
--- a/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt
@@ -1012,7 +1012,15 @@ class SeriesRepositoryImpl @Inject constructor(
when {
query.filterBy.type == LibraryFilterType.ALL &&
- query.sortBy in setOf(LibrarySortBy.LIBRARY, LibrarySortBy.TITLE) -> {
+ query.sortBy == LibrarySortBy.LIBRARY -> {
+ collectSeriesPages<FreshCursor>(query, parentalLevel, collected, favoriteIds,
+ extractCursor = { FreshCursor(it.lastModified, it.name, it.id) }
+ ) { limit, cursor ->
+ loadSeriesFreshPage(query, limit, cursor)
+ }
+ }
+ query.filterBy.type == LibraryFilterType.ALL &&
+ query.sortBy == LibrarySortBy.TITLE -> {
collectSeriesPages<NameCursor>(query, parentalLevel, collected, favoriteIds,
extractCursor = { NameCursor(it.name, it.id) }
) { limit, cursor ->
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 67181dea..b87e7bf9 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
@@ -15,6 +15,8 @@ import okhttp3.Protocol
import okhttp3.Response
import okhttp3.ResponseBody.Companion.toResponseBody
import org.junit.Test
+import java.time.LocalDateTime
+import java.time.ZoneOffset
class OkHttpStalkerApiServiceTest {
@@ -887,6 +889,43 @@ class OkHttpStalkerApiServiceTest {
)
}
+ @Test
+ fun getSeriesPage_parses_datetime_added_field_into_last_modified_source_timestamp() = runTest {
+ val service = OkHttpStalkerApiService(
+ okHttpClient = fakeClient(
+ "get_ordered_list" to """
+ {"js":{"total_items":"1","max_page_items":"15","data":[{"id":"300","name":"Drama","category_id":"147","added":"2026-05-18 13:02:23","is_series":"1"}]}}
+ """.trimIndent()
+ ),
+ json = Json { ignoreUnknownKeys = true }
+ )
+
+ val result = service.getSeriesPage(
+ 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"
+ ),
+ categoryId = "147",
+ page = 1
+ )
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ val success = result as Result.Success
+ val item = success.data.items.single()
+ val expectedAddedAt = LocalDateTime.of(2026, 5, 18, 13, 2, 23)
+ .toInstant(ZoneOffset.UTC)
+ .toEpochMilli()
+ assertThat(item.addedAt).isEqualTo(expectedAddedAt)
+ }
+
@Test
fun getBulkEpg_parses_channel_ids_from_bulk_response_rows() = runTest {
val service = OkHttpStalkerApiService(
diff --git a/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt
index 77fa1a92..738566b9 100644
--- a/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt
+++ b/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt
@@ -649,6 +649,36 @@ class MovieRepositoryImplTest {
verify(movieDao, never()).getFreshPreview(7L, 100)
}
+ @Test
+ fun `browseMovies library order uses added at freshness instead of title order`() = runTest {
+ whenever(preferencesRepository.parentalControlLevel).thenReturn(flowOf(0))
+ whenever(preferencesRepository.xtreamBase64TextCompatibility).thenReturn(flowOf(false))
+ whenever(movieDao.getCount(7L)).thenReturn(flowOf(2))
+ whenever(movieDao.getFreshCursorPage(7L, 40)).thenReturn(
+ listOf(
+ MovieBrowseEntity(id = 2L, streamId = 102L, name = "Zulu Movie", providerId = 7L, addedAt = 20_000L),
+ MovieBrowseEntity(id = 1L, streamId = 101L, name = "Alpha Movie", providerId = 7L, addedAt = 10_000L)
+ )
+ )
+ whenever(favoriteDao.getAllByType(7L, ContentType.MOVIE.name)).thenReturn(flowOf(emptyList()))
+
+ val repository = createRepository()
+
+ val result = repository.browseMovies(
+ LibraryBrowseQuery(
+ providerId = 7L,
+ sortBy = LibrarySortBy.LIBRARY,
+ offset = 0,
+ limit = 20
+ )
+ ).first()
+
+ assertThat(result.totalCount).isEqualTo(2)
+ assertThat(result.items.map { it.name }).containsExactly("Zulu Movie", "Alpha Movie").inOrder()
+ verify(movieDao).getFreshCursorPage(7L, 40)
+ verify(movieDao, never()).getByProviderCursorPage(any(), any())
+ }
+
private fun createRepository() = MovieRepositoryImpl(
movieDao = movieDao,
categoryDao = categoryDao,
diff --git a/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt
index 7bdac699..03ef4d14 100644
--- a/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt
+++ b/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt
@@ -335,6 +335,36 @@ class SeriesRepositoryImplTest {
verify(seriesDao, never()).getFreshPreview(7L, 100)
}
+ @Test
+ fun `browseSeries library order uses last modified freshness instead of title order`() = runTest {
+ whenever(preferencesRepository.parentalControlLevel).thenReturn(flowOf(0))
+ whenever(preferencesRepository.xtreamBase64TextCompatibility).thenReturn(flowOf(false))
+ whenever(seriesDao.getCount(7L)).thenReturn(flowOf(2))
+ whenever(seriesDao.getFreshCursorPage(7L, 40)).thenReturn(
+ listOf(
+ SeriesBrowseEntity(id = 2L, seriesId = 102L, name = "Zulu Series", providerId = 7L, lastModified = 20_000L),
+ SeriesBrowseEntity(id = 1L, seriesId = 101L, name = "Alpha Series", providerId = 7L, lastModified = 10_000L)
+ )
+ )
+ whenever(favoriteDao.getAllByType(7L, ContentType.SERIES.name)).thenReturn(flowOf(emptyList()))
+
+ val repository = createRepository()
+
+ val result = repository.browseSeries(
+ LibraryBrowseQuery(
+ providerId = 7L,
+ sortBy = LibrarySortBy.LIBRARY,
+ offset = 0,
+ limit = 20
+ )
+ ).first()
+
+ assertThat(result.totalCount).isEqualTo(2)
+ assertThat(result.items.map { it.name }).containsExactly("Zulu Series", "Alpha Series").inOrder()
+ verify(seriesDao).getFreshCursorPage(7L, 40)
+ verify(seriesDao, never()).getByProviderCursorPage(any(), any())
+ }
+
@Test
fun `getSeriesByCategory skips legacy xtream empty retry hydration`() = runTest {
whenever(preferencesRepository.parentalControlLevel).thenReturn(flowOf(0))