diff --git a/multisrc/overrides/madara/armoniscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/armoniscans/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..35f2a403e Binary files /dev/null and b/multisrc/overrides/madara/armoniscans/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/armoniscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/armoniscans/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..423bb52ac Binary files /dev/null and b/multisrc/overrides/madara/armoniscans/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/armoniscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/armoniscans/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..3183a5380 Binary files /dev/null and b/multisrc/overrides/madara/armoniscans/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/armoniscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/armoniscans/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..a80b9988a Binary files /dev/null and b/multisrc/overrides/madara/armoniscans/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/armoniscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/armoniscans/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..0ce9d922d Binary files /dev/null and b/multisrc/overrides/madara/armoniscans/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/mangathemesia/asurascans/src/AsuraScansEn.kt b/multisrc/overrides/mangathemesia/asurascans/src/AsuraScans.kt similarity index 99% rename from multisrc/overrides/mangathemesia/asurascans/src/AsuraScansEn.kt rename to multisrc/overrides/mangathemesia/asurascans/src/AsuraScans.kt index 9de7310af..63f2f0559 100644 --- a/multisrc/overrides/mangathemesia/asurascans/src/AsuraScansEn.kt +++ b/multisrc/overrides/mangathemesia/asurascans/src/AsuraScans.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.extension.all.asurascans +package eu.kanade.tachiyomi.extension.en.asurascans import android.app.Application import android.content.SharedPreferences @@ -27,7 +27,7 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -class AsuraScansEn : MangaThemesia( +class AsuraScans : MangaThemesia( "Asura Scans", "https://asuratoon.com", "en", diff --git a/multisrc/overrides/mangathemesia/asurascans/src/AsuraScansFactory.kt b/multisrc/overrides/mangathemesia/asurascans/src/AsuraScansFactory.kt deleted file mode 100644 index 47dc509bf..000000000 --- a/multisrc/overrides/mangathemesia/asurascans/src/AsuraScansFactory.kt +++ /dev/null @@ -1,10 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.asurascans - -import eu.kanade.tachiyomi.source.SourceFactory - -class AsuraScansFactory : SourceFactory { - override fun createSources() = listOf( - AsuraScansEn(), - AsuraScansTr(), - ) -} diff --git a/multisrc/overrides/mangathemesia/asurascans/src/AsuraScansTr.kt b/multisrc/overrides/mangathemesia/asurascans/src/AsuraScansTr.kt deleted file mode 100644 index 929af6c76..000000000 --- a/multisrc/overrides/mangathemesia/asurascans/src/AsuraScansTr.kt +++ /dev/null @@ -1,66 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.asurascans - -import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.model.SManga -import kotlinx.serialization.Serializable -import kotlinx.serialization.decodeFromString -import okhttp3.OkHttpClient -import org.jsoup.nodes.Document -import org.jsoup.nodes.Element -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit - -class AsuraScansTr : MangaThemesia( - "Asura Scans", - "https://armoniscans.com", - "tr", - dateFormat = SimpleDateFormat("MMM d, yyyy", Locale("tr")), -) { - override val client: OkHttpClient = super.client.newBuilder() - .rateLimit(1, 3, TimeUnit.SECONDS) - .build() - - override val seriesArtistSelector = ".fmed b:contains(Çizer)+span" - override val seriesAuthorSelector = ".fmed b:contains(Yazar)+span" - override val seriesStatusSelector = ".imptdt:contains(Durum) i" - override val seriesTypeSelector = ".imptdt:contains(Tür) a" - - override val altNamePrefix: String = "Alternatif isim: " - - override fun String?.parseStatus(): Int = when { - this == null -> SManga.UNKNOWN - this.contains("Devam Ediyor", ignoreCase = true) -> SManga.ONGOING - this.contains("Tamamlandı", ignoreCase = true) -> SManga.COMPLETED - else -> SManga.UNKNOWN - } - - override fun Element.imgAttr(): String = when { - hasAttr("data-lazy-src") -> attr("abs:data-lazy-src") - hasAttr("data-src") -> attr("abs:data-src") - hasAttr("data-cfsrc") -> attr("abs:data-cfsrc") - else -> attr("abs:src") - } - - override fun pageListParse(document: Document): List { - val scriptContent = document.selectFirst("script:containsData(ts_reader)")?.data() - ?: return super.pageListParse(document) - val jsonString = scriptContent.substringAfter("ts_reader.run(").substringBefore(");") - val tsReader = json.decodeFromString(jsonString) - val imageUrls = tsReader.sources.firstOrNull()?.images ?: return emptyList() - return imageUrls.mapIndexed { index, imageUrl -> Page(index, document.location(), imageUrl) } - } - - @Serializable - data class TSReader( - val sources: List, - ) - - @Serializable - data class ReaderImageSource( - val source: String, - val images: List, - ) -} 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 049e3719d..e90dfe439 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 @@ -35,6 +35,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Ansh Scans", "https://anshscans.org", "en", overrideVersionCode = 1), SingleLang("ApollComics", "https://apollcomics.xyz", "es", isNsfw = true, overrideVersionCode = 2), SingleLang("Apolltoons", "https://apolltoons.xyz", "es", isNsfw = true), + SingleLang("Armoni Scans", "https://armoniscans.net", "tr"), SingleLang("Aqua Manga", "https://aquamanga.org", "en", isNsfw = false, overrideVersionCode = 8), SingleLang("AQUA Scans", "https://aquascans.com", "en", className = "ManhwaWorld", overrideVersionCode = 1), SingleLang("ArazNovel", "https://www.araznovel.com", "tr", overrideVersionCode = 3), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt index 570a60627..c33ff9bbd 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt @@ -14,7 +14,6 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 27 override val sources = listOf( - MultiLang("Asura Scans", "https://asuratoon.com", listOf("en", "tr"), className = "AsuraScansFactory", pkgName = "asurascans", overrideVersionCode = 31), MultiLang("Miau Scan", "https://miaucomics.org", listOf("es", "pt-BR"), overrideVersionCode = 2), SingleLang("Ainz Scans ID", "https://ainzscans.site", "id"), SingleLang("Alceascan", "https://alceascan.my.id", "id"), @@ -23,6 +22,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Arkham Scan", "https://arkhamscan.com", "pt-BR"), SingleLang("Arven Scans", "https://arvenscans.com", "en"), SingleLang("AscalonScans", "https://ascalonscans.com", "en"), + SingleLang("Asura Scans", "https://asuratoon.com", "en"), SingleLang("Azure Scans", "https://azuremanga.com", "en", overrideVersionCode = 1), SingleLang("Banana-Scan", "https://banana-scan.com", "fr", className = "BananaScan", isNsfw = true), SingleLang("Beast Scans", "https://beastscans.net", "ar", overrideVersionCode = 1),