diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle index f84440d53..e417b09d8 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 = 123 + extVersionCode = 124 libVersion = '1.2' } 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 6e1b30cdc..59d23f196 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 @@ -135,7 +135,6 @@ class MadaraFactory : SourceFactory { Manga347(), RenaScans(), WebtoonXYZ(), - ManhwaTime(), QueensManga(), DropeScan(), TheTopComic(), @@ -1014,8 +1013,6 @@ class WebtoonXYZ : Madara("WebtoonXYZ", "https://www.webtoon.xyz", "en") { override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/webtoons/${pagePath(page)}?m_orderby=latest", headers) } -class ManhwaTime : Madara("ManhwaTime", "https://manhwatime.xyz", "en") - class MangaReadOrg : Madara("MangaRead.org", "https://www.mangaread.org", "en", SimpleDateFormat("dd.MM.yyy", Locale.US)) class TurkceManga : Madara("Türkçe Manga", "https://turkcemanga.com", "tr") { diff --git a/src/en/manhwatime/build.gradle b/src/en/manhwatime/build.gradle new file mode 100644 index 000000000..3a5304900 --- /dev/null +++ b/src/en/manhwatime/build.gradle @@ -0,0 +1,12 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' + +ext { + extName = 'ManhwaTime' + pkgNameSuffix = 'en.manhwatime' + extClass = '.ManhwaTime' + extVersionCode = 1 + libVersion = '1.2' +} + +apply from: "$rootDir/common.gradle" diff --git a/src/en/manhwatime/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwatime/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..eb33c8993 Binary files /dev/null and b/src/en/manhwatime/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/en/manhwatime/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwatime/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..cfa5afe4e Binary files /dev/null and b/src/en/manhwatime/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/en/manhwatime/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwatime/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..76b3fdbad Binary files /dev/null and b/src/en/manhwatime/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/en/manhwatime/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwatime/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..a5c07e2e0 Binary files /dev/null and b/src/en/manhwatime/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/en/manhwatime/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwatime/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..01d0e3501 Binary files /dev/null and b/src/en/manhwatime/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/en/manhwatime/res/web_hi_res_512.png b/src/en/manhwatime/res/web_hi_res_512.png new file mode 100644 index 000000000..3f289b34f Binary files /dev/null and b/src/en/manhwatime/res/web_hi_res_512.png differ diff --git a/src/en/manhwatime/src/eu/kanade/tachiyomi/extension/en/manhwatime/ManhwaTime.kt b/src/en/manhwatime/src/eu/kanade/tachiyomi/extension/en/manhwatime/ManhwaTime.kt new file mode 100644 index 000000000..d33b616e6 --- /dev/null +++ b/src/en/manhwatime/src/eu/kanade/tachiyomi/extension/en/manhwatime/ManhwaTime.kt @@ -0,0 +1,132 @@ +package eu.kanade.tachiyomi.extension.en.manhwatime + +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 java.text.SimpleDateFormat +import java.util.Locale +import okhttp3.OkHttpClient +import okhttp3.Request +import org.jsoup.nodes.Document +import org.jsoup.nodes.Element +import org.jsoup.select.Elements + +class ManhwaTime : ParsedHttpSource() { + + override val name = "ManhwaTime" + + override val baseUrl = "https://manhwatime.xyz" + + override val lang = "en" + + override val supportsLatest = true + + override val client: OkHttpClient = network.cloudflareClient + + private fun Elements.imgAttr(): String? = this.firstOrNull()?.let { + if (it.hasAttr("data-src")) it.attr("abs:data-src") else it.attr("abs:src") + } + + // Popular + + override fun popularMangaRequest(page: Int): Request { + return GET("$baseUrl/?status=&type=&order=Popular&title=", headers) + } + + override fun popularMangaSelector() = "div.post-show div.animepost" + + override fun popularMangaFromElement(element: Element): SManga { + return SManga.create().apply { + element.select("div.data > a").let { + setUrlWithoutDomain(it.attr("href")) + title = it.text() + } + thumbnail_url = element.select("img").imgAttr() + } + } + + // small catalog, can't tell what this should be at this point + override fun popularMangaNextPageSelector(): String? = null + + // Latest + + override fun latestUpdatesRequest(page: Int): Request { + return GET("$baseUrl/?status=&type=&order=Latest+Update&title=", headers) + } + + override fun latestUpdatesSelector() = popularMangaSelector() + + override fun latestUpdatesFromElement(element: Element): SManga = popularMangaFromElement(element) + + override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector() + + // Search + + override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { + return GET("$baseUrl?s=$query", headers) + } + + override fun searchMangaSelector() = "div.animepost a" + + override fun searchMangaFromElement(element: Element): SManga { + return SManga.create().apply { + title = element.attr("title") + setUrlWithoutDomain(element.attr("href")) + thumbnail_url = element.select("img").attr("abs:data-src") + } + } + + override fun searchMangaNextPageSelector() = popularMangaNextPageSelector() + + // Details + + override fun mangaDetailsParse(document: Document): SManga { + return SManga.create().apply { + with(document.select("div.infoanime")) { + thumbnail_url = select("img").imgAttr() + description = select("div.summary__content p, div[itemprop=description] p") + .filterNot { it.text().contains("Manhwa Synopsis", ignoreCase = true) } + .joinToString("\n\n") { it.text() } + genre = select("div.genre-info a").joinToString { it.text() } + author = select("span:contains(Author)").firstOrNull()?.ownText() + status = select("span:contains(Status)").firstOrNull()?.ownText().toStatus() + } + } + } + + private fun String?.toStatus() = when { + this == null -> SManga.UNKNOWN + this.contains("Publishing", ignoreCase = true) -> SManga.ONGOING + this.contains("Complete", ignoreCase = true) -> SManga.COMPLETED + else -> SManga.UNKNOWN + } + + // Chapters + + override fun chapterListSelector() = "div#chapter_list li" + + override fun chapterFromElement(element: Element): SChapter { + return SChapter.create().apply { + element.select("span.lchx a").let { + name = it.text() + setUrlWithoutDomain(it.attr("href")) + } + date_upload = simpleDateFormat.parse(element.select("span.date").text())?.time ?: 0 + } + } + + private val simpleDateFormat by lazy { SimpleDateFormat("MMM dd, yyyy", Locale.US) } + + // Pages + + override fun pageListParse(document: Document): List { + return document.select("div.reader-area img").mapIndexed { i, img -> + Page(i, "", img.attr("abs:src")) + } + } + + override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used") +}