From e850a60f9878c07d91e1bf3656d488c8352d9724 Mon Sep 17 00:00:00 2001 From: Arraiment <76941874+Arraiment@users.noreply.github.com> Date: Mon, 9 Aug 2021 20:06:42 +0800 Subject: [PATCH] Small fixes for 3 sources (#8492) * TruyenQQ: Update base domain * MangaAe: Update chapter url * Sisi Gelap: Update url --- .../tachiyomi/multisrc/madara/MadaraGenerator.kt | 2 +- src/ar/mangaae/build.gradle | 2 +- .../tachiyomi/extension/ar/mangaae/MangaAe.kt | 2 +- src/vi/truyenqq/build.gradle | 2 +- .../tachiyomi/extension/vi/truyenqq/TruyenQQ.kt | 15 ++++++++++----- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index dab42d718..fe0aedd6f 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -314,7 +314,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Reset Scans", "https://reset-scans.com", "en", overrideVersionCode = 3), SingleLang("Rüya Manga", "https://www.ruyamanga.com", "tr", className = "RuyaManga", overrideVersionCode = 1), SingleLang("S2Manga", "https://s2manga.com", "en", overrideVersionCode = 1), - SingleLang("SISI GELAP", "https://baru.sisigelap.club/", "id", overrideVersionCode = 2), + SingleLang("SISI GELAP", "https://sigel.xyz", "id", overrideVersionCode = 3), SingleLang("SamuraiScan", "https://samuraiscan.com", "es"), SingleLang("Sani-Go", "https://sani-go.net", "ar", className = "SaniGo", overrideVersionCode = 1), SingleLang("Sawamics", "https://sawamics.com", "en"), diff --git a/src/ar/mangaae/build.gradle b/src/ar/mangaae/build.gradle index 631b4f44b..1f928a8c1 100644 --- a/src/ar/mangaae/build.gradle +++ b/src/ar/mangaae/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Manga.ae' pkgNameSuffix = 'ar.mangaae' extClass = '.MangaAe' - extVersionCode = 7 + extVersionCode = 8 libVersion = '1.2' } diff --git a/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt b/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt index 264a67e39..554b91add 100644 --- a/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt +++ b/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt @@ -125,7 +125,7 @@ class MangaAe : ParsedHttpSource() { val chapter = SChapter.create() element.select("a").let { // use full pages for easier links - chapter.setUrlWithoutDomain(it.attr("href").removeSuffix("/1/") + "/0/full") + chapter.setUrlWithoutDomain(it.attr("href").removeSuffix("/1/") + "/0/fully") chapter.name = "\u061C" + it.text() // Add unicode ARABIC LETTER MARK to ensure all titles are right to left } return chapter diff --git a/src/vi/truyenqq/build.gradle b/src/vi/truyenqq/build.gradle index f691867c2..e091dd12e 100644 --- a/src/vi/truyenqq/build.gradle +++ b/src/vi/truyenqq/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'TruyenQQ' pkgNameSuffix = 'vi.truyenqq' extClass = '.TruyenQQ' - extVersionCode = 3 + extVersionCode = 4 libVersion = '1.2' } diff --git a/src/vi/truyenqq/src/eu/kanade/tachiyomi/extension/vi/truyenqq/TruyenQQ.kt b/src/vi/truyenqq/src/eu/kanade/tachiyomi/extension/vi/truyenqq/TruyenQQ.kt index 33c1ba88b..860738d48 100644 --- a/src/vi/truyenqq/src/eu/kanade/tachiyomi/extension/vi/truyenqq/TruyenQQ.kt +++ b/src/vi/truyenqq/src/eu/kanade/tachiyomi/extension/vi/truyenqq/TruyenQQ.kt @@ -17,16 +17,21 @@ import java.util.Locale import java.util.concurrent.TimeUnit class TruyenQQ : ParsedHttpSource() { + override val name: String = "TruyenQQ" + override val lang: String = "vi" - override val baseUrl: String = "https://truyenqq.com" + + override val baseUrl: String = "https://truyenqq.net" + override val supportsLatest: Boolean = true + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .connectTimeout(1, TimeUnit.MINUTES) .readTimeout(1, TimeUnit.MINUTES) .retryOnConnectionFailure(true) .followRedirects(true) - .build()!! + .build() override fun headersBuilder(): Headers.Builder { return super.headersBuilder().add("Referer", baseUrl) @@ -36,7 +41,7 @@ class TruyenQQ : ParsedHttpSource() { override fun popularMangaRequest(page: Int): Request { return GET("$baseUrl/top-thang/trang-$page.html", headers) } - override fun popularMangaNextPageSelector(): String? = "a.pagination-link:contains(›)" + override fun popularMangaNextPageSelector(): String = "a.pagination-link:contains(›)" override fun popularMangaSelector(): String = "div.story-item" override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { setUrlWithoutDomain(element.select("a").first().attr("abs:href")) @@ -48,7 +53,7 @@ class TruyenQQ : ParsedHttpSource() { override fun latestUpdatesRequest(page: Int): Request { return GET("$baseUrl/truyen-moi-cap-nhat/trang-$page.html", headers) } - override fun latestUpdatesNextPageSelector(): String? = popularMangaNextPageSelector() + override fun latestUpdatesNextPageSelector(): String = popularMangaNextPageSelector() override fun latestUpdatesSelector(): String = popularMangaSelector() override fun latestUpdatesFromElement(element: Element): SManga = popularMangaFromElement(element) @@ -60,7 +65,7 @@ class TruyenQQ : ParsedHttpSource() { // Todo Filters } - override fun searchMangaNextPageSelector(): String? = popularMangaNextPageSelector() + override fun searchMangaNextPageSelector(): String = popularMangaNextPageSelector() override fun searchMangaSelector(): String = popularMangaSelector() override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)