diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle index 49bce0ca6..bae271c6c 100644 --- a/src/all/madara/build.gradle +++ b/src/all/madara/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Madara (multiple sources)' pkgNameSuffix = "all.madara" extClass = '.MadaraFactory' - extVersionCode = 136 + extVersionCode = 137 libVersion = '1.2' containsNsfw = true } diff --git a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt index 17be2b18f..cf687d363 100644 --- a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt +++ b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt @@ -167,7 +167,8 @@ class MadaraFactory : SourceFactory { AlianzaMarcial(), OlaoeManga(), FdmScan(), - ArgosScan() + ArgosScan(), + Kombatch() // Removed by request of site owner // EarlyManga(), // MangaGecesi(), @@ -1291,3 +1292,5 @@ class JJutsuScans : Madara("JJutsuScans", "https://jjutsuscans.com", "en") class S2Manga : Madara("S2Manga", "https://s2manga.com", "en") class MangaLandArabic : Madara("Manga Land Arabic", "https://mangalandarabic.com", "ar") + +class Kombatch : Madara("Kombatch", "https://kombatch.com", "id") diff --git a/src/id/kombatch/build.gradle b/src/id/kombatch/build.gradle deleted file mode 100644 index 5dc477d89..000000000 --- a/src/id/kombatch/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' - -ext { - extName = 'Kombatch' - pkgNameSuffix = 'id.kombatch' - extClass = '.Kombatch' - extVersionCode = 1 - libVersion = '1.2' -} - -apply from: "$rootDir/common.gradle" diff --git a/src/id/kombatch/res/mipmap-hdpi/ic_launcher.png b/src/id/kombatch/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 4b2363109..000000000 Binary files a/src/id/kombatch/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/src/id/kombatch/res/mipmap-mdpi/ic_launcher.png b/src/id/kombatch/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 9d5c569f0..000000000 Binary files a/src/id/kombatch/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/src/id/kombatch/res/mipmap-xhdpi/ic_launcher.png b/src/id/kombatch/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index c093eb2ae..000000000 Binary files a/src/id/kombatch/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/src/id/kombatch/res/mipmap-xxhdpi/ic_launcher.png b/src/id/kombatch/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 151015780..000000000 Binary files a/src/id/kombatch/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/src/id/kombatch/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/kombatch/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 23aa8703e..000000000 Binary files a/src/id/kombatch/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/src/id/kombatch/res/web_hi_res_512.png b/src/id/kombatch/res/web_hi_res_512.png deleted file mode 100644 index 2681fde24..000000000 Binary files a/src/id/kombatch/res/web_hi_res_512.png and /dev/null differ diff --git a/src/id/kombatch/src/eu/kanade/tachiyomi/extension/id/kombatch/Kombatch.kt b/src/id/kombatch/src/eu/kanade/tachiyomi/extension/id/kombatch/Kombatch.kt deleted file mode 100644 index 6b53b8f7b..000000000 --- a/src/id/kombatch/src/eu/kanade/tachiyomi/extension/id/kombatch/Kombatch.kt +++ /dev/null @@ -1,93 +0,0 @@ -package eu.kanade.tachiyomi.extension.id.kombatch - -import eu.kanade.tachiyomi.network.GET -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 org.json.JSONObject -import org.jsoup.nodes.Document -import org.jsoup.nodes.Element - -class Kombatch : ParsedHttpSource() { - override val name = "Kombatch" - - override val baseUrl = "https://kombatch.com" - - override val lang = "id" - - override val supportsLatest = true - - override fun popularMangaRequest(page: Int) = GET("$baseUrl/manga-list?page=$page", headers) - - override fun popularMangaSelector() = "div.box_trending" - - override fun popularMangaFromElement(element: Element) = SManga.create().apply { - setUrlWithoutDomain(element.select("a._2dU-m.vlQGQ").attr("href")) - title = element.select("a._2dU-m.vlQGQ").text() - thumbnail_url = element.select("img").attr("abs:src") - } - - override fun popularMangaNextPageSelector() = "[rel=next]" - - override fun latestUpdatesRequest(page: Int) = GET(baseUrl, headers) - - override fun latestUpdatesSelector() = "div.row.no-gutters:has(h3.text-truncate):has(a:has(img))" - - override fun latestUpdatesFromElement(element: Element) = SManga.create().apply { - setUrlWithoutDomain(element.select("a:has(img)").attr("href")) - title = element.select("a.text-black-50").first().text() - thumbnail_url = element.select("img").attr("abs:src") - } - - // No next page - override fun latestUpdatesNextPageSelector() = "Not used" - - override fun searchMangaRequest(page: Int, query: String, filters: FilterList) = GET("$baseUrl/search?search=$query&page=$page", headers) - - override fun searchMangaSelector() = popularMangaSelector() - - override fun searchMangaFromElement(element: Element) = popularMangaFromElement(element) - - override fun searchMangaNextPageSelector() = popularMangaNextPageSelector() - - override fun mangaDetailsParse(document: Document) = SManga.create().apply { - val details = document.select("div.spe > span") - description = document.select("[itemprop=articleBody]").text().trim() - status = parseStatus(details.first().text()) - author = details[1].ownText().trim() - genre = details[2].select("a").joinToString { it.text() } - artist = details[3].ownText().trim() - thumbnail_url = document.select("div.thumb > img").attr("abs:src") - } - - private fun parseStatus(status: String) = when { - status.contains("ONGOING") -> SManga.ONGOING - status.contains("COMPLETE") -> SManga.COMPLETED - else -> SManga.UNKNOWN - } - - override fun chapterListSelector() = ".lchx.mobile > a" - - override fun chapterFromElement(element: Element) = SChapter.create().apply { - setUrlWithoutDomain(element.attr("href").replace("/read/", "/api/chapter/")) - name = element.text().trim() - } - - override fun pageListParse(document: Document): List { - val response = JSONObject(document.select("body").text()) - val pages = response.getJSONObject("chapter").getJSONArray("images") - val finalPages = mutableListOf() - - for (i in 0 until pages.length()) { - finalPages.add(Page(i, "", pages.getJSONObject(i)["text"].toString().replace("//", "https://"))) - } - - return finalPages - } - - override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used") - - override fun getFilterList() = FilterList() -}