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

Move new smart recommends to use new manga type detection

Browse Source
This commit is contained in:
Jobobby04 2020-05-18 20:19:18 -04:00
parent 68b13c6425
commit 24067e1e97
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/RecommendsPager.kt
View File

@ -12,7 +12,8 @@ import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.MangasPage
import eu.kanade.tachiyomi.source.model.SMangaImpl import eu.kanade.tachiyomi.source.model.SMangaImpl
import java.util.Locale import exh.util.MangaType
import exh.util.mangaType
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
@ -156,7 +157,7 @@ open class RecommendsPager(
SMangaImpl().apply { SMangaImpl().apply {
this.title = rec["title"].obj["romaji"].nullString this.title = rec["title"].obj["romaji"].nullString
?: rec["title"].obj["english"].nullString ?: rec["title"].obj["english"].nullString
?: rec["title"].obj["native"].string ?: rec["title"].obj["native"].string
this.thumbnail_url = rec["coverImage"].obj["large"].string this.thumbnail_url = rec["coverImage"].obj["large"].string
this.initialized = true this.initialized = true
this.url = rec["siteUrl"].string this.url = rec["siteUrl"].string
@ -167,19 +168,7 @@ open class RecommendsPager(
override fun requestNext(): Observable<MangasPage> { override fun requestNext(): Observable<MangasPage> {
if (smart) { if (smart) {
val myAnimeListPoints = 0 preferredApi = if (manga.mangaType() != MangaType.TYPE_MANGA) API.ANILIST else preferredApi
val anilistPoints =
anilistSmart.count { manga.genre!!.toLowerCase(Locale.ROOT).contains(it) }
val apiPoints = listOf(
API.MYANIMELIST to myAnimeListPoints,
API.ANILIST to anilistPoints
).sortedWith(
compareBy(
{ (_, value) -> value },
{ (key, _) -> key == preferredApi }
)
)
preferredApi = apiPoints.last().first
Log.d("SMART RECOMMEND", preferredApi.toString()) Log.d("SMART RECOMMEND", preferredApi.toString())
} }