diff --git a/src/en/mangafreak/build.gradle b/src/en/mangafreak/build.gradle index fa5729125..4047e62f3 100644 --- a/src/en/mangafreak/build.gradle +++ b/src/en/mangafreak/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: Mangafreak' pkgNameSuffix = 'en.mangafreak' extClass = '.Mangafreak' - extVersionCode = 1 + extVersionCode = 2 libVersion = '1.2' } diff --git a/src/en/mangafreak/src/eu/kanade/tachiyomi/extension/en/mangafreak/Mangafreak.kt b/src/en/mangafreak/src/eu/kanade/tachiyomi/extension/en/mangafreak/Mangafreak.kt index 0e7533bfd..e31fed9c9 100644 --- a/src/en/mangafreak/src/eu/kanade/tachiyomi/extension/en/mangafreak/Mangafreak.kt +++ b/src/en/mangafreak/src/eu/kanade/tachiyomi/extension/en/mangafreak/Mangafreak.kt @@ -30,6 +30,16 @@ class Mangafreak : ParsedHttpSource() { .followRedirects(true) .build()!! + private fun mangaFromElement(element: Element, urlSelector: String): SManga { + return SManga.create().apply { + thumbnail_url = element.select("img").attr("abs:src") + element.select(urlSelector).apply { + title = text() + url = attr("href") + } + } + } + // Popular override fun popularMangaRequest(page: Int): Request { @@ -37,13 +47,7 @@ class Mangafreak : ParsedHttpSource() { } override fun popularMangaNextPageSelector(): String? = "a.next_p" override fun popularMangaSelector(): String = "div.ranking_item" - override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { - thumbnail_url = element.select("img").attr("abs:src") - element.select("a").apply { - title = text() - url = attr("href") - } - } + override fun popularMangaFromElement(element: Element): SManga = mangaFromElement(element, "a") // Latest @@ -88,7 +92,7 @@ class Mangafreak : ParsedHttpSource() { } override fun searchMangaNextPageSelector(): String? = null override fun searchMangaSelector(): String = "div.manga_search_item , div.mangaka_search_item" - override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element) + override fun searchMangaFromElement(element: Element): SManga = mangaFromElement(element, "h3 a") // Details @@ -102,8 +106,7 @@ class Mangafreak : ParsedHttpSource() { } author = document.select("div.manga_series_data > div:eq(4)").text() artist = document.select("div.manga_series_data > div:eq(5)").text() - val glist = document.select("div.series_sub_genre_list a").map { it.text() } - genre = glist.joinToString(", ") + genre = document.select("div.series_sub_genre_list a").joinToString { it.text() } description = document.select("div.manga_series_description p").text() } @@ -127,7 +130,7 @@ class Mangafreak : ParsedHttpSource() { override fun pageListParse(document: Document): List = mutableListOf().apply { document.select("img#gohere").forEachIndexed { index, element -> - add(Page(index, "", element.attr("src"))) + add(Page(index, "", element.attr("abs:src"))) } }