diff --git a/lib/duktape-stub/src/com/squareup/duktape/Duktape.java b/lib/duktape-stub/src/com/squareup/duktape/Duktape.java index e638b4e63..12bdb0252 100644 --- a/lib/duktape-stub/src/com/squareup/duktape/Duktape.java +++ b/lib/duktape-stub/src/com/squareup/duktape/Duktape.java @@ -23,8 +23,4 @@ public class Duktape implements Closeable { throw new RuntimeException("Stub!"); } - public synchronized T get(final String name, final Class type) { - throw new RuntimeException("Stub!"); - } - } \ No newline at end of file diff --git a/src/es/tumangaonline/build.gradle b/src/es/tumangaonline/build.gradle index dffb0fde1..91284ad97 100755 --- a/src/es/tumangaonline/build.gradle +++ b/src/es/tumangaonline/build.gradle @@ -5,13 +5,12 @@ ext { appName = 'Tachiyomi: TuMangaOnline' pkgNameSuffix = 'es.tumangaonline' extClass = '.TuMangaOnline' - extVersionCode = 5 + extVersionCode = 6 libVersion = '1.2' } dependencies { implementation project(':lib-ratelimit') - compileOnly project(':duktape-stub') } apply from: "$rootDir/common.gradle" diff --git a/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt b/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt index e72432d26..bcf59277d 100755 --- a/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt +++ b/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt @@ -11,7 +11,6 @@ import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.* import java.util.concurrent.TimeUnit -import com.squareup.duktape.Duktape class TuMangaOnline : ParsedHttpSource() { @@ -207,46 +206,17 @@ class TuMangaOnline : ParsedHttpSource() { return GET(url, headers) } - override fun pageListParse(response: Response): List { - val pages = mutableListOf() - val body = response.body()!!.string() - var images = "" - val script = """ - function chapterInit(data) { - pipe = "|"; - idsR = /img_[^\.^;]+\.src\s*=\s*"([^"]+)/gm; - idData = "" - do { - m = idsR.exec(data); - if (m) { - idData = idData + pipe + m[1] ; - } - } while (m); - return idData; - } - """ + override fun pageListParse(response: Response): List = mutableListOf().apply { + val body = response.asJsoup() - Duktape.create().use { - it.evaluate(script) - - val chapterInit = it.get("chapterInit", JSIn::class.java) - images = chapterInit.call(true, body) + body.select("div#viewer-container > div.viewer-image-container > img.viewer-image")?.forEach { + add(Page(size, "", it.attr("src"))) } - - images.split("|").forEachIndexed { index, element -> - if (element.isNotEmpty()) { - pages.add(Page(index, baseUrl, element)) - } - } - - return pages } override fun pageListParse(document: Document) = throw UnsupportedOperationException("Not used") - override fun imageUrlRequest(page: Page): Request { - return GET(page.url, headers) - } + override fun imageUrlRequest(page: Page) = GET(page.url, headers) override fun imageUrlParse(document: Document) = throw UnsupportedOperationException("Not used") @@ -369,9 +339,4 @@ class TuMangaOnline : ParsedHttpSource() { Filter.Select(displayName, vals.map { it.first }.toTypedArray()) { fun toUriPart() = vals[state].second } - - internal interface JSIn { - fun call(b: Boolean, data: String): String - } - }