diff --git a/src/es/cuevana/build.gradle b/src/es/cuevana/build.gradle index 1d3922416..1ef3b9d10 100644 --- a/src/es/cuevana/build.gradle +++ b/src/es/cuevana/build.gradle @@ -1,11 +1,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +apply plugin: 'kotlinx-serialization' ext { extName = 'Cuevana' pkgNameSuffix = 'es.cuevana' - extClass = '.Cuevana' - extVersionCode = 19 + extClass = '.CuevanaFactory' + extVersionCode = 20 libVersion = '13' } @@ -15,6 +16,7 @@ dependencies { implementation project(path: ':lib-okru-extractor') implementation project(path: ':lib-voe-extractor') implementation project(path: ':lib-streamtape-extractor') + implementation project(path: ':lib-filemoon-extractor') implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" } diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/Cuevana.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt similarity index 92% rename from src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/Cuevana.kt rename to src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt index 1a7bed419..9e0602dee 100644 --- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/Cuevana.kt +++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt @@ -19,7 +19,6 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup -import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.jsonPrimitive @@ -33,11 +32,7 @@ import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy import java.text.SimpleDateFormat -class Cuevana : ConfigurableAnimeSource, ParsedAnimeHttpSource() { - - override val name = "Cuevana" - - override val baseUrl = "https://www12.cuevana3.ch" +class CuevanaCh(override val name: String, override val baseUrl: String) : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override val lang = "es" @@ -196,24 +191,21 @@ class Cuevana : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun videoFromElement(element: Element) = throw Exception("not used") override fun List