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

Toomics: various fixes (#5848) 

* Toomics: various fixes

* Add comment
This commit is contained in:
scb261 2021-02-14 17:33:51 +02:00 committed by GitHub
parent c5150c26eb
commit 06cd2b8779
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/toomics/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'Toomics' extName = 'Toomics'
pkgNameSuffix = 'all.toomics' pkgNameSuffix = 'all.toomics'
extClass = '.ToomicsFactory' extClass = '.ToomicsFactory'
extVersionCode = 5 extVersionCode = 6
libVersion = '1.2' libVersion = '1.2'
} }

23
src/all/toomics/src/eu/kanade/tachiyomi/extension/all/toomics/ToomicsGlobal.kt
View File

@ -43,24 +43,23 @@ abstract class ToomicsGlobal(
.add("User-Agent", USER_AGENT) .add("User-Agent", USER_AGENT)
override fun popularMangaRequest(page: Int): Request { override fun popularMangaRequest(page: Int): Request {
return GET("$baseUrl/$siteLang/webtoon/free_all", headers) return GET("$baseUrl/$siteLang/webtoon/favorite", headers)
} }
// ToomicsGlobal does not have a popular list, so use recommended instead. // ToomicsGlobal does not have a popular list, so use recommended instead.
override fun popularMangaSelector(): String = "li > div.visual" override fun popularMangaSelector(): String = "li > div.visual"
override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply {
element.select("a").let { title = element.select("h4[class$=title]").first().ownText()
title = it.text() // sometimes href contains "/ab/on" at the end and redirects to a chapter instead of manga
setUrlWithoutDomain(it.attr("href")) setUrlWithoutDomain(element.select("a").attr("href").removeSuffix("/ab/on"))
} thumbnail_url = element.select("img").attr("src")
thumbnail_url = element.select("img").attr("abs:data-original")
} }
override fun popularMangaNextPageSelector(): String? = null override fun popularMangaNextPageSelector(): String? = null
override fun latestUpdatesRequest(page: Int): Request { override fun latestUpdatesRequest(page: Int): Request {
return GET("$baseUrl/$siteLang/webtoon/free", headers) return GET("$baseUrl/$siteLang/webtoon/new_comics", headers)
} }
override fun latestUpdatesSelector(): String = popularMangaSelector() override fun latestUpdatesSelector(): String = popularMangaSelector()
@ -119,13 +118,14 @@ abstract class ToomicsGlobal(
.map { it.reversed() } .map { it.reversed() }
} }
override fun chapterListSelector(): String = "li.normal_ep:has(.coin-type1)" // coin-type1 - free chapter, coin-type6 - already read chapter
override fun chapterListSelector(): String = "li.normal_ep:has(.coin-type1, .coin-type6)"
override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply {
val num = element.select("div.cell-num").text() val num = element.select("div.cell-num").text()
val numText = if (num.isNotEmpty()) "$num - " else "" val numText = if (num.isNotEmpty()) "$num - " else ""
name = numText + element.select("div.cell-title")?.first()?.ownText() name = numText + element.select("div.cell-title strong")?.first()?.ownText()
chapter_number = num.toFloatOrNull() ?: -1f chapter_number = num.toFloatOrNull() ?: -1f
date_upload = parseChapterDate(element.select("div.cell-time time").text()!!) date_upload = parseChapterDate(element.select("div.cell-time time").text()!!)
scanlator = "Toomics" scanlator = "Toomics"
@ -135,10 +135,13 @@ abstract class ToomicsGlobal(
} }
override fun pageListParse(document: Document): List<Page> { override fun pageListParse(document: Document): List<Page> {
if (document.select("div.section_age_verif").isNotEmpty())
throw Exception("Verify age via WebView")
val url = document.select("head meta[property='og:url']").attr("content") val url = document.select("head meta[property='og:url']").attr("content")
return document.select("div[id^=load_image_] img") return document.select("div[id^=load_image_] img")
.mapIndexed { i, el -> Page(i, url, el.attr("abs:data-original")) } .mapIndexed { i, el -> Page(i, url, el.attr("data-src")) }
} }
override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used") override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")