diff --git a/multisrc/overrides/madara/niceoppai/src/Niceoppai.kt b/multisrc/overrides/madara/niceoppai/src/Niceoppai.kt deleted file mode 100644 index 139f65ce0..000000000 --- a/multisrc/overrides/madara/niceoppai/src/Niceoppai.kt +++ /dev/null @@ -1,11 +0,0 @@ -package eu.kanade.tachiyomi.extension.th.niceoppai - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.GET -import okhttp3.Request - -class Niceoppai : Madara("Niceoppai", "https://www.niceoppai.net", "th") { - private fun pagePath(page: Int) = if (page > 1) "$page/" else "" - override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga_list/all/any/most-popular/${pagePath(page)}", headers) - override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga_list/all/any/last-updated/${pagePath(page)}", headers) -} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index 23c500e78..26bc01344 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -355,7 +355,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("NeatManga", "https://neatmanga.com", "en", overrideVersionCode = 2), SingleLang("NekoBreaker Scan", "https://nekobreakerscan.com", "pt-BR", overrideVersionCode = 1), SingleLang("NekoScan", "https://nekoscan.com", "en", overrideVersionCode = 2), - SingleLang("Niceoppai", "https://www.niceoppai.net", "th"), SingleLang("Night Comic", "https://www.nightcomic.com", "en", overrideVersionCode = 1), SingleLang("Niji Translations", "https://niji-translations.com", "ar", overrideVersionCode = 1), SingleLang("Ninja Scan", "https://ninjascan.xyz", "pt-BR", overrideVersionCode = 1), diff --git a/src/th/niceoppai/AndroidManifest.xml b/src/th/niceoppai/AndroidManifest.xml new file mode 100644 index 000000000..30deb7f79 --- /dev/null +++ b/src/th/niceoppai/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/src/th/niceoppai/build.gradle b/src/th/niceoppai/build.gradle new file mode 100644 index 000000000..dda595ae3 --- /dev/null +++ b/src/th/niceoppai/build.gradle @@ -0,0 +1,12 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' + +ext { + extName = 'Niceoppai' + pkgNameSuffix = 'th.niceoppai' + extClass = '.Niceoppai' + extVersionCode = 25 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/multisrc/overrides/madara/niceoppai/res/mipmap-hdpi/ic_launcher.png b/src/th/niceoppai/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/niceoppai/res/mipmap-hdpi/ic_launcher.png rename to src/th/niceoppai/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/niceoppai/res/mipmap-mdpi/ic_launcher.png b/src/th/niceoppai/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/niceoppai/res/mipmap-mdpi/ic_launcher.png rename to src/th/niceoppai/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/niceoppai/res/mipmap-xhdpi/ic_launcher.png b/src/th/niceoppai/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/niceoppai/res/mipmap-xhdpi/ic_launcher.png rename to src/th/niceoppai/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/niceoppai/res/mipmap-xxhdpi/ic_launcher.png b/src/th/niceoppai/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/niceoppai/res/mipmap-xxhdpi/ic_launcher.png rename to src/th/niceoppai/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/niceoppai/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/niceoppai/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/niceoppai/res/mipmap-xxxhdpi/ic_launcher.png rename to src/th/niceoppai/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/niceoppai/res/web_hi_res_512.png b/src/th/niceoppai/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/madara/niceoppai/res/web_hi_res_512.png rename to src/th/niceoppai/res/web_hi_res_512.png diff --git a/src/th/niceoppai/src/eu/kanade/tachiyomi/extension/th/niceoppai/Niceoppai.kt b/src/th/niceoppai/src/eu/kanade/tachiyomi/extension/th/niceoppai/Niceoppai.kt new file mode 100644 index 000000000..f27bcd312 --- /dev/null +++ b/src/th/niceoppai/src/eu/kanade/tachiyomi/extension/th/niceoppai/Niceoppai.kt @@ -0,0 +1,295 @@ +package eu.kanade.tachiyomi.extension.th.niceoppai + +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.network.asObservableSuccess +import eu.kanade.tachiyomi.source.model.FilterList +import eu.kanade.tachiyomi.source.model.MangasPage +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 org.jsoup.nodes.Document +import org.jsoup.nodes.Element +import rx.Observable +import java.text.ParseException +import java.text.SimpleDateFormat +import java.util.Calendar +import java.util.Locale +import java.util.concurrent.TimeUnit + +class Niceoppai : ParsedHttpSource() { + + private val dateFormat: SimpleDateFormat = SimpleDateFormat("MM dd, yyyy", Locale.US) + override val baseUrl: String = "https://www.niceoppai.net" + + override val lang: String = "th" + override val name: String = "Niceoppai" + + override val supportsLatest: Boolean = true + + override val client: OkHttpClient = network.cloudflareClient.newBuilder() + .connectTimeout(1, TimeUnit.MINUTES) + .readTimeout(1, TimeUnit.MINUTES) + .writeTimeout(1, TimeUnit.MINUTES) + .build() + + // Popular + + override fun popularMangaRequest(page: Int): Request { + return GET("$baseUrl/manga_list/all/any/most-popular-weekly/$page", headers) + } + + override fun popularMangaSelector() = "div.nde" + + override fun popularMangaFromElement(element: Element): SManga { + val manga = SManga.create() + + manga.title = element.select("div.det a").text() + + element.select("div.cvr").let { + manga.setUrlWithoutDomain(it.select("div.img_wrp a").attr("href")) + manga.thumbnail_url = it.select("img").attr("abs:src") + manga.initialized = false + } + + return manga + } + + override fun popularMangaNextPageSelector() = "ul.pgg li a" + + // Latest + + override fun latestUpdatesRequest(page: Int): Request { + return GET("$baseUrl/manga_list/all/any/last-updated/$page", headers) + } + + override fun latestUpdatesSelector() = popularMangaSelector() + + override fun latestUpdatesFromElement(element: Element): SManga = + popularMangaFromElement(element) + + override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector() + + override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request = + throw Exception("Unused") + + override fun searchMangaSelector(): String = throw Exception("Unused") + + override fun searchMangaFromElement(element: Element): SManga = throw Exception("Unused") + + override fun searchMangaNextPageSelector(): String = throw Exception("Unused") + + override fun fetchSearchManga( + page: Int, + query: String, + filters: FilterList + ): Observable { + val searchMethod = query.startsWith("http") + return client.newCall( + GET("$baseUrl/manga_list/category/$query/name-az/$page") + ) + .asObservableSuccess() + .map { + val document = it.asJsoup() + val mangas: List = if (searchMethod) { + listOf( + SManga.create().apply { + url = query.substringAfter(baseUrl) + title = document.select("h1.ttl").text() + thumbnail_url = + document.select("div.cvr_ara imag.cvr").attr("abs:src") + initialized = false + } + ) + } else { + document.select(popularMangaSelector()).map { element -> + popularMangaFromElement(element) + } + } + + MangasPage(mangas, !searchMethod) + } + } + + // Manga summary page + + private fun getStatus(status: String) = when (status) { + "ยังไม่จบ" -> SManga.ONGOING + "จบแล้ว" -> SManga.COMPLETED + else -> SManga.UNKNOWN + } + + override fun mangaDetailsParse(document: Document): SManga { + val infoElement = document.select("div.det").first() + + return SManga.create().apply { + title = document.title() + infoElement.select("p")[2].ownText() + author = infoElement.select("p")[3].ownText() + artist = author + status = getStatus(infoElement.select("p")[10].ownText()) + genre = infoElement.select("p")[6].select("a").joinToString { it.ownText() } + description = infoElement.select("p").first().ownText() + thumbnail_url = document.select("div.mng_ifo div.cvr_ara img").first().attr("abs:src") + initialized = true + } + } + + // Chapters + + private fun parseChapterDate(date: String?): Long { + date ?: return 0 + + fun SimpleDateFormat.tryParse(string: String): Long { + return try { + parse(string)?.time ?: 0 + } catch (_: ParseException) { + 0 + } + } + + return when { + // Handle 'yesterday' and 'today', using midnight + WordSet("yesterday", "يوم واحد").startsWith(date) -> { + Calendar.getInstance().apply { + add(Calendar.DAY_OF_MONTH, -1) // yesterday + set(Calendar.HOUR_OF_DAY, 0) + set(Calendar.MINUTE, 0) + set(Calendar.SECOND, 0) + set(Calendar.MILLISECOND, 0) + }.timeInMillis + } + WordSet("today").startsWith(date) -> { + Calendar.getInstance().apply { + set(Calendar.HOUR_OF_DAY, 0) + set(Calendar.MINUTE, 0) + set(Calendar.SECOND, 0) + set(Calendar.MILLISECOND, 0) + }.timeInMillis + } + WordSet("يومين").startsWith(date) -> { + Calendar.getInstance().apply { + add(Calendar.DAY_OF_MONTH, -2) // day before yesterday + set(Calendar.HOUR_OF_DAY, 0) + set(Calendar.MINUTE, 0) + set(Calendar.SECOND, 0) + set(Calendar.MILLISECOND, 0) + }.timeInMillis + } + WordSet("ago", "atrás", "önce", "قبل").endsWith(date) -> { + parseRelativeDate(date) + } + + date.contains(Regex("""\d(st|nd|rd|th)""")) -> { + // Clean date (e.g. 5th December 2019 to 5 December 2019) before parsing it + date.split(" ").map { + if (it.contains(Regex("""\d\D\D"""))) { + it.replace(Regex("""\D"""), "") + } else { + it + } + } + .let { dateFormat.tryParse(it.joinToString(" ")) } + } + else -> dateFormat.tryParse(date) + } + } + + // Parses dates in this form: + // 21 horas ago + private fun parseRelativeDate(date: String): Long { + val number = Regex("""(\d+)""").find(date)?.value?.toIntOrNull() ?: return 0 + val cal = Calendar.getInstance() + + return when { + WordSet("hari", "gün", "jour", "día", "dia", "day", "วัน", "ngày", "giorni", "أيام").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis + WordSet("jam", "saat", "heure", "hora", "hour", "ชั่วโมง", "giờ", "ore", "ساعة").anyWordIn(date) -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis + WordSet("menit", "dakika", "min", "minute", "minuto", "นาที", "دقائق").anyWordIn(date) -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis + WordSet("detik", "segundo", "second", "วินาที").anyWordIn(date) -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis + WordSet("week").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number * 7) }.timeInMillis + WordSet("month").anyWordIn(date) -> cal.apply { add(Calendar.MONTH, -number) }.timeInMillis + WordSet("year").anyWordIn(date) -> cal.apply { add(Calendar.YEAR, -number) }.timeInMillis + else -> 0 + } + } + + override fun chapterListSelector() = "ul.lst li.lng_" + + override fun chapterFromElement(element: Element): SChapter = throw Exception("Unused") + + private fun chapterFromElementWithIndex(element: Element, idx: Int, manga: SManga): SChapter { + val chapter = SChapter.create() + + with(element) { + val btn = element.select("a.lst") + chapter.setUrlWithoutDomain(btn.attr("href")) + chapter.name = btn.select("b.val").text() + val dateText = btn.select("b.dte").text() + chapter.date_upload = parseChapterDate(dateText) + + if (chapter.name.isEmpty()) { + chapter.chapter_number = 0.0f + } else { + val wordsChapter = chapter.name.replace("ตอนที่. ", "").split(" - ") + try { + chapter.chapter_number = wordsChapter[0].toFloat() + } catch (ex: NumberFormatException) { + chapter.chapter_number = (idx + 1).toFloat() + } + } + } + + return chapter + } + + override fun fetchChapterList(manga: SManga): Observable> { + + return client.newCall(GET("$baseUrl/${manga.url}")) + .asObservableSuccess() + .map { + val chList: List + val mangaDocument = it.asJsoup() + + if (mangaDocument.select(chapterListSelector()).isEmpty()) { + manga.status = SManga.COMPLETED + val createdChapter = SChapter.create().apply { + url = manga.url + name = "Chapter 1" + chapter_number = 1.0f + } + chList = listOf(createdChapter) + } else { + chList = + mangaDocument.select(chapterListSelector()).mapIndexed { idx, Chapter -> + chapterFromElementWithIndex(Chapter, idx, manga) + } + } + chList + } + } + + // Pages + + override fun pageListParse(document: Document): List { + return document.select("div.mng_rdr div#image-container img").mapIndexed { i, img -> + if (img.hasAttr("data-src")) { + Page(i, "", img.attr("abs:data-src")) + } else { + Page(i, "", img.attr("abs:src")) + } + } + } + + override fun imageUrlParse(document: Document): String = + throw UnsupportedOperationException("Not used") + + override fun getFilterList() = FilterList() +} + +class WordSet(private vararg val words: String) { + fun anyWordIn(dateString: String): Boolean = words.any { dateString.contains(it, ignoreCase = true) } + fun startsWith(dateString: String): Boolean = words.any { dateString.startsWith(it, ignoreCase = true) } + fun endsWith(dateString: String): Boolean = words.any { dateString.endsWith(it, ignoreCase = true) } +}