diff --git a/src/fr/mangakawaii/build.gradle b/src/fr/mangakawaii/build.gradle index 86b001b95..374d877f6 100644 --- a/src/fr/mangakawaii/build.gradle +++ b/src/fr/mangakawaii/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: Mangakawaii' pkgNameSuffix = 'fr.mangakawaii' extClass = '.MangaKawaii' - extVersionCode = 3 + extVersionCode = 4 libVersion = '1.2' } diff --git a/src/fr/mangakawaii/res/mipmap-hdpi/ic_launcher.png b/src/fr/mangakawaii/res/mipmap-hdpi/ic_launcher.png index b5007bfe4..dd1ca4771 100644 Binary files a/src/fr/mangakawaii/res/mipmap-hdpi/ic_launcher.png and b/src/fr/mangakawaii/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/fr/mangakawaii/res/mipmap-mdpi/ic_launcher.png b/src/fr/mangakawaii/res/mipmap-mdpi/ic_launcher.png index 117268d62..d4a0fee5b 100644 Binary files a/src/fr/mangakawaii/res/mipmap-mdpi/ic_launcher.png and b/src/fr/mangakawaii/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/fr/mangakawaii/res/mipmap-xhdpi/ic_launcher.png b/src/fr/mangakawaii/res/mipmap-xhdpi/ic_launcher.png index 122c0f21f..47120d788 100644 Binary files a/src/fr/mangakawaii/res/mipmap-xhdpi/ic_launcher.png and b/src/fr/mangakawaii/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/fr/mangakawaii/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/mangakawaii/res/mipmap-xxhdpi/ic_launcher.png index 1c826c722..edd38305d 100644 Binary files a/src/fr/mangakawaii/res/mipmap-xxhdpi/ic_launcher.png and b/src/fr/mangakawaii/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/fr/mangakawaii/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/mangakawaii/res/mipmap-xxxhdpi/ic_launcher.png index 59d288817..1d7aaee7f 100644 Binary files a/src/fr/mangakawaii/res/mipmap-xxxhdpi/ic_launcher.png and b/src/fr/mangakawaii/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/fr/mangakawaii/res/web_hi_res_512.png b/src/fr/mangakawaii/res/web_hi_res_512.png index d284ec4e1..77461e3f7 100644 Binary files a/src/fr/mangakawaii/res/web_hi_res_512.png and b/src/fr/mangakawaii/res/web_hi_res_512.png differ diff --git a/src/fr/mangakawaii/src/eu/kanade/tachiyomi/extension/fr/mangakawaii/MangaKawaii.kt b/src/fr/mangakawaii/src/eu/kanade/tachiyomi/extension/fr/mangakawaii/MangaKawaii.kt index 5cd449190..cb2f806f5 100644 --- a/src/fr/mangakawaii/src/eu/kanade/tachiyomi/extension/fr/mangakawaii/MangaKawaii.kt +++ b/src/fr/mangakawaii/src/eu/kanade/tachiyomi/extension/fr/mangakawaii/MangaKawaii.kt @@ -3,7 +3,10 @@ package eu.kanade.tachiyomi.extension.fr.mangakawaii import android.net.Uri import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.* +import eu.kanade.tachiyomi.source.model.FilterList +import eu.kanade.tachiyomi.source.model.Page +import eu.kanade.tachiyomi.source.model.SChapter +import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.ParsedHttpSource import eu.kanade.tachiyomi.util.asJsoup import okhttp3.OkHttpClient @@ -18,25 +21,25 @@ import java.util.* class MangaKawaii : ParsedHttpSource() { override val name = "Mangakawaii" - override val baseUrl = "https://www.mangakawaii.to" + override val baseUrl = "https://www.mangakawaii.com" override val lang = "fr" - override val supportsLatest = false + override val supportsLatest = true override val client: OkHttpClient = network.cloudflareClient override fun popularMangaSelector() = "a.manga-block-item__content" - override fun latestUpdatesSelector() = throw Exception("Not Used") + override fun latestUpdatesSelector() = ".manga-list li div.updates__left" override fun searchMangaSelector() = "h1 + ul a[href*=manga]" override fun chapterListSelector() = "div.chapter-item.volume-0, div.chapter-item.volume-" override fun popularMangaNextPageSelector() = "a[rel=next]" - override fun latestUpdatesNextPageSelector() = throw Exception("Not Used") + override fun latestUpdatesNextPageSelector(): String? = null override fun searchMangaNextPageSelector() = "no selector" override fun popularMangaRequest(page: Int) = GET("$baseUrl/filterLists?page=$page&sortBy=views&asc=false", headers) - override fun latestUpdatesRequest(page: Int) = throw Exception("Not Used") + override fun latestUpdatesRequest(page: Int) = GET(baseUrl, headers) override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { val uri = Uri.parse("$baseUrl/search").buildUpon() - .appendQueryParameter("query", query) + .appendQueryParameter("query", query) return GET(uri.toString(), headers) } @@ -47,8 +50,11 @@ class MangaKawaii : ParsedHttpSource() { manga.thumbnail_url = element.select("a").attr("abs:data-background-image") return manga } - - override fun latestUpdatesFromElement(element: Element) = throw Exception("Not Used") + override fun latestUpdatesFromElement(element: Element): SManga = SManga.create().apply { + title = element.select(" a").attr("title") + setUrlWithoutDomain(element.select("a").attr("href")) + thumbnail_url = element.select("img").attr("data-src") + } override fun searchMangaFromElement(element: Element): SManga { val manga = SManga.create() manga.url = element.select("a").attr("href") @@ -61,7 +67,7 @@ class MangaKawaii : ParsedHttpSource() { val chapter = SChapter.create() chapter.url = element.select("a.list-item__title").attr("href") chapter.name = element.select("a.list-item__title").text().trim() - chapter.chapter_number = element.select("a.list-item__title").text().substringAfter("Chapitre").replace(",",".").trim().toFloat() + chapter.chapter_number = element.select("a.list-item__title").text().substringAfter("Chapitre").replace(",", ".").trim().toFloat() chapter.date_upload = parseDate(element.select("div.chapter-item__date").text()) return chapter } @@ -90,7 +96,7 @@ class MangaKawaii : ParsedHttpSource() { val body = response.asJsoup() val element = body.select("script:containsData(Imagesrc)").toString() val regex = "(data-src).*[\"]".toRegex() - val match = regex.findAll(element)!!.map { it.value.substringAfter("data-src\", \" ").substringBefore("\"").trim() } + val match = regex.findAll(element).map { it.value.substringAfter("data-src\", \" ").substringBefore("\"").trim() } //throw Exception(match.elementAt(1)) val pages = mutableListOf() for (i in 0 until match.count()) {