mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-10 09:27:48 +01:00
Replace history query with actual upsert
This commit is contained in:
parent
0dbe82c781
commit
cd0294b1b6
4 changed files with 21 additions and 34 deletions
|
@ -136,6 +136,13 @@ android {
|
|||
kotlinOptions {
|
||||
jvmTarget = JavaVersion.VERSION_1_8.toString()
|
||||
}
|
||||
|
||||
sqldelight {
|
||||
database("Database") {
|
||||
packageName = "eu.kanade.tachiyomi"
|
||||
dialect = "sqlite:3.24"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
|
|
@ -93,22 +93,12 @@ class HistoryRepositoryImpl(
|
|||
|
||||
override suspend fun upsertHistory(historyUpdate: HistoryUpdate) {
|
||||
try {
|
||||
try {
|
||||
handler.await {
|
||||
historyQueries.insert(
|
||||
historyUpdate.chapterId,
|
||||
historyUpdate.readAt,
|
||||
historyUpdate.sessionReadDuration,
|
||||
)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
handler.await {
|
||||
historyQueries.update(
|
||||
historyUpdate.readAt,
|
||||
historyUpdate.sessionReadDuration,
|
||||
historyUpdate.chapterId,
|
||||
)
|
||||
}
|
||||
handler.await {
|
||||
historyQueries.upsert(
|
||||
historyUpdate.chapterId,
|
||||
historyUpdate.readAt,
|
||||
historyUpdate.sessionReadDuration,
|
||||
)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
logcat(LogPriority.ERROR, throwable = e)
|
||||
|
|
|
@ -30,16 +30,6 @@ interface HistoryQueries : DbProvider {
|
|||
)
|
||||
.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.
|
||||
* Inserts history object if not yet in database
|
||||
|
|
|
@ -36,12 +36,12 @@ removeResettedHistory:
|
|||
DELETE FROM history
|
||||
WHERE last_read = 0;
|
||||
|
||||
insert:
|
||||
upsert:
|
||||
INSERT INTO history(chapter_id, last_read, time_read)
|
||||
VALUES (:chapterId, :readAt, :readDuration);
|
||||
|
||||
update:
|
||||
UPDATE history
|
||||
SET last_read = :readAt,
|
||||
time_read = time_read + :sessionReadDuration
|
||||
WHERE chapter_id = :chapterId;
|
||||
VALUES (:chapterId, :readAt, :time_read)
|
||||
ON CONFLICT(chapter_id)
|
||||
DO UPDATE
|
||||
SET
|
||||
last_read = :readAt,
|
||||
time_read = time_read + :time_read
|
||||
WHERE chapter_id = :chapterId;
|
Loading…
Reference in a new issue