Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce legacy database models usage

Browse Source
This commit is contained in:
Jobobby04 2022-12-17 23:33:22 -05:00
parent 260517c708
commit 7ab81771fe
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
View File

@ -6,8 +6,6 @@ import android.graphics.BitmapFactory
import android.net.Uri import android.net.Uri
import androidx.core.net.toUri import androidx.core.net.toUri
import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.UnsortedPreferences
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.MangaImpl
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.network.await
@ -123,7 +121,7 @@ class EHentai(
/** /**
* Gallery list entry * Gallery list entry
*/ */
data class ParsedManga(val fav: Int, val manga: Manga, val metadata: EHentaiSearchMetadata) data class ParsedManga(val fav: Int, val manga: SManga, val metadata: EHentaiSearchMetadata)
private fun extendedGenericMangaParse(doc: Document) = with(doc) { private fun extendedGenericMangaParse(doc: Document) = with(doc) {
// Parse mangas (supports compact + extended layout) // Parse mangas (supports compact + extended layout)
@ -145,9 +143,8 @@ class EHentai(
fav = FAVORITES_BORDER_HEX_COLORS.indexOf( fav = FAVORITES_BORDER_HEX_COLORS.indexOf(
favElement?.attr("style")?.substring(14, 17), favElement?.attr("style")?.substring(14, 17),
), ),
manga = MangaImpl().apply { manga = SManga.create().apply {
// Get title // Get title
source = this@EHentai.id
title = thumbnailElement.attr("title") title = thumbnailElement.attr("title")
url = EHentaiSearchMetadata.normalizeUrl(linkElement.attr("href")) url = EHentaiSearchMetadata.normalizeUrl(linkElement.attr("href"))
// Get image // Get image

12
app/src/main/java/exh/favorites/LocalFavoritesStorage.kt
View File

@ -7,10 +7,11 @@ import eu.kanade.domain.manga.interactor.GetFavoriteEntries
import eu.kanade.domain.manga.interactor.GetFavorites import eu.kanade.domain.manga.interactor.GetFavorites
import eu.kanade.domain.manga.interactor.InsertFavoriteEntries import eu.kanade.domain.manga.interactor.InsertFavoriteEntries
import eu.kanade.domain.manga.model.Manga import eu.kanade.domain.manga.model.Manga
import eu.kanade.tachiyomi.data.database.models.toDomainManga import eu.kanade.domain.manga.model.toDomainManga
import eu.kanade.tachiyomi.source.online.all.EHentai import eu.kanade.tachiyomi.source.online.all.EHentai
import exh.favorites.sql.models.FavoriteEntry import exh.favorites.sql.models.FavoriteEntry
import exh.metadata.metadata.EHentaiSearchMetadata import exh.metadata.metadata.EHentaiSearchMetadata
import exh.source.EXH_SOURCE_ID
import exh.source.isEhBasedManga import exh.source.isEhBasedManga
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.asFlow import kotlinx.coroutines.flow.asFlow
@ -36,11 +37,10 @@ class LocalFavoritesStorage {
suspend fun getChangedRemoteEntries(entries: List<EHentai.ParsedManga>) = entries suspend fun getChangedRemoteEntries(entries: List<EHentai.ParsedManga>) = entries
.asFlow() .asFlow()
.map { .map {
it.fav to it.manga.apply { it.fav to it.manga.toDomainManga(EXH_SOURCE_ID).copy(
id = -1 favorite = true,
favorite = true dateAdded = System.currentTimeMillis(),
date_added = System.currentTimeMillis() )
}.toDomainManga()!!
} }
.parseToFavoriteEntries() .parseToFavoriteEntries()
.getChangedEntries() .getChangedEntries()