prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Koitharu
2020-03-29 18:03:58 +03:00
parent aad26d24ec 450daf17fd
commit f15f0ce769
4 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -15,7 +15,7 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode gitCommits versionCode gitCommits
versionName '0.1.2' versionName '0.1.3'
buildConfigField 'String', 'GIT_BRANCH', "\"${gitBranch}\"" buildConfigField 'String', 'GIT_BRANCH', "\"${gitBranch}\""

7
app/src/main/java/org/koitharu/kotatsu/domain/MangaDataRepository.kt
View File

@@ -1,5 +1,6 @@
package org.koitharu.kotatsu.domain package org.koitharu.kotatsu.domain
import androidx.room.withTransaction
import org.koin.core.KoinComponent import org.koin.core.KoinComponent
import org.koin.core.inject import org.koin.core.inject
import org.koitharu.kotatsu.core.db.MangaDatabase import org.koitharu.kotatsu.core.db.MangaDatabase
@@ -31,6 +32,10 @@ class MangaDataRepository : KoinComponent {
} }
suspend fun storeManga(manga: Manga) { suspend fun storeManga(manga: Manga) {
db.mangaDao.upsert(MangaEntity.from(manga), manga.tags.map(TagEntity.Companion::fromMangaTag)) val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
db.withTransaction {
db.tagsDao.upsert(tags)
db.mangaDao.upsert(MangaEntity.from(manga), tags)
}
} }
} }

11
app/src/main/java/org/koitharu/kotatsu/domain/favourites/FavouritesRepository.kt
View File

@@ -1,5 +1,6 @@
package org.koitharu.kotatsu.domain.favourites package org.koitharu.kotatsu.domain.favourites
import androidx.room.withTransaction
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.koin.core.KoinComponent import org.koin.core.KoinComponent
@@ -48,10 +49,12 @@ class FavouritesRepository : KoinComponent {
suspend fun addToCategory(manga: Manga, categoryId: Long) { suspend fun addToCategory(manga: Manga, categoryId: Long) {
val tags = manga.tags.map(TagEntity.Companion::fromMangaTag) val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
db.tagsDao.upsert(tags) db.withTransaction {
db.mangaDao.upsert(MangaEntity.from(manga), tags) db.tagsDao.upsert(tags)
val entity = FavouriteEntity(manga.id, categoryId, System.currentTimeMillis()) db.mangaDao.upsert(MangaEntity.from(manga), tags)
db.favouritesDao.add(entity) val entity = FavouriteEntity(manga.id, categoryId, System.currentTimeMillis())
db.favouritesDao.add(entity)
}
notifyFavouritesChanged(manga.id) notifyFavouritesChanged(manga.id)
} }

30
app/src/main/java/org/koitharu/kotatsu/domain/history/HistoryRepository.kt
View File

@@ -1,5 +1,6 @@
package org.koitharu.kotatsu.domain.history package org.koitharu.kotatsu.domain.history
import androidx.room.withTransaction
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.koin.core.KoinComponent import org.koin.core.KoinComponent
@@ -24,19 +25,22 @@ class HistoryRepository : KoinComponent {
suspend fun addOrUpdate(manga: Manga, chapterId: Long, page: Int, scroll: Float) { suspend fun addOrUpdate(manga: Manga, chapterId: Long, page: Int, scroll: Float) {
val tags = manga.tags.map(TagEntity.Companion::fromMangaTag) val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
db.tagsDao.upsert(tags) db.withTransaction {
db.mangaDao.upsert(MangaEntity.from(manga), tags) db.tagsDao.upsert(tags)
if (db.historyDao.upsert( db.mangaDao.upsert(MangaEntity.from(manga), tags)
HistoryEntity( if (db.historyDao.upsert(
mangaId = manga.id, HistoryEntity(
createdAt = System.currentTimeMillis(), mangaId = manga.id,
updatedAt = System.currentTimeMillis(), createdAt = System.currentTimeMillis(),
chapterId = chapterId, updatedAt = System.currentTimeMillis(),
page = page, chapterId = chapterId,
scroll = scroll page = page,
) scroll = scroll
)) { )
TrackingRepository().insertOrNothing(manga) )
) {
TrackingRepository().insertOrNothing(manga)
}
} }
notifyHistoryChanged() notifyHistoryChanged()
} }