INSANEMODE/aniyomi-extensions-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(en/fmovies): Use correct action for mcloud and small tweak to filters (#2231)

Browse Source
This commit is contained in:
Secozzi
2023-09-21 17:40:39 +00:00
committed by GitHub
parent cf721b67cb
commit 5aee7f6e8e
4 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/en/fmovies/build.gradle
View File

@ -8,7 +8,7 @@ ext {
extName = 'FMovies' extName = 'FMovies'
pkgNameSuffix = 'en.fmovies' pkgNameSuffix = 'en.fmovies'
extClass = '.FMovies' extClass = '.FMovies'
extVersionCode = 7 extVersionCode = 8
libVersion = '13' libVersion = '13'
} }

67
src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
View File

@ -216,50 +216,43 @@ class FMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
response.parseAs<AjaxResponse>().result, response.parseAs<AjaxResponse>().result,
) )
val hosterSelection = preferences.getStringSet(PREF_HOSTER_KEY, PREF_HOSTER_DEFAULT)!! val hosterSelection = preferences.getStringSet(PREF_HOSTER_KEY, PREF_HOSTER_DEFAULT)!!
val videoList = mutableListOf<Video>()
videoList.addAll( return document.select("ul.servers > li.server").parallelMap { server ->
document.select("ul.servers > li.server").parallelMap { server -> runCatching {
runCatching { val name = server.text().trim()
val name = server.text().trim() if (!hosterSelection.contains(name)) return@runCatching emptyList()
if (!hosterSelection.contains(name)) return@runCatching null
// Get decrypted url // Get decrypted url
val vrf = vrfHelper.getVrf(server.attr("data-link-id")) val vrf = vrfHelper.getVrf(server.attr("data-link-id"))
val vrfHeaders = headers.newBuilder() val vrfHeaders = headers.newBuilder()
.add("Accept", "application/json, text/javascript, */*; q=0.01") .add("Accept", "application/json, text/javascript, */*; q=0.01")
.add("Host", baseUrl.toHttpUrl().host) .add("Host", baseUrl.toHttpUrl().host)
.add("Referer", data.url) .add("Referer", data.url)
.add("X-Requested-With", "XMLHttpRequest") .add("X-Requested-With", "XMLHttpRequest")
.build() .build()
val encrypted = client.newCall( val encrypted = client.newCall(
GET("$baseUrl/ajax/server/${server.attr("data-link-id")}?vrf=$vrf", headers = vrfHeaders), GET("$baseUrl/ajax/server/${server.attr("data-link-id")}?vrf=$vrf", headers = vrfHeaders),
).execute().parseAs<AjaxServerResponse>().result.url ).execute().parseAs<AjaxServerResponse>().result.url
val decrypted = vrfHelper.decrypt(encrypted) val decrypted = vrfHelper.decrypt(encrypted)
when (name) { when (name) {
"Vidplay", "MyCloud" -> vidsrcExtractor.videosFromUrl(decrypted, name) "Vidplay", "MyCloud" -> vidsrcExtractor.videosFromUrl(decrypted, name)
"Filemoon" -> filemoonExtractor.videosFromUrl(decrypted, headers = headers) "Filemoon" -> filemoonExtractor.videosFromUrl(decrypted, headers = headers)
"Streamtape" -> { "Streamtape" -> {
val subtitleList = decrypted.toHttpUrl().queryParameter("sub.info")?.let { val subtitleList = decrypted.toHttpUrl().queryParameter("sub.info")?.let {
client.newCall(GET(it, headers)).execute().parseAs<List<FMoviesSubs>>().map { t -> client.newCall(GET(it, headers)).execute().parseAs<List<FMoviesSubs>>().map { t ->
Track(t.file, t.label) Track(t.file, t.label)
} }
} ?: emptyList() } ?: emptyList()
streamtapeExtractor.videoFromUrl(decrypted, subtitleList = subtitleList)?.let(::listOf) ?: emptyList() streamtapeExtractor.videoFromUrl(decrypted, subtitleList = subtitleList)?.let(::listOf) ?: emptyList()
}
else -> null
} }
}.getOrNull() else -> emptyList()
}.filterNotNull().flatten(), }
) }.getOrElse { emptyList() }
}.flatten().ifEmpty { throw Exception("Failed to fetch videos") }
require(videoList.isNotEmpty()) { "Failed to fetch videos" }
return videoList.sort()
} }
override fun videoListSelector() = throw Exception("not used") override fun videoListSelector() = throw Exception("not used")

1
src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesFilters.kt
View File

@ -288,6 +288,7 @@ object FMoviesFilters {
) )
val SORT = arrayOf( val SORT = arrayOf(
Pair("Most relevance", "most_relevance"),
Pair("Recently updated", "recently_updated"), Pair("Recently updated", "recently_updated"),
Pair("Recently added", "recently_added"), Pair("Recently added", "recently_added"),
Pair("Release date", "release_date"), Pair("Release date", "release_date"),

8
src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt
View File

@ -39,7 +39,7 @@ class FMoviesHelper(private val client: OkHttpClient, private val headers: Heade
fun getVidSrc(query: String, host: String): String { fun getVidSrc(query: String, host: String): String {
val url = API_URL.newBuilder().apply { val url = API_URL.newBuilder().apply {
addPathSegment("rawVizcloud") addPathSegment(if (host == "vidstream.pro") "rawVizcloud" else "rawMcloud")
addQueryParameter("apikey", API_KEY) addQueryParameter("apikey", API_KEY)
}.build().toString() }.build().toString()
@ -52,13 +52,9 @@ class FMoviesHelper(private val client: OkHttpClient, private val headers: Heade
add("futoken", futoken) add("futoken", futoken)
}.build() }.build()
val rawURL = client.newCall( return client.newCall(
POST(url, body = body), POST(url, body = body),
).execute().parseAs<RawResponse>().rawURL ).execute().parseAs<RawResponse>().rawURL
return rawURL.toHttpUrl().newBuilder().apply {
host(host)
}.build().toString()
} }
companion object { companion object {