Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 16:01:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace history query with actual upsert

Browse Source
This commit is contained in:
arkon 2022-05-29 12:12:06 -04:00
parent 0dbe82c781
commit cd0294b1b6
4 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle.kts
View File

@ -136,6 +136,13 @@ android {
kotlinOptions { kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString() jvmTarget = JavaVersion.VERSION_1_8.toString()
} }
sqldelight {
database("Database") {
packageName = "eu.kanade.tachiyomi"
dialect = "sqlite:3.24"
}
}
} }
dependencies { dependencies {

12
app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt
View File

@ -92,24 +92,14 @@ class HistoryRepositoryImpl(
} }
override suspend fun upsertHistory(historyUpdate: HistoryUpdate) { override suspend fun upsertHistory(historyUpdate: HistoryUpdate) {
try {
try { try {
handler.await { handler.await {
historyQueries.insert( historyQueries.upsert(
historyUpdate.chapterId, historyUpdate.chapterId,
historyUpdate.readAt, historyUpdate.readAt,
historyUpdate.sessionReadDuration, historyUpdate.sessionReadDuration,
) )
} }
} catch (e: Exception) {
handler.await {
historyQueries.update(
historyUpdate.readAt,
historyUpdate.sessionReadDuration,
historyUpdate.chapterId,
)
}
}
} catch (e: Exception) { } catch (e: Exception) {
logcat(LogPriority.ERROR, throwable = e) logcat(LogPriority.ERROR, throwable = e)
} }

10
app/src/main/java/eu/kanade/tachiyomi/data/database/queries/HistoryQueries.kt
View File

@ -30,16 +30,6 @@ interface HistoryQueries : DbProvider {
) )
.prepare() .prepare()
/**
* Updates the history last read.
* Inserts history object if not yet in database
* @param history history object
*/
fun upsertHistoryLastRead(history: History) = db.put()
.`object`(history)
.withPutResolver(HistoryUpsertResolver())
.prepare()
/** /**
* Updates the history last read. * Updates the history last read.
* Inserts history object if not yet in database * Inserts history object if not yet in database

14
app/src/main/sqldelight/data/history.sq
View File

@ -36,12 +36,12 @@ removeResettedHistory:
DELETE FROM history DELETE FROM history
WHERE last_read = 0; WHERE last_read = 0;
insert: upsert:
INSERT INTO history(chapter_id, last_read, time_read) INSERT INTO history(chapter_id, last_read, time_read)
VALUES (:chapterId, :readAt, :readDuration); VALUES (:chapterId, :readAt, :time_read)
ON CONFLICT(chapter_id)
update: DO UPDATE
UPDATE history SET
SET last_read = :readAt, last_read = :readAt,
time_read = time_read + :sessionReadDuration time_read = time_read + :time_read
WHERE chapter_id = :chapterId; WHERE chapter_id = :chapterId;