From 5aee7f6e8e3fb1200e7e47319fc9b09ee66705ac Mon Sep 17 00:00:00 2001
From: Secozzi <49240133+Secozzi@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:40:39 +0000
Subject: [PATCH] fix(en/fmovies): Use correct action for mcloud and small
 tweak to filters (#2231)

---
 src/en/fmovies/build.gradle                   |  2 +-
 .../animeextension/en/fmovies/FMovies.kt      | 67 +++++++++----------
 .../en/fmovies/FMoviesFilters.kt              |  1 +
 .../en/fmovies/FMoviesHelper.kt               |  8 +--
 4 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/src/en/fmovies/build.gradle b/src/en/fmovies/build.gradle
index f8193dd9e..bed36e3e0 100644
--- a/src/en/fmovies/build.gradle
+++ b/src/en/fmovies/build.gradle
@@ -8,7 +8,7 @@ ext {
     extName = 'FMovies'
     pkgNameSuffix = 'en.fmovies'
     extClass = '.FMovies'
-    extVersionCode = 7
+    extVersionCode = 8
     libVersion = '13'
 }
 
diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
index 500ad7033..dee9d13c8 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
@@ -216,50 +216,43 @@ class FMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             response.parseAs<AjaxResponse>().result,
         )
         val hosterSelection = preferences.getStringSet(PREF_HOSTER_KEY, PREF_HOSTER_DEFAULT)!!
-        val videoList = mutableListOf<Video>()
 
-        videoList.addAll(
-            document.select("ul.servers > li.server").parallelMap { server ->
-                runCatching {
-                    val name = server.text().trim()
-                    if (!hosterSelection.contains(name)) return@runCatching null
+        return document.select("ul.servers > li.server").parallelMap { server ->
+            runCatching {
+                val name = server.text().trim()
+                if (!hosterSelection.contains(name)) return@runCatching emptyList()
 
-                    // Get decrypted url
-                    val vrf = vrfHelper.getVrf(server.attr("data-link-id"))
+                // Get decrypted url
+                val vrf = vrfHelper.getVrf(server.attr("data-link-id"))
 
-                    val vrfHeaders = headers.newBuilder()
-                        .add("Accept", "application/json, text/javascript, */*; q=0.01")
-                        .add("Host", baseUrl.toHttpUrl().host)
-                        .add("Referer", data.url)
-                        .add("X-Requested-With", "XMLHttpRequest")
-                        .build()
-                    val encrypted = client.newCall(
-                        GET("$baseUrl/ajax/server/${server.attr("data-link-id")}?vrf=$vrf", headers = vrfHeaders),
-                    ).execute().parseAs<AjaxServerResponse>().result.url
+                val vrfHeaders = headers.newBuilder()
+                    .add("Accept", "application/json, text/javascript, */*; q=0.01")
+                    .add("Host", baseUrl.toHttpUrl().host)
+                    .add("Referer", data.url)
+                    .add("X-Requested-With", "XMLHttpRequest")
+                    .build()
+                val encrypted = client.newCall(
+                    GET("$baseUrl/ajax/server/${server.attr("data-link-id")}?vrf=$vrf", headers = vrfHeaders),
+                ).execute().parseAs<AjaxServerResponse>().result.url
 
-                    val decrypted = vrfHelper.decrypt(encrypted)
+                val decrypted = vrfHelper.decrypt(encrypted)
 
-                    when (name) {
-                        "Vidplay", "MyCloud" -> vidsrcExtractor.videosFromUrl(decrypted, name)
-                        "Filemoon" -> filemoonExtractor.videosFromUrl(decrypted, headers = headers)
-                        "Streamtape" -> {
-                            val subtitleList = decrypted.toHttpUrl().queryParameter("sub.info")?.let {
-                                client.newCall(GET(it, headers)).execute().parseAs<List<FMoviesSubs>>().map { t ->
-                                    Track(t.file, t.label)
-                                }
-                            } ?: emptyList()
+                when (name) {
+                    "Vidplay", "MyCloud" -> vidsrcExtractor.videosFromUrl(decrypted, name)
+                    "Filemoon" -> filemoonExtractor.videosFromUrl(decrypted, headers = headers)
+                    "Streamtape" -> {
+                        val subtitleList = decrypted.toHttpUrl().queryParameter("sub.info")?.let {
+                            client.newCall(GET(it, headers)).execute().parseAs<List<FMoviesSubs>>().map { t ->
+                                Track(t.file, t.label)
+                            }
+                        } ?: emptyList()
 
-                            streamtapeExtractor.videoFromUrl(decrypted, subtitleList = subtitleList)?.let(::listOf) ?: emptyList()
-                        }
-                        else -> null
+                        streamtapeExtractor.videoFromUrl(decrypted, subtitleList = subtitleList)?.let(::listOf) ?: emptyList()
                     }
-                }.getOrNull()
-            }.filterNotNull().flatten(),
-        )
-
-        require(videoList.isNotEmpty()) { "Failed to fetch videos" }
-
-        return videoList.sort()
+                    else -> emptyList()
+                }
+            }.getOrElse { emptyList() }
+        }.flatten().ifEmpty { throw Exception("Failed to fetch videos") }
     }
 
     override fun videoListSelector() = throw Exception("not used")
diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesFilters.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesFilters.kt
index 78948345a..1f6c0f101 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesFilters.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesFilters.kt
@@ -288,6 +288,7 @@ object FMoviesFilters {
         )
 
         val SORT = arrayOf(
+            Pair("Most relevance", "most_relevance"),
             Pair("Recently updated", "recently_updated"),
             Pair("Recently added", "recently_added"),
             Pair("Release date", "release_date"),
diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt
index 51def0e3f..293fb0ec4 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt
@@ -39,7 +39,7 @@ class FMoviesHelper(private val client: OkHttpClient, private val headers: Heade
 
     fun getVidSrc(query: String, host: String): String {
         val url = API_URL.newBuilder().apply {
-            addPathSegment("rawVizcloud")
+            addPathSegment(if (host == "vidstream.pro") "rawVizcloud" else "rawMcloud")
             addQueryParameter("apikey", API_KEY)
         }.build().toString()
 
@@ -52,13 +52,9 @@ class FMoviesHelper(private val client: OkHttpClient, private val headers: Heade
             add("futoken", futoken)
         }.build()
 
-        val rawURL = client.newCall(
+        return client.newCall(
             POST(url, body = body),
         ).execute().parseAs<RawResponse>().rawURL
-
-        return rawURL.toHttpUrl().newBuilder().apply {
-            host(host)
-        }.build().toString()
     }
 
     companion object {