diff --git a/src/ar/animerco/build.gradle b/src/ar/animerco/build.gradle index d6d837ba0..fe057ad84 100644 --- a/src/ar/animerco/build.gradle +++ b/src/ar/animerco/build.gradle @@ -10,6 +10,7 @@ ext { } dependencies { + implementation(project(':lib-fembed-extractor')) implementation(project(':lib-streamtape-extractor')) implementation(project(':lib-streamsb-extractor')) implementation(project(':lib-dood-extractor')) diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt index 491d62403..7011e9fc2 100644 --- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt +++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt @@ -4,7 +4,6 @@ import android.app.Application import android.content.SharedPreferences import androidx.preference.ListPreference import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.animeextension.ar.animerco.extractors.FembedExtractor import eu.kanade.tachiyomi.animeextension.ar.animerco.extractors.MpforuploadExtractor import eu.kanade.tachiyomi.animeextension.ar.animerco.extractors.SharedExtractor import eu.kanade.tachiyomi.animeextension.ar.animerco.extractors.UQLoadExtractor @@ -16,6 +15,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor +import eu.kanade.tachiyomi.lib.fembedextractor.FembedExtractor import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor import eu.kanade.tachiyomi.network.GET @@ -225,6 +225,7 @@ class Animerco : ConfigurableAnimeSource, ParsedAnimeHttpSource() { -> { val fUrl = embedUrl.replace("\\/", "/") + .replace("https://www.fembed.com", "https://suzihaza.com") val videos = FembedExtractor(client).videosFromUrl(embedUrl) videoList.addAll(videos) } diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/FembedExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/FembedExtractor.kt deleted file mode 100644 index 357950b28..000000000 --- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/FembedExtractor.kt +++ /dev/null @@ -1,49 +0,0 @@ -package eu.kanade.tachiyomi.animeextension.ar.animerco.extractors - -import eu.kanade.tachiyomi.animesource.model.Video -import eu.kanade.tachiyomi.network.POST -import kotlinx.serialization.decodeFromString -import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonObject -import kotlinx.serialization.json.jsonArray -import kotlinx.serialization.json.jsonObject -import okhttp3.OkHttpClient - -class FembedExtractor(private val client: OkHttpClient) { - fun videosFromUrl(url: String): List