From b6b62b7e94a53300f323f7a783dc4ddce488a254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Pe=C3=B1a=20Y=20Lillo?=
 <80992641+Diegopyl1209@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:23:01 -0400
Subject: [PATCH] new server (FireLoad) and fixes [AnimeFenix] (#819)

---
 src/es/animefenix/build.gradle                |  2 +-
 .../es/animefenix/Animefenix.kt               | 65 +++++++++++--------
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/es/animefenix/build.gradle b/src/es/animefenix/build.gradle
index d076eca95..929d7cb3d 100644
--- a/src/es/animefenix/build.gradle
+++ b/src/es/animefenix/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Animefenix'
     pkgNameSuffix = 'es.animefenix'
     extClass = '.Animefenix'
-    extVersionCode = 4
+    extVersionCode = 5
     libVersion = '13'
 }
 
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
index ee51a0129..eae8a4bd4 100644
--- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
@@ -108,6 +108,14 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                         }
                     }
                 }
+                realUrl.contains("/stream/fl.php") -> {
+                    val video = realUrl.substringAfter("/stream/fl.php?v=")
+                    client.newCall(GET(video)).execute().code.let {
+                        if (it == 200) {
+                            videoList.add(Video(video, "FireLoad", video))
+                        }
+                    }
+                }
                 realUrl.contains("streamtape") -> {
                     val video = StreamTapeExtractor(client).videoFromUrl(realUrl, "Streamtape")
                     if (video != null) {
@@ -126,24 +134,6 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
-    override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", "Amazon")
-        if (quality != null) {
-            val newList = mutableListOf<Video>()
-            var preferred = 0
-            for (video in this) {
-                if (video.quality == quality) {
-                    newList.add(preferred, video)
-                    preferred++
-                } else {
-                    newList.add(video)
-                }
-            }
-            return newList
-        }
-        return this
-    }
-
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
         val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
@@ -185,13 +175,6 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun latestUpdatesSelector() = popularAnimeSelector()
 
-    private fun amazonExtractor(url: String): String {
-        val document = client.newCall(GET(url)).execute().asJsoup()
-        return document.selectFirst("script:containsData(sources: [)").data()
-            .substringAfter("[{\"file\":\"")
-            .substringBefore("\",").replace("\\", "")
-    }
-
     override fun getFilterList(): AnimeFilterList = AnimeFilterList(
         AnimeFilter.Header("La busqueda por texto ignora el filtro"),
         GenreFilter()
@@ -255,13 +238,31 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         fun toUriPart() = vals[state].second
     }
 
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString("preferred_quality", "Amazon")
+        if (quality != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality == quality) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
 
         val videoQualityPref = ListPreference(screen.context).apply {
             key = "preferred_quality"
-            title = "Preferred quality"
-            entries = arrayOf("Amazon", "Fembed:480p", "Fembed:720p", "Amazon", "AmazonES")
-            entryValues = arrayOf("Amazon")
+            title = "Servidor Preferido"
+            entries = arrayOf("Amazon", "Fembed:480p", "Fembed:720p", "Amazon", "AmazonES", "FireLoad")
+            entryValues = arrayOf("Amazon", "Fembed:480p", "Fembed:720p", "Amazon", "AmazonES", "FireLoad")
             setDefaultValue("Amazon")
             summary = "%s"
 
@@ -274,4 +275,12 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
         screen.addPreference(videoQualityPref)
     }
+
+    private fun amazonExtractor(url: String): String {
+        val document = client.newCall(GET(url)).execute().asJsoup()
+        val videoURl = document.selectFirst("script:containsData(sources: [)").data()
+            .substringAfter("[{\"file\":\"")
+            .substringBefore("\",").replace("\\", "")
+        return if (client.newCall(GET(videoURl)).execute().code == 200) videoURl else ""
+    }
 }