Added support for MangaDig (https://mangadig.com/) (#9639)

* Added support for MangaDig (https://mangadig.com/)
Supports Latest, Sort, Completed and rate limiting
Modified from 'CoCoManga (OhManhua)' extension

* Update src/en/mangadig/src/eu/kanade/tachiyomi/extension/en/mangadig/MangaDig.kt

Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>

* Update src/en/mangadig/src/eu/kanade/tachiyomi/extension/en/mangadig/MangaDig.kt

Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>

* Update src/en/mangadig/src/eu/kanade/tachiyomi/extension/en/mangadig/MangaDig.kt

Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>

* Update src/en/mangadig/src/eu/kanade/tachiyomi/extension/en/mangadig/MangaDig.kt

Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>

* Update src/en/mangadig/src/eu/kanade/tachiyomi/extension/en/mangadig/MangaDig.kt

Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>

* Update src/en/mangadig/src/eu/kanade/tachiyomi/extension/en/mangadig/MangaDig.kt

Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>

* Update MangaDig.kt

Using .toInt() instead of .parseInt() as suggested by @alessandrojean here https://github.com/tachiyomiorg/tachiyomi-extensions/pull/9639#discussion_r736981888

* Removed unrequired parenthesis

Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
This commit is contained in:
FuSan21 2021-11-06 19:15:20 +06:00 committed by GitHub
parent 19372a9c4c
commit 4c22e61968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 390 additions and 0 deletions

View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="eu.kanade.tachiyomi.extension" />

View File

@ -0,0 +1,16 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
ext {
extName = 'MangaDig'
pkgNameSuffix = 'en.mangadig'
extClass = '.MangaDig'
extVersionCode = 1
isNsfw = true
}
dependencies {
implementation project(path: ':lib-ratelimit')
}
apply from: "$rootDir/common.gradle"

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View File

@ -0,0 +1,372 @@
package eu.kanade.tachiyomi.extension.en.mangadig
import android.annotation.SuppressLint
import android.app.Application
import android.content.SharedPreferences
import android.net.Uri
import android.util.Base64
import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.source.ConfigurableSource
import eu.kanade.tachiyomi.source.model.Filter
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 okhttp3.Headers
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.OkHttpClient
import okhttp3.Request
import org.jsoup.nodes.Document
import org.jsoup.nodes.Element
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.util.regex.Pattern
import javax.crypto.Cipher
import javax.crypto.spec.SecretKeySpec
class MangaDig : ConfigurableSource, ParsedHttpSource() {
override val lang = "en"
override val supportsLatest = true
override val name = "MangaDig"
override val baseUrl = "https://mangadig.com/"
// Preference setting
private val preferences: SharedPreferences by lazy {
Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
}
// Client configs
private val mainSiteRateLimitInterceptor = SpecificHostRateLimitInterceptor(
baseUrl.toHttpUrlOrNull()!!,
preferences.getString(MAINSITE_RATEPERMITS_PREF, MAINSITE_RATEPERMITS_PREF_DEFAULT)!!.toInt(),
preferences.getString(MAINSITE_RATEPERIOD_PREF, MAINSITE_RATEPERIOD_PREF_DEFAULT)!!.toLong(),
)
override val client: OkHttpClient = network.cloudflareClient.newBuilder()
.addNetworkInterceptor(mainSiteRateLimitInterceptor)
.build()
override fun headersBuilder(): Headers.Builder = Headers.Builder()
.add("Referer", baseUrl)
// Prepend with new decrypt keys (latest keys should appear at the start of the array)
private var decryptKey1Arr = arrayOf("fw122587mkertyui", "fw12558899ertyui")
private var decryptKey2Arr = arrayOf("fw125gjdi9ertyui")
// Common
private val commonSelector = "li.fed-list-item"
private val commonNextPageSelector = "a:contains(Next):not(.fed-btns-disad)"
private fun commonMangaFromElement(element: Element): SManga {
val picElement = element.select("a.fed-list-pics").first()
return SManga.create().apply {
title = element.select("a.fed-list-title").first().text()
thumbnail_url = picElement.attr("data-original")
setUrlWithoutDomain(picElement.attr("href"))
}
}
// Popular Manga
override fun popularMangaRequest(page: Int) = GET("$baseUrl/show?orderBy=dailyCount&page=$page", headers)
override fun popularMangaNextPageSelector() = commonNextPageSelector
override fun popularMangaSelector() = commonSelector
override fun popularMangaFromElement(element: Element) = commonMangaFromElement(element)
// Latest Updates
override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/show?orderBy=update&page=$page", headers)
override fun latestUpdatesNextPageSelector() = commonNextPageSelector
override fun latestUpdatesSelector() = commonSelector
override fun latestUpdatesFromElement(element: Element) = commonMangaFromElement(element)
// Filter
private class StatusFilter : Filter.TriState("Complete")
private class SortFilter : Filter.Select<String>("Sort", arrayOf("Update", "Creation", "Day", "Month"), 2)
override fun getFilterList() = FilterList(
SortFilter(),
StatusFilter()
)
// Search
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
return if (query.isNotBlank()) {
GET("$baseUrl/search?searchString=$query&page=$page", headers)
} else {
val url = "$baseUrl/show".toHttpUrlOrNull()!!.newBuilder()
url.addQueryParameter("page", page.toString())
filters.forEach { filter ->
when (filter) {
is StatusFilter -> {
if (!filter.isIgnored()) {
url.addQueryParameter("status", arrayOf("0", "2", "1")[filter.state])
}
}
is SortFilter -> {
url.addQueryParameter("orderBy", arrayOf("update", "create", "dailyCount", "weeklyCount", "monthlyCount")[filter.state])
}
}
}
GET(url.toString(), headers)
}
}
override fun searchMangaNextPageSelector() = commonNextPageSelector
override fun searchMangaSelector() = "dl.fed-deta-info, $commonSelector"
override fun searchMangaFromElement(element: Element): SManga {
if (element.tagName() == "li") {
return commonMangaFromElement(element)
}
val picElement = element.select("a.fed-list-pics").first()
return SManga.create().apply {
title = element.select("h1.fed-part-eone a").first().text()
thumbnail_url = picElement.attr("data-original")
setUrlWithoutDomain(picElement.attr("href"))
}
}
override fun mangaDetailsParse(document: Document): SManga {
val picElement = document.select("a.fed-list-pics").first()
val detailElements = document.select("ul.fed-part-rows li.fed-col-xs12")
return SManga.create().apply {
title = document.select("h1.fed-part-eone").first().text().trim()
thumbnail_url = picElement.attr("data-original")
status = when (
detailElements.firstOrNull {
it.children().firstOrNull {
it2 ->
it2.hasClass("fed-text-muted") && it2.ownText() == "Status"
} != null
}?.select("a")?.first()?.text()
) {
"OnGoing" -> SManga.ONGOING
"Complete" -> SManga.COMPLETED
else -> SManga.UNKNOWN
}
author = detailElements.firstOrNull {
it.children().firstOrNull {
it2 ->
it2.hasClass("fed-text-muted") && it2.ownText() == "Author"
} != null
}?.select("a")?.first()?.text()
genre = detailElements.firstOrNull {
it.children().firstOrNull {
it2 ->
it2.hasClass("fed-text-muted") && it2.ownText() == "Category"
} != null
}?.select("a")?.joinToString { it.text() }
description = document.select("ul.fed-part-rows li.fed-col-xs12.fed-show-md-block .fed-part-esan")
.firstOrNull()?.text()?.trim()
}
}
override fun chapterListSelector(): String = "div:not(.fed-hidden) > div.all_data_list > ul.fed-part-rows a"
override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply {
name = element.attr("title")
setUrlWithoutDomain(element.attr("href"))
}
override fun imageUrlParse(document: Document) = ""
override fun pageListParse(document: Document): List<Page> {
// 1. get C_DATA from HTML
val encodedData = getEncodedMangaData(document)
// 2. decrypt C_DATA
val decryptedData = decodeAndDecrypt("encodedData", encodedData, decryptKey1Arr)
// 3. Extract values from C_DATA to formulate page urls
val imgType = regexExtractStringValue(
decryptedData,
"img_type:\"(.+?)\"",
"Unable to match for img_type"
)
return if (imgType.isEmpty()) {
processPagesFromExternal(decryptedData)
} else {
processPagesFromInternal(decryptedData)
}
}
private fun processPagesFromExternal(decryptedData: String): List<Page> {
val encodedUrlsDirect = regexExtractStringValue(
decryptedData,
"urls__direct:\"(.+?)\"",
"Unable to match for urls__direct"
)
val decodedUrlsDirect = String(Base64.decode(encodedUrlsDirect, Base64.NO_WRAP))
val pageUrlArr = decodedUrlsDirect.split("|SEPARATER|")
if (pageUrlArr.isNotEmpty()) {
throw Error("Here ${pageUrlArr[0]} and2 $decodedUrlsDirect")
}
return pageUrlArr.mapIndexed { i, pageUrl ->
Page(i, "", pageUrl)
}
}
private fun processPagesFromInternal(decryptedData: String): List<Page> {
val imageServerDomain = regexExtractStringValue(
decryptedData,
"domain:\"(.+?)\"",
"Unable to match for imageServerDomain"
)
val startImg = regexExtractStringValue(
decryptedData,
"startimg:([0-9]+?),",
"Unable to match for startimg"
).let { it.toInt() }
// Decode and decrypt relative path
val encodedRelativePath = regexExtractStringValue(
decryptedData,
"enc_code2:\"(.+?)\"",
"Unable to match for enc_code2"
)
val decryptedRelativePath = decodeAndDecrypt("encodedRelativePath", encodedRelativePath, decryptKey2Arr)
// Decode and decrypt total pages
val encodedTotalPages = regexExtractStringValue(
decryptedData,
"enc_code1:\"(.+?)\"",
"Unable to match for enc_code1"
)
val decryptedTotalPages = decodeAndDecrypt("encodedTotalPages", encodedTotalPages, decryptKey1Arr).toInt()
return (startImg..decryptedTotalPages).map { i ->
Page(i, "", "https://$imageServerDomain/comic/${encodeUri(decryptedRelativePath)}${"%04d".format(i)}.jpg")
}
}
private fun getEncodedMangaData(document: Document): String {
val scriptElements = document.getElementsByTag("script")
val pattern = Pattern.compile("C_DATA=\'(.+?)\'")
for (element in scriptElements) {
if (element.data().contains("C_DATA")) {
val matcher = pattern.matcher(element.data())
if (matcher.find()) {
val data = matcher.group(1)
if (data != null) {
return data
}
}
}
}
throw Error("Unable to match for C_DATA")
}
private fun decodeAndDecrypt(decodeName: String, value: String, keyArr: Array<String>): String {
val decodedValue = String(Base64.decode(value, Base64.NO_WRAP))
for (key in keyArr) {
try {
return decryptAES(decodedValue, key)
} catch (ex: Exception) {
if (ex.toString() != "Decryption failed") {
throw ex
}
}
}
throw Exception("Decryption failed ($decodeName exhausted keys)")
}
@SuppressLint("GetInstance")
private fun decryptAES(value: String, key: String): String {
val secretKey = SecretKeySpec(key.toByteArray(), "AES")
val cipher = Cipher.getInstance("AES/ECB/PKCS5Padding")
return try {
cipher.init(Cipher.DECRYPT_MODE, secretKey)
val code = Base64.decode(value, Base64.NO_WRAP)
String(cipher.doFinal(code))
} catch (_: Exception) {
throw Exception("Decryption failed")
}
}
private fun regexExtractStringValue(mangaData: String, regex: String, messageIfError: String): String {
val pattern = Pattern.compile(regex)
val matcher = pattern.matcher(mangaData)
if (matcher.find()) {
return matcher.group(1) ?: throw Exception(messageIfError)
}
throw Error(messageIfError)
}
private fun encodeUri(str: String): String {
// https://stackoverflow.com/questions/31511922/is-uri-encode-in-android-equivalent-to-encodeuricomponent-in-javascript
val whitelistChar = "@#&=*+-_.,:!?()/~'%"
return Uri.encode(str, whitelistChar)
}
override fun setupPreferenceScreen(screen: androidx.preference.PreferenceScreen) {
val mainSiteRatePermitsPreference = androidx.preference.ListPreference(screen.context).apply {
key = MAINSITE_RATEPERMITS_PREF
title = MAINSITE_RATEPERMITS_PREF_TITLE
entries = MAINSITE_RATEPERMITS_PREF_ENTRIES_ARRAY
entryValues = MAINSITE_RATEPERMITS_PREF_ENTRIES_ARRAY
summary = MAINSITE_RATEPERMITS_PREF_SUMMARY
setDefaultValue(MAINSITE_RATEPERMITS_PREF_DEFAULT)
setOnPreferenceChangeListener { _, newValue ->
try {
val setting = preferences.edit().putString(MAINSITE_RATEPERMITS_PREF, newValue as String).commit()
setting
} catch (e: Exception) {
e.printStackTrace()
false
}
}
}
val mainSiteRatePeriodPreference = androidx.preference.ListPreference(screen.context).apply {
key = MAINSITE_RATEPERIOD_PREF
title = MAINSITE_RATEPERIOD_PREF_TITLE
entries = MAINSITE_RATEPERIOD_PREF_ENTRIES_ARRAY
entryValues = MAINSITE_RATEPERIOD_PREF_ENTRIES_ARRAY
summary = MAINSITE_RATEPERIOD_PREF_SUMMARY
setDefaultValue(MAINSITE_RATEPERIOD_PREF_DEFAULT)
setOnPreferenceChangeListener { _, newValue ->
try {
val setting = preferences.edit().putString(MAINSITE_RATEPERIOD_PREF, newValue as String).commit()
setting
} catch (e: Exception) {
e.printStackTrace()
false
}
}
}
screen.addPreference(mainSiteRatePermitsPreference)
screen.addPreference(mainSiteRatePeriodPreference)
}
companion object {
private const val MAINSITE_RATEPERMITS_PREF = "mainSiteRatePermitsPreference"
private const val MAINSITE_RATEPERMITS_PREF_DEFAULT = "1"
/** "Ratelimit permits per period for main website" */
private const val MAINSITE_RATEPERMITS_PREF_TITLE = "Main Site Rate Permits Preference"
/** "This value affects network request amount to main website url. Lower this value may reduce the chance to get HTTP 403 error, but loading speed will be slower too. Tachiyomi restart required. Current value: %s" */
private const val MAINSITE_RATEPERMITS_PREF_SUMMARY = "This value affects network request amount to main website url. Lower this value may reduce the chance to get HTTP 403 error, but loading speed will be slower too. Tachiyomi restart required.\nCurrent value: %s"
private val MAINSITE_RATEPERMITS_PREF_ENTRIES_ARRAY = (1..10).map { i -> i.toString() }.toTypedArray()
private const val MAINSITE_RATEPERIOD_PREF = "mainSiteRatePeriodPreference"
private const val MAINSITE_RATEPERIOD_PREF_DEFAULT = "2"
/** "Ratelimit period per second for main website" */
private const val MAINSITE_RATEPERIOD_PREF_TITLE = "Main Site Rate Period Preference"
/** "This value affects network request delay to main website url. Lower this value may reduce the chance to get HTTP 403 error, but loading speed will be slower too. Tachiyomi restart required. Current value: %s" */
private const val MAINSITE_RATEPERIOD_PREF_SUMMARY = "This value affects network request delay to main website url. Lower this value may reduce the chance to get HTTP 403 error, but loading speed will be slower too. Tachiyomi restart required.\nCurrent value: %s"
private val MAINSITE_RATEPERIOD_PREF_ENTRIES_ARRAY = (1..10).map { i -> i.toString() }.toTypedArray()
}
}