diff --git a/src/fr/vostfree/build.gradle b/src/fr/vostfree/build.gradle index 5380061b6..d3f400122 100644 --- a/src/fr/vostfree/build.gradle +++ b/src/fr/vostfree/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Vostfree' pkgNameSuffix = 'fr.vostfree' extClass = '.Vostfree' - extVersionCode = 1 + extVersionCode = 2 libVersion = '12' } diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt index 15a68e228..58ada1dfb 100644 --- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt +++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt @@ -6,6 +6,7 @@ import android.util.Log import androidx.preference.ListPreference import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.animeextension.fr.vostfree.extractors.DoodExtractor +import eu.kanade.tachiyomi.animeextension.fr.vostfree.extractors.MytvExtractor import eu.kanade.tachiyomi.animeextension.fr.vostfree.extractors.OkruExtractor import eu.kanade.tachiyomi.animeextension.fr.vostfree.extractors.VudeoExtractor import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource @@ -111,7 +112,7 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val video = VudeoExtractor(client).videosFromUrl(url) videoList.addAll(video) } - if (server == "OK") { + if (server == "Ok" || server == "OK") { val playerId = it.attr("id") val url = "https://ok.ru/videoembed/" + document.select("div#player-tabs div.tab-blocks div.tab-content div div#content_$playerId").text() val video = OkruExtractor(client).videosFromUrl(url) @@ -125,8 +126,13 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() { videoList.add(video) } } + if (server == "Mytv" || server == "Stream") { + val playerId = it.attr("id") + val url = "https://www.myvi.tv/embed/" + document.select("div#player-tabs div.tab-blocks div.tab-content div div#content_$playerId").text() + val video = MytvExtractor(client).videosFromUrl(url) + videoList.addAll(video) + } } - Log.i("bruh", "test1") return videoList } diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/MytvExtractor.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/MytvExtractor.kt new file mode 100644 index 000000000..efeda6008 --- /dev/null +++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/MytvExtractor.kt @@ -0,0 +1,28 @@ +package eu.kanade.tachiyomi.animeextension.fr.vostfree.extractors + +import android.util.Log +import eu.kanade.tachiyomi.animesource.model.Video +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.util.asJsoup +import okhttp3.OkHttpClient + +class MytvExtractor(private val client: OkHttpClient) { + fun videosFromUrl(url: String): List