From b14b910407a8b968d47bae67c679fbbb3baa8dbc Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Mon, 8 Feb 2021 14:53:17 -0800 Subject: [PATCH] EroMuse split (#5708) * split eromuse * revert EroMuse * add nsfw annotation --- .../default_res}/mipmap-hdpi/ic_launcher.png | Bin .../default_res}/mipmap-mdpi/ic_launcher.png | Bin .../default_res}/mipmap-xhdpi/ic_launcher.png | Bin .../mipmap-xxhdpi/ic_launcher.png | Bin .../mipmap-xxxhdpi/ic_launcher.png | Bin .../eromuse/default_res}/web_hi_res_512.png | Bin .../eromuse/eightmuses/src/EightMuses.kt | 9 +++++++ .../overrides/eromuse/erofus/src/Erofus.kt | 13 ++------- .../tachiyomi/multisrc}/eromuse/EroMuse.kt | 2 +- .../multisrc/eromuse/EroMuseGenerator.kt | 25 ++++++++++++++++++ src/all/eromuse/AndroidManifest.xml | 2 -- src/all/eromuse/build.gradle | 13 --------- 12 files changed, 37 insertions(+), 27 deletions(-) rename {src/all/eromuse/res => multisrc/overrides/eromuse/default_res}/mipmap-hdpi/ic_launcher.png (100%) rename {src/all/eromuse/res => multisrc/overrides/eromuse/default_res}/mipmap-mdpi/ic_launcher.png (100%) rename {src/all/eromuse/res => multisrc/overrides/eromuse/default_res}/mipmap-xhdpi/ic_launcher.png (100%) rename {src/all/eromuse/res => multisrc/overrides/eromuse/default_res}/mipmap-xxhdpi/ic_launcher.png (100%) rename {src/all/eromuse/res => multisrc/overrides/eromuse/default_res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename {src/all/eromuse/res => multisrc/overrides/eromuse/default_res}/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/eromuse/eightmuses/src/EightMuses.kt rename src/all/eromuse/src/eu/kanade/tachiyomi/extension/all/eromuse/EroMuseFactory.kt => multisrc/overrides/eromuse/erofus/src/Erofus.kt (96%) rename {src/all/eromuse/src/eu/kanade/tachiyomi/extension/all => multisrc/src/main/java/eu/kanade/tachiyomi/multisrc}/eromuse/EroMuse.kt (99%) create mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt delete mode 100644 src/all/eromuse/AndroidManifest.xml delete mode 100644 src/all/eromuse/build.gradle diff --git a/src/all/eromuse/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/eromuse/default_res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from src/all/eromuse/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/eromuse/default_res/mipmap-hdpi/ic_launcher.png diff --git a/src/all/eromuse/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/eromuse/default_res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from src/all/eromuse/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/eromuse/default_res/mipmap-mdpi/ic_launcher.png diff --git a/src/all/eromuse/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/eromuse/default_res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from src/all/eromuse/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/eromuse/default_res/mipmap-xhdpi/ic_launcher.png diff --git a/src/all/eromuse/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/eromuse/default_res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from src/all/eromuse/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/eromuse/default_res/mipmap-xxhdpi/ic_launcher.png diff --git a/src/all/eromuse/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/eromuse/default_res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from src/all/eromuse/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/eromuse/default_res/mipmap-xxxhdpi/ic_launcher.png diff --git a/src/all/eromuse/res/web_hi_res_512.png b/multisrc/overrides/eromuse/default_res/web_hi_res_512.png similarity index 100% rename from src/all/eromuse/res/web_hi_res_512.png rename to multisrc/overrides/eromuse/default_res/web_hi_res_512.png diff --git a/multisrc/overrides/eromuse/eightmuses/src/EightMuses.kt b/multisrc/overrides/eromuse/eightmuses/src/EightMuses.kt new file mode 100644 index 000000000..c839bc169 --- /dev/null +++ b/multisrc/overrides/eromuse/eightmuses/src/EightMuses.kt @@ -0,0 +1,9 @@ +package eu.kanade.tachiyomi.extension.en.eightmuses + +import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.eromuse.EroMuse +import kotlin.ExperimentalStdlibApi + +@ExperimentalStdlibApi +@Nsfw +class EightMuses : EroMuse("8Muses", "https://comics.8muses.com") diff --git a/src/all/eromuse/src/eu/kanade/tachiyomi/extension/all/eromuse/EroMuseFactory.kt b/multisrc/overrides/eromuse/erofus/src/Erofus.kt similarity index 96% rename from src/all/eromuse/src/eu/kanade/tachiyomi/extension/all/eromuse/EroMuseFactory.kt rename to multisrc/overrides/eromuse/erofus/src/Erofus.kt index 2503b4fba..08de650af 100644 --- a/src/all/eromuse/src/eu/kanade/tachiyomi/extension/all/eromuse/EroMuseFactory.kt +++ b/multisrc/overrides/eromuse/erofus/src/Erofus.kt @@ -1,9 +1,8 @@ -package eu.kanade.tachiyomi.extension.all.eromuse +package eu.kanade.tachiyomi.extension.en.erofus import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.eromuse.EroMuse import eu.kanade.tachiyomi.network.asObservableSuccess -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.SManga @@ -14,14 +13,6 @@ import rx.Observable @ExperimentalStdlibApi @Nsfw -class EroMuseFactory : SourceFactory { - override fun createSources(): List = listOf( - EroMuse("8Muses", "https://comics.8muses.com"), - Erofus() - ) -} - -@ExperimentalStdlibApi class Erofus : EroMuse("Erofus", "https://www.erofus.com") { override val albumSelector = "a.a-click" diff --git a/src/all/eromuse/src/eu/kanade/tachiyomi/extension/all/eromuse/EroMuse.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt similarity index 99% rename from src/all/eromuse/src/eu/kanade/tachiyomi/extension/all/eromuse/EroMuse.kt rename to multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt index 202a00524..857412f7b 100644 --- a/src/all/eromuse/src/eu/kanade/tachiyomi/extension/all/eromuse/EroMuse.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.extension.all.eromuse +package eu.kanade.tachiyomi.multisrc.eromuse import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt new file mode 100644 index 000000000..ec9ee8c43 --- /dev/null +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt @@ -0,0 +1,25 @@ +package eu.kanade.tachiyomi.multisrc.eromuse + +import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang +import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator + +class EroMuseGenerator : ThemeSourceGenerator { + + override val themePkg = "eromuse" + + override val themeClass = "EroMuse" + + override val baseVersionCode: Int = 1 + + override val sources = listOf( + SingleLang("8Muses", "https://comics.8muses.com", "en", className = "EightMuses"), + SingleLang("Erofus", "https://www.erofus.com", "en") + ) + + companion object { + @JvmStatic + fun main(args: Array) { + EroMuseGenerator().createAll() + } + } +} diff --git a/src/all/eromuse/AndroidManifest.xml b/src/all/eromuse/AndroidManifest.xml deleted file mode 100644 index 30deb7f79..000000000 --- a/src/all/eromuse/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/all/eromuse/build.gradle b/src/all/eromuse/build.gradle deleted file mode 100644 index 4950769c7..000000000 --- a/src/all/eromuse/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' - -ext { - extName = 'EroMuse (8muses and Erofus)' - pkgNameSuffix = 'all.eromuse' - extClass = '.EroMuseFactory' - extVersionCode = 3 - libVersion = '1.2' - containsNsfw = true -} - -apply from: "$rootDir/common.gradle"