diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle index 20fcf3a84..a5a0496eb 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 = 164 + extVersionCode = 165 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 9135021f3..963e62f91 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 @@ -62,7 +62,6 @@ class MadaraFactory : SourceFactory { DoujinHentai(), DoujinYosh(), DropeScan(), - EarlyManga(), EinherjarScan(), FdmScan(), FirstKissManga(), @@ -1457,12 +1456,6 @@ class YuriVerso : Madara( class MangaStein : Madara("MangaStein", "https://mangastein.com", "tr") -class EarlyManga : Madara("EarlyManga", "https://earlymanga.xyz", "en") { - override fun headersBuilder(): Headers.Builder { - return super.headersBuilder().add("Referer", "$baseUrl/manga/") - } -} - class MangaGecesi : Madara("Manga Gecesi", "https://mangagecesi.com", "tr") { override val chapterUrlSelector = "li.wp-manga-chapter div.chapter-thumbnail + a" } diff --git a/src/en/earlymanga/AndroidManifest.xml b/src/en/earlymanga/AndroidManifest.xml new file mode 100644 index 000000000..30deb7f79 --- /dev/null +++ b/src/en/earlymanga/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/src/en/earlymanga/build.gradle b/src/en/earlymanga/build.gradle new file mode 100644 index 000000000..332c3cfaf --- /dev/null +++ b/src/en/earlymanga/build.gradle @@ -0,0 +1,12 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' + +ext { + extName = 'EarlyManga' + pkgNameSuffix = 'en.earlymanga' + extClass = '.EarlyManga' + extVersionCode = 1 + libVersion = '1.2' +} + +apply from: "$rootDir/common.gradle" diff --git a/src/en/earlymanga/res/mipmap-hdpi/ic_launcher.png b/src/en/earlymanga/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..13ae40d5a Binary files /dev/null and b/src/en/earlymanga/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/en/earlymanga/res/mipmap-mdpi/ic_launcher.png b/src/en/earlymanga/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..5a0456746 Binary files /dev/null and b/src/en/earlymanga/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/en/earlymanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/earlymanga/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..19ea42fa7 Binary files /dev/null and b/src/en/earlymanga/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/en/earlymanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/earlymanga/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..0b71d23ed Binary files /dev/null and b/src/en/earlymanga/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/en/earlymanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/earlymanga/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..8cad8cb17 Binary files /dev/null and b/src/en/earlymanga/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/en/earlymanga/res/web_hi_res_512.png b/src/en/earlymanga/res/web_hi_res_512.png new file mode 100644 index 000000000..3921235c0 Binary files /dev/null and b/src/en/earlymanga/res/web_hi_res_512.png differ diff --git a/src/en/earlymanga/src/eu/kanade/tachiyomi/extension/en/earlymanga/EarlyManga.kt b/src/en/earlymanga/src/eu/kanade/tachiyomi/extension/en/earlymanga/EarlyManga.kt new file mode 100644 index 000000000..2534f5e3b --- /dev/null +++ b/src/en/earlymanga/src/eu/kanade/tachiyomi/extension/en/earlymanga/EarlyManga.kt @@ -0,0 +1,132 @@ +package eu.kanade.tachiyomi.extension.en.earlymanga + +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 eu.kanade.tachiyomi.util.asJsoup +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.Response +import org.jsoup.nodes.Document +import org.jsoup.nodes.Element +import java.text.SimpleDateFormat +import java.util.Locale + +class EarlyManga : ParsedHttpSource() { + + override val name = "EarlyManga" + + override val baseUrl = "https://earlymanga.xyz" + + override val lang = "en" + + override val supportsLatest = true + + override val client: OkHttpClient = network.cloudflareClient + + // popular + override fun popularMangaRequest(page: Int) = GET("$baseUrl/hot-manga?page=$page", headers) + + override fun popularMangaSelector() = "div.content-homepage-item" + + override fun popularMangaFromElement(element: Element): SManga { + val manga = SManga.create() + manga.url = element.select("a").attr("abs:href").substringAfter(baseUrl) + manga.title = element.select(".colum-content a.homepage-item-title").text() + manga.thumbnail_url = element.select("a img").attr("abs:src") + return manga + } + + override fun popularMangaNextPageSelector() = "li.paging:not(.disabled)" + + // latest + override fun latestUpdatesRequest(page: Int) = GET(baseUrl, headers) + + override fun latestUpdatesSelector() = ".container > .main-content .content-homepage-item" + + override fun latestUpdatesFromElement(element: Element) = popularMangaFromElement(element) + + override fun latestUpdatesNextPageSelector(): String? = null + + // search + override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { + return GET("$baseUrl/search?search=$query", headers) + } + + override fun searchMangaSelector() = "div.manga-entry" + + override fun searchMangaFromElement(element: Element): SManga { + val manga = SManga.create() + manga.url = element.select("a").attr("abs:href").substringAfter(baseUrl) + manga.title = element.select("div:has(.flag)+a").attr("title") + manga.thumbnail_url = element.select("a img").attr("abs:src") + return manga + } + + override fun searchMangaNextPageSelector(): String? = null + + // manga details + override fun mangaDetailsParse(document: Document) = SManga.create().apply { + thumbnail_url = document.select(".manga-page-img").attr("abs:src") + title = document.select("title").text() + author = document.select(".author-link a").text() + artist = document.select(".artist-link a").text() + status = parseStatus(document.select(".pub_stutus").text()) + description = document.select(".desc").text() + } + + private fun parseStatus(status: String?) = when { + status == null -> SManga.UNKNOWN + status.contains("ongoing", true) -> SManga.ONGOING + status.contains("completed", true) -> SManga.COMPLETED + else -> SManga.UNKNOWN + } + + // chapters + override fun chapterListRequest(manga: SManga) = chapterListRequest(manga.url, 1) + + private fun chapterListRequest(mangaUrl: String, page: Int): Request { + return GET("$baseUrl$mangaUrl?page=$page", headers) + } + + override fun chapterListParse(response: Response): List { + var document = response.asJsoup() + val chapters = mutableListOf() + var nextPage = 2 + document.select(chapterListSelector()).map { chapters.add(chapterFromElement(it)) } + while (document.select(paginationNextPageSelector).isNotEmpty()) { + val currentPage = document.select(".nav-link.active").attr("href") + document = client.newCall(chapterListRequest(currentPage, nextPage)).execute().asJsoup() + document.select(chapterListSelector()).map { chapters.add(chapterFromElement(it)) } + nextPage++ + } + + return chapters + } + + private val paginationNextPageSelector = popularMangaNextPageSelector() + + override fun chapterListSelector() = ".chapter-container > .row:not(:first-child)" + + override fun chapterFromElement(element: Element) = SChapter.create().apply { + setUrlWithoutDomain(element.select(".col-lg-5 a").attr("href")) + name = element.select(".col-lg-5 a").text() + date_upload = parseChapterDate(element.select(".ml-1").attr("title")) + } + + private fun parseChapterDate(date: String): Long { + return SimpleDateFormat("yyyy-MM-dd hh:mm:ss", Locale.getDefault()).parse(date)?.time ?: 0L + } + + // pages + override fun pageListParse(document: Document): List { + return document.select(".chapter_images-container > img").mapIndexed { i, element -> + Page(i, "", element.attr("abs:src")) + } + } + + override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not Used") +}