From fe8dc9a5b44a9fc37e6b789ad103322355019964 Mon Sep 17 00:00:00 2001 From: Ahmed gamal <12355.ahmedgamal.com@gmail.com> Date: Mon, 7 Feb 2022 13:10:34 +0200 Subject: [PATCH] asianload, dramacool: fix streamsb extractor and other modifications (#309) --- src/en/asianload/build.gradle | 2 +- .../animeextension/en/asianload/AsianLoad.kt | 160 +++++------------- .../en/asianload/extractors/DoodExtractor.kt | 43 +++++ .../asianload/extractors/FembedExtractor.kt | 24 +++ .../asianload/extractors/StreamSBExtractor.kt | 44 +++++ .../extractors/StreamTapeExtractor.kt | 19 +++ src/en/dramacool/build.gradle | 2 +- .../animeextension/en/dramacool/DramaCool.kt | 138 ++++----------- .../en/dramacool/extractors/DoodExtractor.kt | 43 +++++ .../dramacool/extractors/FembedExtractor.kt | 24 +++ .../dramacool/extractors/StreamSBExtractor.kt | 44 +++++ .../extractors/StreamTapeExtractor.kt | 19 +++ 12 files changed, 338 insertions(+), 224 deletions(-) create mode 100644 src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/DoodExtractor.kt create mode 100644 src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/FembedExtractor.kt create mode 100644 src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamSBExtractor.kt create mode 100644 src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamTapeExtractor.kt create mode 100644 src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/DoodExtractor.kt create mode 100644 src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/FembedExtractor.kt create mode 100644 src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamSBExtractor.kt create mode 100644 src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamTapeExtractor.kt diff --git a/src/en/asianload/build.gradle b/src/en/asianload/build.gradle index 656afe21d..cd90eb5ec 100644 --- a/src/en/asianload/build.gradle +++ b/src/en/asianload/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'AsianLoad' pkgNameSuffix = 'en.asianload' extClass = '.AsianLoad' - extVersionCode = 2 + extVersionCode = 3 libVersion = '12' } diff --git a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt index 4fcfad16b..53f764e47 100644 --- a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt +++ b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt @@ -2,10 +2,13 @@ package eu.kanade.tachiyomi.animeextension.en.asianload import android.app.Application import android.content.SharedPreferences -import android.net.Uri import android.util.Log import androidx.preference.ListPreference import androidx.preference.PreferenceScreen +import eu.kanade.tachiyomi.animeextension.en.asianload.extractors.DoodExtractor +import eu.kanade.tachiyomi.animeextension.en.asianload.extractors.FembedExtractor +import eu.kanade.tachiyomi.animeextension.en.asianload.extractors.StreamSBExtractor +import eu.kanade.tachiyomi.animeextension.en.asianload.extractors.StreamTapeExtractor import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource import eu.kanade.tachiyomi.animesource.model.AnimeFilter import eu.kanade.tachiyomi.animesource.model.AnimeFilterList @@ -14,7 +17,6 @@ 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.network.GET -import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.util.asJsoup import okhttp3.Headers import okhttp3.HttpUrl.Companion.toHttpUrlOrNull @@ -51,7 +53,7 @@ class AsianLoad : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun popularAnimeSelector(): String = "ul.listing.items li a" - override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/popular?page=$page") + override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/popular?page=$page") // page/$page override fun popularAnimeFromElement(element: Element): SAnime { val anime = SAnime.create() @@ -80,7 +82,7 @@ class AsianLoad : ConfigurableAnimeSource, ParsedAnimeHttpSource() { // episode.date_upload = element.select("div.meta span.date").text() return episode } - + private fun getNumberFromEpsString(epsStr: String): String { return epsStr.filter { it.isDigit() } } @@ -98,10 +100,7 @@ class AsianLoad : ConfigurableAnimeSource, ParsedAnimeHttpSource() { return videosFromElement(document) } - val srcVid = preferences.getString("preferred_server", "https://dood") - - override fun videoListSelector() = "ul.list-server-items li[data-video*=$srcVid]" - // "ul.list-server-items li[data-video*=https://sbplay2.com], ul.list-server-items li[data-video*=https://dood], ul.list-server-items li[data-video*=https://streamtape], ul.list-server-items li[data-video*=https://fembed]" + override fun videoListSelector() = "ul.list-server-items li[data-video*=https://sbplay2.com], ul.list-server-items li[data-video*=https://dood], ul.list-server-items li[data-video*=https://streamtape], ul.list-server-items li[data-video*=https://fembed]" private fun videosFromElement(document: Document): List