admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set source properly when creating manga entries

Browse Source 
Fixes #8333

(cherry picked from commit cac80daa71)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
This commit is contained in:
arkon
2022-10-30 17:40:17 -04:00
committed by Jobobby04
parent 402a883f7f
commit 2bbb374e40
14 changed files with 27 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/domain/manga/interactor/NetworkToLocalManga.kt
+5 -5
View File
@@ -7,11 +7,11 @@ class NetworkToLocalManga(
private val mangaRepository: MangaRepository,
) {
suspend fun await(manga: Manga, sourceId: Long): Manga {
val localManga = getManga(manga.url, sourceId)
suspend fun await(manga: Manga): Manga {
val localManga = getManga(manga.url, manga.source)
return when {
localManga == null -> {
val id = insertManga(manga, sourceId)
val id = insertManga(manga)
manga.copy(id = id!!)
}
!localManga.favorite -> {
@@ -29,7 +29,7 @@ class NetworkToLocalManga(
return mangaRepository.getMangaByUrlAndSourceId(url, sourceId)
}
private suspend fun insertManga(manga: Manga, sourceId: Long): Long? {
return mangaRepository.insert(manga.copy(source = sourceId))
private suspend fun insertManga(manga: Manga): Long? {
return mangaRepository.insert(manga)
}
}
app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
+2 -1
View File
@@ -295,7 +295,7 @@ fun Manga.toMangaUpdate(): MangaUpdate {
)
}
fun SManga.toDomainManga(): Manga {
fun SManga.toDomainManga(sourceId: Long): Manga {
return Manga.create().copy(
url = url,
// SY -->
@@ -309,6 +309,7 @@ fun SManga.toDomainManga(): Manga {
thumbnailUrl = thumbnail_url,
updateStrategy = update_strategy,
initialized = initialized,
source = sourceId,
)
}