From 767a1ee1fe293f51168e43875f42104b5e1982a3 Mon Sep 17 00:00:00 2001 From: Mike <51273546+SnakeDoc83@users.noreply.github.com> Date: Thu, 13 Aug 2020 23:00:32 -0400 Subject: [PATCH] MyReadingManga - fix titles, duplicate pages (#4119) --- src/all/myreadingmanga/build.gradle | 3 ++- .../extension/all/myreadingmanga/MyReadingManga.kt | 7 +++++-- .../extension/all/myreadingmanga/MyReadingMangaFactory.kt | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/all/myreadingmanga/build.gradle b/src/all/myreadingmanga/build.gradle index 3c2415152..a83878a47 100644 --- a/src/all/myreadingmanga/build.gradle +++ b/src/all/myreadingmanga/build.gradle @@ -5,8 +5,9 @@ ext { extName = 'MyReadingManga' pkgNameSuffix = 'all.myreadingmanga' extClass = '.MyReadingMangaFactory' - extVersionCode = 38 + extVersionCode = 39 libVersion = '1.2' + containsNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingManga.kt b/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingManga.kt index eaf9263eb..68d2cb5b1 100644 --- a/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingManga.kt +++ b/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingManga.kt @@ -121,7 +121,8 @@ open class MyReadingManga(override val lang: String, private val siteLang: Strin } // cleans up the name removing author and language from the title - private fun cleanTitle(title: String) = title.substringBeforeLast("[").substringAfterLast("]").substringBeforeLast("(").trim() + private val titleRegex = Regex("""\[[^]]*]""") + private fun cleanTitle(title: String) = title.replace(titleRegex, "").substringBeforeLast("(").trim() private fun cleanAuthor(author: String) = author.substringAfter("[").substringBefore("]").trim() @@ -209,7 +210,9 @@ open class MyReadingManga(override val lang: String, private val siteLang: Strin override fun pageListParse(document: Document): List { return (document.select("div > img") + document.select("div.separator img[data-src]")) - .mapIndexed { i, img -> Page(i, "", getImage(img)) } + .map { getImage(it) } + .distinct() + .mapIndexed { i, url -> Page(i, "", url) } } override fun imageUrlParse(document: Document) = throw Exception("Not used") diff --git a/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingMangaFactory.kt b/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingMangaFactory.kt index 658c90c5c..6bbcdb1b1 100644 --- a/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingMangaFactory.kt +++ b/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingMangaFactory.kt @@ -1,8 +1,10 @@ package eu.kanade.tachiyomi.extension.all.myreadingmanga +import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory +@Nsfw class MyReadingMangaFactory : SourceFactory { override fun createSources(): List = languageList.map { MyReadingManga(it.tachiLang, it.siteLang, it.latestLang) } }