From 60c8d35bd77ab535feb694dcab3b3ae1ed16d1aa Mon Sep 17 00:00:00 2001 From: Mike <51273546+SnakeDoc83@users.noreply.github.com> Date: Fri, 3 Jan 2020 07:18:28 -0500 Subject: [PATCH] Dilbert fix (#1958) Dilbert fix --- src/en/dilbert/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/en/dilbert/Dilbert.kt | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/en/dilbert/build.gradle b/src/en/dilbert/build.gradle index 3b0fb6340..148b9aaad 100644 --- a/src/en/dilbert/build.gradle +++ b/src/en/dilbert/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: Dilbert' pkgNameSuffix = 'en.dilbert' extClass = '.Dilbert' - extVersionCode = 1 + extVersionCode = 2 libVersion = '1.2' } diff --git a/src/en/dilbert/src/eu/kanade/tachiyomi/extension/en/dilbert/Dilbert.kt b/src/en/dilbert/src/eu/kanade/tachiyomi/extension/en/dilbert/Dilbert.kt index 759b41489..331a4d3c8 100644 --- a/src/en/dilbert/src/eu/kanade/tachiyomi/extension/en/dilbert/Dilbert.kt +++ b/src/en/dilbert/src/eu/kanade/tachiyomi/extension/en/dilbert/Dilbert.kt @@ -11,6 +11,7 @@ import java.text.SimpleDateFormat import java.util.Calendar import java.util.Locale import okhttp3.Headers +import okhttp3.OkHttpClient import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable @@ -25,7 +26,7 @@ class Dilbert : ParsedHttpSource() { override val supportsLatest = false - override val client = network.client.newBuilder() + override val client: OkHttpClient = network.client.newBuilder() .addNetworkInterceptor(RateLimitInterceptor(4)).build() private val userAgent = "Mozilla/5.0 " + @@ -59,7 +60,7 @@ class Dilbert : ParsedHttpSource() { override fun fetchSearchManga(page: Int, query: String, filters: FilterList) = fetchPopularManga(page) - override fun fetchMangaDetails(manga: SManga) = + override fun fetchMangaDetails(manga: SManga): Observable = Observable.just(manga.apply { initialized = true }) private fun chapterListRequest(manga: SManga, page: Int = 1) = @@ -84,8 +85,8 @@ class Dilbert : ParsedHttpSource() { chapters.addAll(it.select(".comic-item").map(::chapterFromElement)) } } - val pages = getChapters().first(".pagination > li:nth-last-child(2) > a").text().toInt() - for (page in 2..pages) getChapters(page) + val pages = getChapters().first(".pagination > li:nth-last-child(2) > a")?.text()?.toIntOrNull() + if (pages != null) for (page in 2..pages) getChapters(page) return Observable.just( chapters.sortedBy(SChapter::date_upload).mapIndexed { i, ch -> ch.apply { chapter_number = i + 1f }