[RU]Grouple exclusion of planned chapters (#11712)

* [RU]Grouple exclusion of planned chapters

* category priority
This commit is contained in:
Ejan 2022-05-03 21:18:41 +05:00 committed by GitHub
parent 6feef81ed7
commit 37565f0925
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 13 deletions

View File

@ -5,7 +5,7 @@ ext {
extName = 'AllHentai' extName = 'AllHentai'
pkgNameSuffix = 'ru.allhentai' pkgNameSuffix = 'ru.allhentai'
extClass = '.AllHentai' extClass = '.AllHentai'
extVersionCode = 18 extVersionCode = 19
isNsfw = true isNsfw = true
} }

View File

@ -152,7 +152,7 @@ class AllHentai : ConfigurableSource, ParsedHttpSource() {
manga.title = document.select("h1.names .name").text() manga.title = document.select("h1.names .name").text()
manga.author = authorElement manga.author = authorElement
manga.artist = infoElement.select("span.elem_illustrator").first()?.text() manga.artist = infoElement.select("span.elem_illustrator").first()?.text()
manga.genre = infoElement.select("span.elem_genre").text().split(",").plusElement(category).joinToString { it.trim() } manga.genre = category + ", " + infoElement.select("span.elem_genre").text().split(",").joinToString { it.trim() }
manga.description = document.select("div#tab-description .manga-description").text() manga.description = document.select("div#tab-description .manga-description").text()
manga.status = parseStatus(infoElement.html()) manga.status = parseStatus(infoElement.html())
manga.thumbnail_url = infoElement.select("img").attr("data-full") manga.thumbnail_url = infoElement.select("img").attr("data-full")
@ -183,7 +183,7 @@ class AllHentai : ConfigurableSource, ParsedHttpSource() {
return document.select(chapterListSelector()).map { chapterFromElement(it, manga) } return document.select(chapterListSelector()).map { chapterFromElement(it, manga) }
} }
override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a)" override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a):has(td.date:not(.text-info))"
private fun chapterFromElement(element: Element, manga: SManga): SChapter { private fun chapterFromElement(element: Element, manga: SManga): SChapter {
val urlElement = element.select("a").first() val urlElement = element.select("a").first()

View File

@ -5,7 +5,7 @@ ext {
extName = 'Mintmanga' extName = 'Mintmanga'
pkgNameSuffix = 'ru.mintmanga' pkgNameSuffix = 'ru.mintmanga'
extClass = '.Mintmanga' extClass = '.Mintmanga'
extVersionCode = 41 extVersionCode = 42
} }
dependencies { dependencies {

View File

@ -180,7 +180,7 @@ class Mintmanga : ConfigurableSource, ParsedHttpSource() {
manga.title = document.select("h1.names .name").text() manga.title = document.select("h1.names .name").text()
manga.author = authorElement manga.author = authorElement
manga.artist = infoElement.select("span.elem_illustrator").first()?.text() manga.artist = infoElement.select("span.elem_illustrator").first()?.text()
manga.genre = infoElement.select("span.elem_genre").text().split(",").plusElement(category).plusElement(rawAgeStop).joinToString { it.trim() } manga.genre = category + ", " + rawAgeStop + ", " + infoElement.select("span.elem_genre").text().split(",").joinToString { it.trim() }
var altName = "" var altName = ""
if (infoElement.select(".another-names").isNotEmpty()) { if (infoElement.select(".another-names").isNotEmpty()) {
altName = "Альтернативные названия:\n" + infoElement.select(".another-names").text() + "\n\n" altName = "Альтернативные названия:\n" + infoElement.select(".another-names").text() + "\n\n"
@ -215,7 +215,7 @@ class Mintmanga : ConfigurableSource, ParsedHttpSource() {
return document.select(chapterListSelector()).map { chapterFromElement(it, manga) } return document.select(chapterListSelector()).map { chapterFromElement(it, manga) }
} }
override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a)" override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a):has(td.date:not(.text-info))"
private fun chapterFromElement(element: Element, manga: SManga): SChapter { private fun chapterFromElement(element: Element, manga: SManga): SChapter {
val urlElement = element.select("a").first() val urlElement = element.select("a").first()

View File

@ -5,7 +5,7 @@ ext {
extName = 'Readmanga' extName = 'Readmanga'
pkgNameSuffix = 'ru.readmanga' pkgNameSuffix = 'ru.readmanga'
extClass = '.Readmanga' extClass = '.Readmanga'
extVersionCode = 40 extVersionCode = 41
} }
dependencies { dependencies {

View File

@ -181,7 +181,7 @@ class Readmanga : ConfigurableSource, ParsedHttpSource() {
manga.title = document.select("h1.names .name").text() manga.title = document.select("h1.names .name").text()
manga.author = authorElement manga.author = authorElement
manga.artist = infoElement.select("span.elem_illustrator").first()?.text() manga.artist = infoElement.select("span.elem_illustrator").first()?.text()
manga.genre = infoElement.select("span.elem_genre").text().split(",").plusElement(category).plusElement(rawAgeStop).joinToString { it.trim() } manga.genre = category + ", " + rawAgeStop + ", " + infoElement.select("span.elem_genre").text().split(",").joinToString { it.trim() }
var altName = "" var altName = ""
if (infoElement.select(".another-names").isNotEmpty()) { if (infoElement.select(".another-names").isNotEmpty()) {
altName = "Альтернативные названия:\n" + infoElement.select(".another-names").text() + "\n\n" altName = "Альтернативные названия:\n" + infoElement.select(".another-names").text() + "\n\n"
@ -216,7 +216,7 @@ class Readmanga : ConfigurableSource, ParsedHttpSource() {
return document.select(chapterListSelector()).map { chapterFromElement(it, manga) } return document.select(chapterListSelector()).map { chapterFromElement(it, manga) }
} }
override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a)" override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a):has(td.date:not(.text-info))"
private fun chapterFromElement(element: Element, manga: SManga): SChapter { private fun chapterFromElement(element: Element, manga: SManga): SChapter {
val urlElement = element.select("a").first() val urlElement = element.select("a").first()

View File

@ -5,7 +5,7 @@ ext {
extName = 'Selfmanga' extName = 'Selfmanga'
pkgNameSuffix = 'ru.selfmanga' pkgNameSuffix = 'ru.selfmanga'
extClass = '.Selfmanga' extClass = '.Selfmanga'
extVersionCode = 18 extVersionCode = 19
} }
dependencies { dependencies {

View File

@ -106,7 +106,7 @@ class Selfmanga : ParsedHttpSource() {
val manga = SManga.create() val manga = SManga.create()
manga.title = document.select("h1.names .name").text() manga.title = document.select("h1.names .name").text()
manga.author = infoElement.select("span.elem_author").first()?.text() manga.author = infoElement.select("span.elem_author").first()?.text()
manga.genre = infoElement.select("span.elem_genre").text().replace(" ,", ",") manga.genre = infoElement.select("span.elem_genre").text().split(",").joinToString { it.trim() }
manga.description = document.select("div#tab-description .manga-description").text() manga.description = document.select("div#tab-description .manga-description").text()
manga.status = parseStatus(infoElement.html()) manga.status = parseStatus(infoElement.html())
manga.thumbnail_url = infoElement.select("img").attr("data-full") manga.thumbnail_url = infoElement.select("img").attr("data-full")
@ -120,7 +120,7 @@ class Selfmanga : ParsedHttpSource() {
else -> SManga.UNKNOWN else -> SManga.UNKNOWN
} }
override fun chapterListSelector() = "div.chapters-link tbody tr" override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a):has(td.date:not(.text-info))"
override fun chapterFromElement(element: Element): SChapter { override fun chapterFromElement(element: Element): SChapter {
val urlElement = element.select("a").first() val urlElement = element.select("a").first()
@ -137,7 +137,7 @@ class Selfmanga : ParsedHttpSource() {
chapter.chapter_number = chapterInf.attr("data-num").toFloat() / 10 chapter.chapter_number = chapterInf.attr("data-num").toFloat() / 10
chapter.date_upload = element.select("td.hidden-xxs").last()?.text()?.let { chapter.date_upload = element.select("td.d-none").last()?.text()?.let {
try { try {
SimpleDateFormat("dd/MM/yy", Locale.US).parse(it)?.time ?: 0L SimpleDateFormat("dd/MM/yy", Locale.US).parse(it)?.time ?: 0L
} catch (e: ParseException) { } catch (e: ParseException) {