diff --git a/lib-multisrc/keyoapp/build.gradle.kts b/lib-multisrc/keyoapp/build.gradle.kts index b45873b53..ede652be5 100644 --- a/lib-multisrc/keyoapp/build.gradle.kts +++ b/lib-multisrc/keyoapp/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 5 +baseVersionCode = 6 diff --git a/lib-multisrc/keyoapp/src/eu/kanade/tachiyomi/multisrc/keyoapp/Keyoapp.kt b/lib-multisrc/keyoapp/src/eu/kanade/tachiyomi/multisrc/keyoapp/Keyoapp.kt index 6b0581c0d..4ce5eba1d 100644 --- a/lib-multisrc/keyoapp/src/eu/kanade/tachiyomi/multisrc/keyoapp/Keyoapp.kt +++ b/lib-multisrc/keyoapp/src/eu/kanade/tachiyomi/multisrc/keyoapp/Keyoapp.kt @@ -234,15 +234,27 @@ abstract class Keyoapp( // Image list override fun pageListParse(document: Document): List { + document.select("#pages > img") + .map { it.attr("uid") } + .filter { it.isNotEmpty() } + .mapIndexed { index, img -> + Page(index, document.location(), "$cdnUrl/uploads/$img") + } + .takeIf { it.isNotEmpty() } + ?.also { return it } + + // Fallback, old method return document.select("#pages > img") .map { it.imgAttr() } - .filter { it.contains(imgCdnRegex) } + .filter { it.contains(oldImgCdnRegex) } .mapIndexed { index, img -> Page(index, document.location(), img) } } - private val imgCdnRegex = Regex("""^(https?:)?//cdn\d*\.keyoapp\.com""") + protected val cdnUrl = "https://cdn.igniscans.com" + + private val oldImgCdnRegex = Regex("""^(https?:)?//cdn\d*\.keyoapp\.com""") override fun imageUrlParse(document: Document) = "" diff --git a/src/en/kewnscans/build.gradle b/src/en/kewnscans/build.gradle index aa5b21336..e09ba3a12 100644 --- a/src/en/kewnscans/build.gradle +++ b/src/en/kewnscans/build.gradle @@ -4,6 +4,7 @@ ext { themePkg = 'keyoapp' baseUrl = 'https://kewnscans.org' overrideVersionCode = 1 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt b/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt index 4309ba5a4..ea0cabef2 100644 --- a/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt +++ b/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt @@ -2,21 +2,17 @@ package eu.kanade.tachiyomi.extension.en.magusmanga import eu.kanade.tachiyomi.multisrc.keyoapp.Keyoapp import eu.kanade.tachiyomi.network.interceptor.rateLimitHost -import eu.kanade.tachiyomi.source.model.Page import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.Interceptor import okhttp3.Response import okio.IOException import org.jsoup.Jsoup -import org.jsoup.nodes.Document class MagusManga : Keyoapp( "Magus Manga", "https://magustoon.com", "en", ) { - private val cdnUrl = "https://cdn.igniscans.com" - override val versionId = 2 override val client = network.cloudflareClient.newBuilder() @@ -47,12 +43,4 @@ class MagusManga : Keyoapp( override fun chapterListSelector(): String { return "${super.chapterListSelector()}:not(:has(img[src*=coin]))" } - - override fun pageListParse(document: Document): List { - return document.select("#pages > img").mapIndexed { idx, img -> - val uid = img.attr("uid") - - Page(idx, imageUrl = "$cdnUrl/uploads/$uid") - } - } } diff --git a/src/en/rudrascans/build.gradle b/src/en/rudrascans/build.gradle deleted file mode 100644 index bb975fbe1..000000000 --- a/src/en/rudrascans/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -ext { - extName = 'Rudra Scans' - extClass = '.RudraScans' - themePkg = 'keyoapp' - baseUrl = 'https://rudrascans.com' - overrideVersionCode = 1 -} - -apply from: "$rootDir/common.gradle" diff --git a/src/en/rudrascans/res/mipmap-hdpi/ic_launcher.png b/src/en/rudrascans/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index dca8c86d7..000000000 Binary files a/src/en/rudrascans/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/src/en/rudrascans/res/mipmap-mdpi/ic_launcher.png b/src/en/rudrascans/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 1a3e2ab24..000000000 Binary files a/src/en/rudrascans/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/src/en/rudrascans/res/mipmap-xhdpi/ic_launcher.png b/src/en/rudrascans/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index cd02f02c4..000000000 Binary files a/src/en/rudrascans/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/src/en/rudrascans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/rudrascans/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 40c2639bc..000000000 Binary files a/src/en/rudrascans/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/src/en/rudrascans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/rudrascans/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index c39f1d3b9..000000000 Binary files a/src/en/rudrascans/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/src/en/rudrascans/src/eu/kanade/tachiyomi/extension/en/rudrascans/RudraScans.kt b/src/en/rudrascans/src/eu/kanade/tachiyomi/extension/en/rudrascans/RudraScans.kt deleted file mode 100644 index 8edf82a56..000000000 --- a/src/en/rudrascans/src/eu/kanade/tachiyomi/extension/en/rudrascans/RudraScans.kt +++ /dev/null @@ -1,5 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.rudrascans - -import eu.kanade.tachiyomi.multisrc.keyoapp.Keyoapp - -class RudraScans : Keyoapp("Rudra Scans", "https://rudrascans.com", "en")