diff --git a/src/uk/mangainua/build.gradle b/src/uk/mangainua/build.gradle index 18f99d5a5..ff5ee9049 100644 --- a/src/uk/mangainua/build.gradle +++ b/src/uk/mangainua/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'MangaInUa' pkgNameSuffix = 'uk.mangainua' extClass = '.Mangainua' - extVersionCode = 2 + extVersionCode = 3 isNsfw = true } diff --git a/src/uk/mangainua/res/mipmap-hdpi/ic_launcher.png b/src/uk/mangainua/res/mipmap-hdpi/ic_launcher.png index e4aba3a60..d546cd897 100644 Binary files a/src/uk/mangainua/res/mipmap-hdpi/ic_launcher.png and b/src/uk/mangainua/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/uk/mangainua/res/mipmap-mdpi/ic_launcher.png b/src/uk/mangainua/res/mipmap-mdpi/ic_launcher.png index d5ec9f33a..3b63958da 100644 Binary files a/src/uk/mangainua/res/mipmap-mdpi/ic_launcher.png and b/src/uk/mangainua/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/uk/mangainua/res/mipmap-xhdpi/ic_launcher.png b/src/uk/mangainua/res/mipmap-xhdpi/ic_launcher.png index d155be1d5..812eba114 100644 Binary files a/src/uk/mangainua/res/mipmap-xhdpi/ic_launcher.png and b/src/uk/mangainua/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/uk/mangainua/res/mipmap-xxhdpi/ic_launcher.png b/src/uk/mangainua/res/mipmap-xxhdpi/ic_launcher.png index 80f25998e..5d90bc81d 100644 Binary files a/src/uk/mangainua/res/mipmap-xxhdpi/ic_launcher.png and b/src/uk/mangainua/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/uk/mangainua/res/mipmap-xxxhdpi/ic_launcher.png b/src/uk/mangainua/res/mipmap-xxxhdpi/ic_launcher.png index f8f6d9614..43900ba24 100644 Binary files a/src/uk/mangainua/res/mipmap-xxxhdpi/ic_launcher.png and b/src/uk/mangainua/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/uk/mangainua/res/web_hi_res_512.png b/src/uk/mangainua/res/web_hi_res_512.png index e4480ce6f..1c13d61c6 100644 Binary files a/src/uk/mangainua/res/web_hi_res_512.png and b/src/uk/mangainua/res/web_hi_res_512.png differ diff --git a/src/uk/mangainua/src/eu/kanade/tachiyomi/extension/uk/mangainua/Mangainua.kt b/src/uk/mangainua/src/eu/kanade/tachiyomi/extension/uk/mangainua/Mangainua.kt index 1dfc8e0a2..66f2d6d59 100644 --- a/src/uk/mangainua/src/eu/kanade/tachiyomi/extension/uk/mangainua/Mangainua.kt +++ b/src/uk/mangainua/src/eu/kanade/tachiyomi/extension/uk/mangainua/Mangainua.kt @@ -97,18 +97,46 @@ class Mangainua : ParsedHttpSource() { return SManga.create().apply { title = document.select("span.UAname").text() description = document.select("div.item__full-description").text() - genre = document.select("div.item__full-sideba--header:eq(4) span").first()!!.select("a").joinToString { it.text() } thumbnail_url = document.select("div.item__full-sidebar--poster img").first()!!.attr("abs:src") + status = when (document.select("div.item__full-sideba--header:has(div:containsOwn(Статус перекладу:))").first()?.select("span.item__full-sidebar--description")?.first()?.text()) { + "Триває" -> SManga.ONGOING + "Покинуто" -> SManga.CANCELLED + "Закінчений" -> SManga.COMPLETED + else -> SManga.UNKNOWN + } + val type = when (document.select("div.item__full-sideba--header:has(div:containsOwn(Тип:))").first()?.select("span.item__full-sidebar--description")?.first()!!.text()) { + "ВЕБМАНХВА" -> "Manhwa" + "МАНХВА" -> "Manhwa" + "МАНЬХВА" -> "Manhua" + "ВЕБМАНЬХВА" -> "Manhua" + else -> "Manga" + } + genre = document.select("div.item__full-sideba--header:has(div:containsOwn(Жанри:))").first()?.select("span.item__full-sidebar--description")?.first()!!.select("a").joinToString { it.text() } + ", " + type } } // Chapters override fun chapterListSelector() = "div.ltcitems" + + private var previousChapterName: String? = null + private var previousChapterNumber: Float = 0.0f + override fun chapterFromElement(element: Element): SChapter { return SChapter.create().apply { element.select("a").let { urlElement -> setUrlWithoutDomain(urlElement.attr("href")) - name = urlElement.text().substringAfter("НОВЕ").trim() + val chapterName = urlElement.text().substringAfter("НОВЕ").trim() + val chapterNumber = urlElement.text().substringAfter("Розділ").substringBefore("-").trim() + if (chapterName.contains("Альтернативний переклад")) { + name = previousChapterName.toString().substringBefore("-").trim() + scanlator = urlElement.text().substringAfter("від:").trim() + chapter_number = previousChapterNumber + } else { + name = chapterName + previousChapterName = chapterName + chapter_number = chapterNumber.toFloat() + previousChapterNumber = chapterNumber.toFloat() + } } date_upload = parseDate(element.select("div.ltcright:containsOwn(.)").text()) }