From 48ac7ffcf952eae70d9c111c8124dd698be5f082 Mon Sep 17 00:00:00 2001 From: Amine A <15179425+AmineI@users.noreply.github.com> Date: Wed, 27 Mar 2019 00:38:18 +0100 Subject: [PATCH] Filter out "untranslated preview pictures" and RAWs from JapScan. (#972) Filter out "untranslated preview pictures" and RAWs from JapScan. --- src/fr/japscan/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/fr/japscan/Japscan.kt | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/fr/japscan/build.gradle b/src/fr/japscan/build.gradle index 5b200fbb0..785e85a0b 100644 --- a/src/fr/japscan/build.gradle +++ b/src/fr/japscan/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: Japscan' pkgNameSuffix = 'fr.japscan' extClass = '.Japscan' - extVersionCode = 9 + extVersionCode = 10 libVersion = '1.2' } diff --git a/src/fr/japscan/src/eu/kanade/tachiyomi/extension/fr/japscan/Japscan.kt b/src/fr/japscan/src/eu/kanade/tachiyomi/extension/fr/japscan/Japscan.kt index 476e9715f..17b5aa039 100644 --- a/src/fr/japscan/src/eu/kanade/tachiyomi/extension/fr/japscan/Japscan.kt +++ b/src/fr/japscan/src/eu/kanade/tachiyomi/extension/fr/japscan/Japscan.kt @@ -159,14 +159,19 @@ class Japscan : ParsedHttpSource() { else -> SManga.UNKNOWN } - override fun chapterListSelector() = "div#chapters_list > div.collapse > div.chapters_list" + override fun chapterListSelector() = "#chapters_list > div.collapse > div.chapters_list"+ + ":not(:has(.badge:contains(SPOILER),.badge:contains(RAW),.badge:contains(VUS)))" + //JapScan sometimes uploads some "spoiler preview" chapters, containing 2 or 3 untranslated pictures taken from a raw. Sometimes they also upload full RAWs/US versions and replace them with a translation as soon as available. + //Those have a span.badge "SPOILER" or "RAW". The additional pseudo selector makes sure to exclude these from the chapter list. + override fun chapterFromElement(element: Element): SChapter { val urlElement = element.select("a").first() val chapter = SChapter.create() chapter.setUrlWithoutDomain(urlElement.attr("href")) - chapter.name = urlElement.text().replace(" VUS", "") + chapter.name = urlElement.ownText() + //Using ownText() doesn't include childs' text, like "VUS" or "RAW" badges, in the chapter name. chapter.date_upload = element.select("> span").text().trim().let { parseChapterDate(it) } return chapter }