Build manga and chapter updates with a lambda and track assigned fields

MangaUpdate and ChapterUpdate are built with a lambda that records which fields were assigned, so an update writes only those fields.
This commit is contained in:
AntsyLich
2026-09-27 22:36:13 +06:00
parent 306befb214
commit f8fff318ba
21 changed files with 155 additions and 172 deletions
@@ -0,0 +1,15 @@
package mihon.domain.common
import kotlin.properties.Delegates
import kotlin.reflect.KProperty
abstract class PartialUpdate {
private val assigned = mutableSetOf<String>()
fun isSet(property: KProperty<*>): Boolean = property.name in assigned
protected fun <T> field(initial: T) = Delegates.observable(initial) { property, _, _ ->
assigned += property.name
}
}
@@ -1,21 +1,14 @@
package tachiyomi.domain.chapter.model
data class ChapterUpdate(
val id: Long,
val mangaId: Long? = null,
val read: Boolean? = null,
val bookmark: Boolean? = null,
val lastPageRead: Long? = null,
val dateFetch: Long? = null,
)
import mihon.domain.common.PartialUpdate
fun Chapter.toChapterUpdate(): ChapterUpdate {
return ChapterUpdate(
id = id,
mangaId = mangaId,
read = read,
bookmark = bookmark,
lastPageRead = lastPageRead,
dateFetch = dateFetch,
)
class ChapterUpdate(val id: Long, block: ChapterUpdate.() -> Unit) : PartialUpdate() {
var read: Boolean? by field(null)
var bookmark: Boolean? by field(null)
var lastPageRead: Long? by field(null)
var dateFetch: Long? by field(null)
init {
block()
}
}
@@ -22,7 +22,7 @@ class FetchInterval(
private val getChaptersByMangaId: GetChaptersByMangaId,
) {
suspend fun toMangaUpdate(
suspend fun withFetchInterval(
manga: Manga,
dateTime: LocalDateTime,
timeZone: TimeZone,
@@ -39,7 +39,10 @@ class FetchInterval(
}
val nextUpdate = calculateNextUpdate(manga, interval, dateTime, timeZone, currentWindow)
return MangaUpdate(id = manga.id, nextUpdate = nextUpdate, fetchInterval = interval)
return MangaUpdate(manga.id) {
this.nextUpdate = nextUpdate
fetchInterval = interval
}
}
fun getWindow(localDateTime: LocalDate, timeZone: TimeZone): Pair<Long, Long> {
@@ -12,37 +12,33 @@ class SetMangaChapterFlags(
suspend fun awaitSetDownloadedFilter(manga: Manga, flag: Long): Boolean {
return mangaRepository.update(
MangaUpdate(
id = manga.id,
chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_DOWNLOADED_MASK),
),
MangaUpdate(manga.id) {
chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_DOWNLOADED_MASK)
},
)
}
suspend fun awaitSetUnreadFilter(manga: Manga, flag: Long): Boolean {
return mangaRepository.update(
MangaUpdate(
id = manga.id,
chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_UNREAD_MASK),
),
MangaUpdate(manga.id) {
chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_UNREAD_MASK)
},
)
}
suspend fun awaitSetBookmarkFilter(manga: Manga, flag: Long): Boolean {
return mangaRepository.update(
MangaUpdate(
id = manga.id,
chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_BOOKMARKED_MASK),
),
MangaUpdate(manga.id) {
chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_BOOKMARKED_MASK)
},
)
}
suspend fun awaitSetDisplayMode(manga: Manga, flag: Long): Boolean {
return mangaRepository.update(
MangaUpdate(
id = manga.id,
chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_DISPLAY_MASK),
),
MangaUpdate(manga.id) {
chapterFlags = manga.chapterFlags.setFlag(flag, Manga.CHAPTER_DISPLAY_MASK)
},
)
}
@@ -64,10 +60,9 @@ class SetMangaChapterFlags(
}
}
return mangaRepository.update(
MangaUpdate(
id = manga.id,
chapterFlags = newFlags,
),
MangaUpdate(manga.id) {
chapterFlags = newFlags
},
)
}
@@ -81,15 +76,14 @@ class SetMangaChapterFlags(
displayMode: Long,
): Boolean {
return mangaRepository.update(
MangaUpdate(
id = mangaId,
MangaUpdate(mangaId) {
chapterFlags = 0L.setFlag(unreadFilter, Manga.CHAPTER_UNREAD_MASK)
.setFlag(downloadedFilter, Manga.CHAPTER_DOWNLOADED_MASK)
.setFlag(bookmarkedFilter, Manga.CHAPTER_BOOKMARKED_MASK)
.setFlag(sortingMode, Manga.CHAPTER_SORTING_MASK)
.setFlag(sortingDirection, Manga.CHAPTER_SORT_DIR_MASK)
.setFlag(displayMode, Manga.CHAPTER_DISPLAY_MASK),
),
.setFlag(displayMode, Manga.CHAPTER_DISPLAY_MASK)
},
)
}
@@ -11,10 +11,9 @@ class UpdateMangaNotes(
suspend operator fun invoke(mangaId: Long, notes: String): Boolean {
return mangaRepository.update(
MangaUpdate(
id = mangaId,
notes = notes,
),
MangaUpdate(mangaId) {
this.notes = notes
},
)
}
}
@@ -1,29 +1,19 @@
package tachiyomi.domain.manga.model
data class MangaUpdate(
val id: Long,
val favorite: Boolean? = null,
val lastUpdate: Long? = null,
val nextUpdate: Long? = null,
val fetchInterval: Int? = null,
val dateAdded: Long? = null,
val viewerFlags: Long? = null,
val chapterFlags: Long? = null,
val coverLastModified: Long? = null,
val notes: String? = null,
)
import mihon.domain.common.PartialUpdate
fun Manga.toMangaUpdate(): MangaUpdate {
return MangaUpdate(
id = id,
favorite = favorite,
lastUpdate = lastUpdate,
nextUpdate = nextUpdate,
fetchInterval = fetchInterval,
dateAdded = dateAdded,
viewerFlags = viewerFlags,
chapterFlags = chapterFlags,
coverLastModified = coverLastModified,
notes = notes,
)
class MangaUpdate(val id: Long, block: MangaUpdate.() -> Unit) : PartialUpdate() {
var favorite: Boolean? by field(null)
var lastUpdate: Long? by field(null)
var nextUpdate: Long? by field(null)
var fetchInterval: Int? by field(null)
var dateAdded: Long? by field(null)
var viewerFlags: Long? by field(null)
var chapterFlags: Long? by field(null)
var coverLastModified: Long? by field(null)
var notes: String? by field(null)
init {
block()
}
}