EroMuse split (#5708)

* split eromuse

* revert EroMuse

* add nsfw annotation

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")

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<Source> = listOf(
-        EroMuse("8Muses", "https://comics.8muses.com"),
-        Erofus()
-    )
-}
-
-@ExperimentalStdlibApi
 class Erofus : EroMuse("Erofus", "https://www.erofus.com") {
 
     override val albumSelector = "a.a-click"

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

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<String>) {
+            EroMuseGenerator().createAll()
+        }
+    }
+}

src/all/eromuse/AndroidManifest.xml

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

src/all/eromuse/build.gradle

@@ -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"