From 3979c887b04df00c7b8d8ed7ca204ba1b5a18e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nam=20Nguy=E1=BB=85n?= Date: Mon, 25 Mar 2019 00:05:06 +0700 Subject: [PATCH] Fix TruyenTranhLH, HocVienTruyenTranh, BlogTruyen small issues (#967) Fix TruyenTranhLH, HocVienTruyenTranh, BlogTruyen small issues --- src/vi/academyvn/build.gradle | 2 +- .../vi/academyvn/HocVienTruyenTranh.kt | 7 +++--- src/vi/blogtruyen/build.gradle | 2 +- .../extension/vi/blogtruyen/BlogTruyen.kt | 6 ++--- src/vi/truyentranhlh/build.gradle | 2 +- .../vi/truyentranhlh/TruyenTranhLH.kt | 22 ++++++++++++------- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/vi/academyvn/build.gradle b/src/vi/academyvn/build.gradle index 0bca38547..c9f371788 100644 --- a/src/vi/academyvn/build.gradle +++ b/src/vi/academyvn/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: HocVienTruyenTranh' pkgNameSuffix = 'vi.academyvn' extClass = '.HocVienTruyenTranh' - extVersionCode = 5 + extVersionCode = 6 libVersion = '1.2' } diff --git a/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt b/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt index 5546b7cb2..787d3c6e0 100644 --- a/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt +++ b/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt @@ -27,11 +27,11 @@ class HocVienTruyenTranh : ParsedHttpSource() { override fun latestUpdatesSelector() = "table.table.table-hover > tbody > tr" override fun popularMangaRequest(page: Int): Request { - return GET("$baseUrl/manga/all?filter_type=view&page=$page", headers) + return GET("$baseUrl/truyen/all?filter_type=view&page=$page", headers) } override fun latestUpdatesRequest(page: Int): Request { - return GET("$baseUrl/manga/all?filter_type=latest-chapter&page=$page", headers) + return GET("$baseUrl/truyen/all?filter_type=latest-chapter&page=$page", headers) } override fun popularMangaFromElement(element: Element): SManga { @@ -131,9 +131,8 @@ class HocVienTruyenTranh : ParsedHttpSource() { override fun pageListParse(document: Document): List { val pages = mutableListOf() - var i = 0 document.select("div.manga-container > img").forEach { - pages.add(Page(i++, "", it.attr("src"))) + pages.add(Page(pages.size, "", it.attr("src"))) } return pages } diff --git a/src/vi/blogtruyen/build.gradle b/src/vi/blogtruyen/build.gradle index 31615cb77..33bf331f7 100644 --- a/src/vi/blogtruyen/build.gradle +++ b/src/vi/blogtruyen/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: BlogTruyen' pkgNameSuffix = 'vi.blogtruyen' extClass = '.BlogTruyen' - extVersionCode = 3 + extVersionCode = 4 libVersion = '1.2' } diff --git a/src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyen.kt b/src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyen.kt index c3e8a9641..94374d72a 100644 --- a/src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyen.kt +++ b/src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyen.kt @@ -13,6 +13,7 @@ import okhttp3.Request import org.jsoup.nodes.Document import org.jsoup.nodes.Element import java.text.SimpleDateFormat +import java.util.* class BlogTruyen : ParsedHttpSource() { @@ -53,7 +54,6 @@ class BlogTruyen : ParsedHttpSource() { element.select("a").first().let { manga.setUrlWithoutDomain(it.attr("href")) manga.title = element.select("img").first().attr("alt").toString() - //manga.thumbnail_url = element.select("img").first().attr("src").toString() } return manga } @@ -107,7 +107,7 @@ class BlogTruyen : ParsedHttpSource() { val manga = SManga.create() manga.author = infoElement.select("p:contains(Tác giả) > a").first()?.text() - manga.genre = infoElement.select("p:contains(Thể loại) > span.category > a").joinToString { it.text() } + manga.genre = infoElement.select("span.category a").joinToString { it.text() } manga.description = document.select("div.detail > div.content").text() manga.status = infoElement.select("p:contains(Trạng thái) > span.color-red").first()?.text().orEmpty().let { parseStatus(it) } manga.thumbnail_url = document.select("div.thumbnail > img").first()?.attr("src") @@ -129,7 +129,7 @@ class BlogTruyen : ParsedHttpSource() { chapter.setUrlWithoutDomain(urlElement.attr("href")) chapter.name = urlElement.attr("title") chapter.date_upload = element.select("span.publishedDate").first()?.text()?.let { - SimpleDateFormat("dd/MM/yyyy HH:mm").parse(it).time + SimpleDateFormat("dd/MM/yyyy HH:mm", Locale.ENGLISH).parse(it).time } ?: 0 return chapter } diff --git a/src/vi/truyentranhlh/build.gradle b/src/vi/truyentranhlh/build.gradle index 00c6e2b32..a7544bea0 100644 --- a/src/vi/truyentranhlh/build.gradle +++ b/src/vi/truyentranhlh/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: TruyenTranhLH' pkgNameSuffix = 'vi.truyentranhlh' extClass = '.TruyenTranhLH' - extVersionCode = 5 + extVersionCode = 6 libVersion = '1.2' } diff --git a/src/vi/truyentranhlh/src/eu/kanade/tachiyomi/extension/vi/truyentranhlh/TruyenTranhLH.kt b/src/vi/truyentranhlh/src/eu/kanade/tachiyomi/extension/vi/truyentranhlh/TruyenTranhLH.kt index 3e4786255..6b7020de9 100644 --- a/src/vi/truyentranhlh/src/eu/kanade/tachiyomi/extension/vi/truyentranhlh/TruyenTranhLH.kt +++ b/src/vi/truyentranhlh/src/eu/kanade/tachiyomi/extension/vi/truyentranhlh/TruyenTranhLH.kt @@ -6,6 +6,7 @@ import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.* import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.util.asJsoup +import okhttp3.Headers import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response @@ -116,7 +117,12 @@ class TruyenTranhLH : HttpSource() { manga.genre = infoElement.select("a.btn.btn-xs.btn-danger").joinToString { it.text() } manga.description = document.select("h3:contains(Sơ lược) + p").text() manga.status = infoElement.select("a.btn.btn-xs.btn-success").last()?.text().orEmpty().let { parseStatus(it) } - manga.thumbnail_url = document.select("img.thumbnail").first()?.attr("src") + val imgUrl = document.select("img.thumbnail").first()?.attr("src") + if (imgUrl!!.startsWith("app/")) { + manga.thumbnail_url = "$baseUrl/$imgUrl" + } else { + manga.thumbnail_url = imgUrl + } return manga } @@ -177,18 +183,18 @@ class TruyenTranhLH : HttpSource() { override fun pageListParse(response: Response): List { val document = response.asJsoup() val pages = mutableListOf() - var i = 0 document.select("div.chapter-content > img").forEach { - var url = it.attr("src") - if (StringUtil.isBlank(url)) { - url = it.attr("data-original") - } - pages.add(Page(i++, "", url)) + pages.add(Page(pages.size, "", it.attr("src"))) } return pages } - override fun imageUrlRequest(page: Page) = GET(page.url) + override fun imageRequest(page: Page): Request { + val imgHeader = Headers.Builder().apply { + add("Referer", baseUrl) + }.build() + return GET(page.imageUrl!!, imgHeader) + } override fun imageUrlParse(response: Response): String { return ""