From 49ab09180df6e98ec75b6c19ee192706b5aab6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nam=20Nguy=E1=BB=85n?= Date: Thu, 21 Mar 2019 01:37:56 +0700 Subject: [PATCH] - Try to fix genre all VI sites (#950) Try to fix error and update old source --- src/vi/academyvn/build.gradle | 6 +++--- .../{Academyvn.kt => HocVienTruyenTranh.kt} | 6 +++--- src/vi/blogtruyen/build.gradle | 6 +++--- .../vi/blogtruyen/{Blogtruyen.kt => BlogTruyen.kt} | 8 ++++---- src/vi/iutruyentranh/build.gradle | 2 +- .../{Iutruyentranh.kt => IuTruyenTranh.kt} | 6 +----- src/vi/truyentranhlh/build.gradle | 6 +++--- .../{Truyentranhlh.kt => TruyenTranhLH.kt} | 13 +++++++++---- 8 files changed, 27 insertions(+), 26 deletions(-) rename src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/{Academyvn.kt => HocVienTruyenTranh.kt} (97%) rename src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/{Blogtruyen.kt => BlogTruyen.kt} (97%) rename src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/{Iutruyentranh.kt => IuTruyenTranh.kt} (98%) rename src/vi/truyentranhlh/src/eu/kanade/tachiyomi/extension/vi/truyentranhlh/{Truyentranhlh.kt => TruyenTranhLH.kt} (95%) diff --git a/src/vi/academyvn/build.gradle b/src/vi/academyvn/build.gradle index 7ae85c8c2..0bca38547 100644 --- a/src/vi/academyvn/build.gradle +++ b/src/vi/academyvn/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' ext { - appName = 'Tachiyomi: AcademyVN' + appName = 'Tachiyomi: HocVienTruyenTranh' pkgNameSuffix = 'vi.academyvn' - extClass = '.Academyvn' - extVersionCode = 4 + extClass = '.HocVienTruyenTranh' + extVersionCode = 5 libVersion = '1.2' } diff --git a/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/Academyvn.kt b/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt similarity index 97% rename from src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/Academyvn.kt rename to src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt index 742f49f82..5546b7cb2 100644 --- a/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/Academyvn.kt +++ b/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt @@ -10,11 +10,11 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import java.util.* -class Academyvn : ParsedHttpSource() { +class HocVienTruyenTranh : ParsedHttpSource() { override val name = "HocVienTruyenTranh" - override val baseUrl = "http://hocvientruyentranh.com" + override val baseUrl = "https://hocvientruyentranh.net" override val lang = "vi" @@ -80,7 +80,7 @@ class Academyvn : ParsedHttpSource() { val manga = SManga.create() manga.author = infoElement.select("p:has(strong:contains(Tác giả:)) > a").first()?.text() - manga.genre = infoElement.select("p:has(strong:contains(Thể loại:)) > *:gt(0)").text() + manga.genre = infoElement.select("p:has(strong:contains(Thể loại:)) > *:gt(0)").joinToString { it.text() } manga.description = infoElement.select("div.__description > p").text() manga.status = infoElement.select("p:has(strong:contains(Tình trạng:))").first()?.text().orEmpty().let { parseStatus(it) } manga.thumbnail_url = document.select("div.__left img").first()?.attr("src") diff --git a/src/vi/blogtruyen/build.gradle b/src/vi/blogtruyen/build.gradle index ff0345630..31615cb77 100644 --- a/src/vi/blogtruyen/build.gradle +++ b/src/vi/blogtruyen/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' ext { - appName = 'Tachiyomi: Blogtruyen' + appName = 'Tachiyomi: BlogTruyen' pkgNameSuffix = 'vi.blogtruyen' - extClass = '.Blogtruyen' - extVersionCode = 2 + extClass = '.BlogTruyen' + extVersionCode = 3 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 similarity index 97% rename from src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/Blogtruyen.kt rename to src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyen.kt index b85f7b9b5..c3e8a9641 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 @@ -15,11 +15,11 @@ import org.jsoup.nodes.Element import java.text.SimpleDateFormat -class Blogtruyen : ParsedHttpSource() { +class BlogTruyen : ParsedHttpSource() { - override val name = "Blogtruyen" + override val name = "BlogTruyen" - override val baseUrl = "http://blogtruyen.com" + override val baseUrl = "https://blogtruyen.com" override val lang = "vi" @@ -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").text() + manga.genre = infoElement.select("p:contains(Thể loại) > 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") diff --git a/src/vi/iutruyentranh/build.gradle b/src/vi/iutruyentranh/build.gradle index 5d42b591a..f53637db9 100644 --- a/src/vi/iutruyentranh/build.gradle +++ b/src/vi/iutruyentranh/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin-android' ext { appName = 'Tachiyomi: IuTruyenTranh' pkgNameSuffix = 'vi.iutruyentranh' - extClass = '.Iutruyentranh' + extClass = '.IuTruyenTranh' extVersionCode = 4 libVersion = '1.2' } diff --git a/src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/Iutruyentranh.kt b/src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/IuTruyenTranh.kt similarity index 98% rename from src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/Iutruyentranh.kt rename to src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/IuTruyenTranh.kt index f0512e88d..4f015cd42 100644 --- a/src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/Iutruyentranh.kt +++ b/src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/IuTruyenTranh.kt @@ -14,11 +14,7 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import java.text.SimpleDateFormat -/** - * Created by Nam Nguyen on 29/4/2017. - */ - -class Iutruyentranh : ParsedHttpSource() { +class IuTruyenTranh : ParsedHttpSource() { override val name = "IuTruyenTranh" diff --git a/src/vi/truyentranhlh/build.gradle b/src/vi/truyentranhlh/build.gradle index d0f7dd639..00c6e2b32 100644 --- a/src/vi/truyentranhlh/build.gradle +++ b/src/vi/truyentranhlh/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' ext { - appName = 'Tachiyomi: TruyenTranhLh' + appName = 'Tachiyomi: TruyenTranhLH' pkgNameSuffix = 'vi.truyentranhlh' - extClass = '.Truyentranhlh' - extVersionCode = 4 + extClass = '.TruyenTranhLH' + extVersionCode = 5 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 similarity index 95% rename from src/vi/truyentranhlh/src/eu/kanade/tachiyomi/extension/vi/truyentranhlh/Truyentranhlh.kt rename to src/vi/truyentranhlh/src/eu/kanade/tachiyomi/extension/vi/truyentranhlh/TruyenTranhLH.kt index a446b15eb..3e4786255 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 @@ -9,14 +9,15 @@ import eu.kanade.tachiyomi.util.asJsoup import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response +import org.jsoup.helper.StringUtil import org.jsoup.nodes.Element import java.util.* -class Truyentranhlh : HttpSource() { +class TruyenTranhLH : HttpSource() { override val name = "TruyenTranhLH" - override val baseUrl = "http://truyentranhlh.com" + override val baseUrl = "https://truyentranhlh.net" override val lang = "vi" @@ -112,7 +113,7 @@ class Truyentranhlh : HttpSource() { val manga = SManga.create() manga.author = infoElement.select("a.btn.btn-xs.btn-info").first()?.text() - manga.genre = infoElement.select("a.btn.btn-xs.btn-danger").text() + 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") @@ -178,7 +179,11 @@ class Truyentranhlh : HttpSource() { val pages = mutableListOf() var i = 0 document.select("div.chapter-content > img").forEach { - pages.add(Page(i++, "", it.attr("src"))) + var url = it.attr("src") + if (StringUtil.isBlank(url)) { + url = it.attr("data-original") + } + pages.add(Page(i++, "", url)) } return pages }