From ea0ae4e3aeff40e05ffd8f1ba37e448729e213a5 Mon Sep 17 00:00:00 2001 From: Eugene <35057681+e-shl@users.noreply.github.com> Date: Mon, 7 Jun 2021 03:11:13 +0500 Subject: [PATCH] [RU]Remanga, Mangalib. Fix "single pixel" filter page and hide empty altname (#7502) * [RU]Remanga, Mangalib. Fix "single pixel" filter page and hide empty altname * statusLICENSED --- src/ru/libmanga/build.gradle | 2 +- .../kanade/tachiyomi/extension/ru/libmanga/LibManga.kt | 7 ++++++- src/ru/remanga/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt | 9 +++++++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/ru/libmanga/build.gradle b/src/ru/libmanga/build.gradle index c5456c20d..b3d596526 100644 --- a/src/ru/libmanga/build.gradle +++ b/src/ru/libmanga/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'MangaLib' pkgNameSuffix = 'ru.libmanga' extClass = '.LibManga' - extVersionCode = 50 + extVersionCode = 51 libVersion = '1.2' } diff --git a/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt b/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt index e54fd51c5..76c0bece5 100644 --- a/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt +++ b/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt @@ -210,7 +210,12 @@ class LibManga : ConfigurableSource, HttpSource() { else -> SManga.UNKNOWN } manga.genre = genres.plusElement(category).plusElement(rawAgeStop).joinToString { it.trim() } - manga.description = document.select(".media-name__main").text() + "\n" + ratingStar + " " + ratingValue + " (голосов: " + ratingVotes + ")" + "\nАльтернативные названия:\n" + document.select(".media-info-list__item_alt-names .media-info-list__value div").map { it.text() }.joinToString(" / ") + "\n\n" + document.select(".media-description__text").text() + val altSelector = document.select(".media-info-list__item_alt-names .media-info-list__value div") + var altName = "" + if (altSelector.isNotEmpty()) { + altName = "Альтернативные названия:\n" + altSelector.map { it.text() }.joinToString(" / ") + "\n\n" + } + manga.description = document.select(".media-name__main").text() + "\n" + ratingStar + " " + ratingValue + " (голосов: " + ratingVotes + ")\n" + altName + document.select(".media-description__text").text() return manga } diff --git a/src/ru/remanga/build.gradle b/src/ru/remanga/build.gradle index d225704df..3a54deef1 100644 --- a/src/ru/remanga/build.gradle +++ b/src/ru/remanga/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Remanga' pkgNameSuffix = 'ru.remanga' extClass = '.Remanga' - extVersionCode = 27 + extVersionCode = 28 libVersion = '1.2' } diff --git a/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt b/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt index f05685cc2..c33e1dc21 100644 --- a/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt +++ b/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt @@ -195,6 +195,7 @@ class Remanga : ConfigurableSource, HttpSource() { return when (status) { 0 -> SManga.COMPLETED 1 -> SManga.ONGOING + 5 -> SManga.LICENSED else -> SManga.UNKNOWN } } @@ -234,7 +235,11 @@ class Remanga : ConfigurableSource, HttpSource() { title = en_name url = "/api/titles/$dir/" thumbnail_url = "$baseUrl/${img.high}" - this.description = rus_name + "\n" + ratingStar + " " + ratingValue + " (голосов: " + count_rating + ")" + "\nАльтернативные названия:\n" + another_name + "\n\n" + Jsoup.parse(o.description).text() + var altName = "" + if (another_name.isNotEmpty()) { + altName = "Альтернативные названия:\n" + another_name + "\n\n" + } + this.description = rus_name + "\n" + ratingStar + " " + ratingValue + " (голосов: " + count_rating + ")\n" + altName + Jsoup.parse(o.description).text() genre = (genres + parseType(type)).joinToString { it.name } + ", " + parseAge(age_limit) status = parseStatus(o.status.id) } @@ -346,7 +351,7 @@ class Remanga : ConfigurableSource, HttpSource() { val page = gson.fromJson>(body) val result = mutableListOf() page.content.pages.forEach { - it.filter { page -> page.height > 1 }.forEach { page -> + it.filter { page -> page.height > 10 }.forEach { page -> result.add(Page(result.size, "", page.link)) } }