From c339bcdab7da8bb1bd4abe1756daf6f94755f7cc Mon Sep 17 00:00:00 2001 From: Mike <51273546+SnakeDoc83@users.noreply.github.com> Date: Thu, 9 Jan 2020 08:28:34 -0500 Subject: [PATCH] MangaOwl - chapter URLs (#2022) MangaOwl - chapter URLs --- src/en/mangaowl/build.gradle | 2 +- .../extension/en/mangaowl/MangaOwl.kt | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/en/mangaowl/build.gradle b/src/en/mangaowl/build.gradle index 3824f4286..9125445ba 100644 --- a/src/en/mangaowl/build.gradle +++ b/src/en/mangaowl/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: MangaOwl' pkgNameSuffix = 'en.mangaowl' extClass = '.MangaOwl' - extVersionCode = 1 + extVersionCode = 2 libVersion = '1.2' } diff --git a/src/en/mangaowl/src/eu/kanade/tachiyomi/extension/en/mangaowl/MangaOwl.kt b/src/en/mangaowl/src/eu/kanade/tachiyomi/extension/en/mangaowl/MangaOwl.kt index 7aa202d80..fb5d6a9c3 100644 --- a/src/en/mangaowl/src/eu/kanade/tachiyomi/extension/en/mangaowl/MangaOwl.kt +++ b/src/en/mangaowl/src/eu/kanade/tachiyomi/extension/en/mangaowl/MangaOwl.kt @@ -8,7 +8,8 @@ import okhttp3.Request import org.jsoup.nodes.Document import org.jsoup.nodes.Element import java.text.SimpleDateFormat -import java.util.* +import java.util.Locale +import java.util.concurrent.TimeUnit class MangaOwl : ParsedHttpSource() { @@ -20,7 +21,11 @@ class MangaOwl : ParsedHttpSource() { override val supportsLatest = true - override val client: OkHttpClient = network.cloudflareClient + override val client: OkHttpClient = network.cloudflareClient.newBuilder() + .connectTimeout(1, TimeUnit.MINUTES) + .readTimeout(1, TimeUnit.MINUTES) + .writeTimeout(1, TimeUnit.MINUTES) + .build() // Popular @@ -98,7 +103,8 @@ class MangaOwl : ParsedHttpSource() { override fun chapterFromElement(element: Element): SChapter { val chapter = SChapter.create() element.select("a").let { - chapter.setUrlWithoutDomain(it.attr("href")) + // They replace some URLs with a different host getting a path of domain.com/reader/reader/, fix to make usable on baseUrl + chapter.setUrlWithoutDomain(it.attr("href").replace("/reader/reader/", "/reader/")) chapter.name = it.text() } chapter.date_upload = parseChapterDate(element.select("td + td").text()) @@ -119,12 +125,9 @@ class MangaOwl : ParsedHttpSource() { // Pages override fun pageListParse(document: Document): List { - val pages = mutableListOf() - - document.select("div.item img.owl-lazy").forEachIndexed { i, img -> - pages.add(Page(i, "", img.attr("abs:data-src"))) + return document.select("div.item img.owl-lazy").mapIndexed { i, img -> + Page(i, "", img.attr("abs:data-src")) } - return pages } override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")