From bf3e4e4ddb74da4b3743e3548470ee8067596437 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Mon, 8 Jun 2020 03:54:12 +0430 Subject: [PATCH] FMReader: remove manga title from chapter names (#3421) * FMReader: remove manga title from chaper names * FMReader: throw exception for unreachable code * FMReader: increase extVersionCode, comment out logs * FMReader: retain the original futionality of chapterFromElement() * FMReader: some final touches --- src/all/fmreader/build.gradle | 2 +- .../tachiyomi/extension/all/fmreader/FMReader.kt | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/all/fmreader/build.gradle b/src/all/fmreader/build.gradle index 0d659594b..c669b1b42 100644 --- a/src/all/fmreader/build.gradle +++ b/src/all/fmreader/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: FMReader (multiple aggregators)' pkgNameSuffix = 'all.fmreader' extClass = '.FMReaderFactory' - extVersionCode = 15 + extVersionCode = 16 libVersion = '1.2' } diff --git a/src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReader.kt b/src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReader.kt index c6b264944..cdc232130 100644 --- a/src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReader.kt +++ b/src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReader.kt @@ -171,17 +171,27 @@ abstract class FMReader( } } + override fun chapterListParse(response: Response): List { + val document = response.asJsoup() + val mangaTitle = document.select(".manga-info h1").text() + return document.select(chapterListSelector()).map { chapterFromElement(it, mangaTitle) }.distinctBy { it.url } + } + + override fun chapterFromElement(element: Element): SChapter { + return chapterFromElement(element, "") + } + override fun chapterListSelector() = "div#list-chapters p, table.table tr" open val chapterUrlSelector = "a" open val chapterTimeSelector = "time" - override fun chapterFromElement(element: Element): SChapter { + open fun chapterFromElement(element: Element, mangaTitle: String = ""): SChapter { return SChapter.create().apply { element.select(chapterUrlSelector).first().let { setUrlWithoutDomain(it.attr("abs:href")) - name = it.text() + name = it.text().substringAfter("$mangaTitle ") } date_upload = element.select(chapterTimeSelector).let { if (it.hasText()) parseChapterDate(it.text()) else 0 } }