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

Hentaimimi proper fix (#7608) 

* Properly parse HentaiMimi pages list

* HentaiMimi version bump

* Add kotlinx-serialization to build.gradle (HentaiMimi)
This commit is contained in:
Maxim Kuleshov 2021-06-12 01:11:29 +03:00 committed by GitHub
parent 8b1881a9a3
commit 71986a1c6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/en/hentaimimi/build.gradle
View File

@ -1,11 +1,12 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlinx-serialization'
ext { ext {
extName = 'HentaiMimi' extName = 'HentaiMimi'
pkgNameSuffix = 'en.hentaimimi' pkgNameSuffix = 'en.hentaimimi'
extClass = '.HentaiMimi' extClass = '.HentaiMimi'
extVersionCode = 4 extVersionCode = 5
libVersion = '1.2' libVersion = '1.2'
containsNsfw = true containsNsfw = true
} }

20
src/en/hentaimimi/src/eu/kanade/tachiyomi/extension/en/hentaimimi/HentaiMimi.kt
View File

@ -9,12 +9,16 @@ import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.ParsedHttpSource import eu.kanade.tachiyomi.source.online.ParsedHttpSource
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.jsonArray
import kotlinx.serialization.json.jsonPrimitive
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
/* /*
@ -30,6 +34,8 @@ class HentaiMimi : ParsedHttpSource() {
override val name = "HentaiMimi" override val name = "HentaiMimi"
override val supportsLatest = true override val supportsLatest = true
private val json: Json by injectLazy()
override val client: OkHttpClient = network.client.newBuilder() override val client: OkHttpClient = network.client.newBuilder()
.addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS)) .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
.build() .build()
@ -150,16 +156,16 @@ class HentaiMimi : ParsedHttpSource() {
override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used") override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")
override fun pageListParse(document: Document): List<Page> { override fun pageListParse(document: Document): List<Page> {
val pagesJsSource = document.select("body main script").html()
val pagesJsArray = pagesJsSource.substring(pagesJsSource.indexOf("["))
val pages = mutableListOf<Page>() val pages = mutableListOf<Page>()
document.select("body main script").html().substringAfter("[").substringBefore("]").split("\",\"").forEachIndexed { index, it ->
val url = "$baseUrl/${it.replace("\\/", "/").replace("\"", "")}" // note: a simple JS array is also a valid JSON array - just unmarshal it
json.parseToJsonElement(pagesJsArray).jsonArray.mapIndexed { index, jsonElement ->
val url = "$baseUrl/${jsonElement.jsonPrimitive.content.replace("#", "%23")}"
pages.add(Page(index, url, url)) pages.add(Page(index, url, url))
} }
/*document.select("div#lightgallery > a").forEachIndexed() { index, it ->
val url = it.select("img").attr("abs:src")
pages.add(Page(index, url, url))
}*/
return pages return pages
} }