From c9fddf9e388cff5e4071a89719825dee466deaf4 Mon Sep 17 00:00:00 2001 From: Maddie Witman Date: Sun, 31 Mar 2024 03:49:06 -0400 Subject: [PATCH] Moves upcoming requirement from existence to current day or later. (#606) * Moves upcoming requirement from existence to current day or later. * Suppress millis conversion warning --- .../main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt | 6 +++++- data/src/main/sqldelight/tachiyomi/data/mangas.sq | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt index a1fce650f..06b7bde58 100644 --- a/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt @@ -10,6 +10,8 @@ import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaUpdate import tachiyomi.domain.manga.repository.MangaRepository +import java.time.LocalDate +import java.time.ZoneId class MangaRepositoryImpl( private val handler: DatabaseHandler, @@ -65,9 +67,11 @@ class MangaRepositoryImpl( } } + @Suppress("MagicNumber") override suspend fun getUpcomingManga(statuses: Set): Flow> { + val epochMillis = LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toEpochSecond() * 1000 return handler.subscribeToList { - mangasQueries.getUpcomingManga(statuses, MangaMapper::mapManga) + mangasQueries.getUpcomingManga(epochMillis, statuses, MangaMapper::mapManga) } } diff --git a/data/src/main/sqldelight/tachiyomi/data/mangas.sq b/data/src/main/sqldelight/tachiyomi/data/mangas.sq index 1baea800f..3e21e5bc0 100644 --- a/data/src/main/sqldelight/tachiyomi/data/mangas.sq +++ b/data/src/main/sqldelight/tachiyomi/data/mangas.sq @@ -115,7 +115,7 @@ AND _id != :id; getUpcomingManga: SELECT * FROM mangas -WHERE next_update > 0 +WHERE next_update >= :startOfDay AND favorite = 1 AND status IN :statuses ORDER BY next_update ASC;