From 644f914ebab05586852385a3a980b16e5fce79ac Mon Sep 17 00:00:00 2001
From: Ahmed gamal <12355.ahmedgamal.com@gmail.com>
Date: Wed, 9 Feb 2022 21:20:39 +0200
Subject: [PATCH] faselhd: fix video extractor (#317)

* Update build.gradle

* faselhd: fix videos extractor

* Update FASELHD.kt
---
 src/ar/faselhd/build.gradle                   |  2 +-
 .../animeextension/ar/faselhd/FASELHD.kt      | 35 ++++++++++---------
 src/ar/faselhdmovies/build.gradle             |  2 +-
 .../ar/faselhdmovies/FASELHDMOVIES.kt         | 33 ++++++++---------
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/ar/faselhd/build.gradle b/src/ar/faselhd/build.gradle
index d03d9a99d..fc3a9b87d 100644
--- a/src/ar/faselhd/build.gradle
+++ b/src/ar/faselhd/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'فاصل اعلاني'
     pkgNameSuffix = 'ar.faselhd'
     extClass = '.FASELHD'
-    extVersionCode = 3
+    extVersionCode = 4
     libVersion = '12'
 }
 
diff --git a/src/ar/faselhd/src/eu/kanade/tachiyomi/animeextension/ar/faselhd/FASELHD.kt b/src/ar/faselhd/src/eu/kanade/tachiyomi/animeextension/ar/faselhd/FASELHD.kt
index be7abb2c1..d151620f8 100644
--- a/src/ar/faselhd/src/eu/kanade/tachiyomi/animeextension/ar/faselhd/FASELHD.kt
+++ b/src/ar/faselhd/src/eu/kanade/tachiyomi/animeextension/ar/faselhd/FASELHD.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.animeextension.ar.faselhd
 
 import android.app.Application
 import android.content.SharedPreferences
+import android.util.Log
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@@ -40,6 +41,11 @@ class FASELHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    override fun headersBuilder(): Headers.Builder {
+        return super.headersBuilder()
+            .add("Referer", "https://www.faselhd.top/")
+    }
+
     // Popular Anime
 
     override fun popularAnimeSelector(): String = "div#postList div.col-xl-2 a"
@@ -88,7 +94,7 @@ class FASELHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return episode
     }
 
-    // Video urls
+    // Video urls //test commit
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -97,26 +103,21 @@ class FASELHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val refererHeaders = Headers.headersOf("referer", referer)
         val iframeResponse = client.newCall(GET(iframe, refererHeaders))
             .execute().asJsoup()
-        return videosFromElement(iframeResponse.selectFirst(videoListSelector()))
+        return videosFromElement(iframeResponse.selectFirst(videoListSelector()), refererHeaders)
     }
 
-    override fun videoListSelector() = "script:containsData(quality)"
+    override fun videoListSelector() = "script:containsData(m3u8)"
 
-    private fun videosFromElement(element: Element): List<Video> {
-        val data = element.data().substringAfter("if (quality == \"auto\")").substringBefore(";")
-        val sources = data.split("link = ").drop(1)
+    private fun videosFromElement(element: Element, headers: Headers): List<Video> {
+        val masterUrl = element.data().substringAfter("setup({\"file\":\"").substringBefore("\"").replace("\\/", "/")
+        Log.i("lol", masterUrl)
+        val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()
+        Log.i("lol", "$masterPlaylist")
         val videoList = mutableListOf<Video>()
-        for (source in sources) {
-            val masterUrl = source.substringAfter("\"").substringBeforeLast("\";").replace("\\/", "/").replace("\"", "")
-            val masterPlaylist = client.newCall(GET(masterUrl)).execute().body!!.string()
-            val videoList = mutableListOf<Video>()
-            masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
-                val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
-                val videoUrl = masterUrl.substringBeforeLast("/") + "/" + it.substringAfter("\n").substringBefore("\n")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
-                // val video = Video(videoUrl, quality, videoUrl, null)
-            }
-            return videoList
+        masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
+            val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
+            val videoUrl = it.substringAfter("\n").substringBefore("\n").replace("https", "http")
+            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
         }
         return videoList
     }
diff --git a/src/ar/faselhdmovies/build.gradle b/src/ar/faselhdmovies/build.gradle
index 63403d5f2..cf9409c14 100644
--- a/src/ar/faselhdmovies/build.gradle
+++ b/src/ar/faselhdmovies/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'فاصل اعلاني افلام بس'
     pkgNameSuffix = 'ar.faselhdmovies'
     extClass = '.FASELHDMOVIES'
-    extVersionCode = 1
+    extVersionCode = 2
     libVersion = '12'
 }
 
diff --git a/src/ar/faselhdmovies/src/eu/kanade/tachiyomi/animeextension/ar/faselhdmovies/FASELHDMOVIES.kt b/src/ar/faselhdmovies/src/eu/kanade/tachiyomi/animeextension/ar/faselhdmovies/FASELHDMOVIES.kt
index 7ef5e53bd..eb1b18e50 100644
--- a/src/ar/faselhdmovies/src/eu/kanade/tachiyomi/animeextension/ar/faselhdmovies/FASELHDMOVIES.kt
+++ b/src/ar/faselhdmovies/src/eu/kanade/tachiyomi/animeextension/ar/faselhdmovies/FASELHDMOVIES.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.animeextension.ar.faselhdmovies
 
 import android.app.Application
 import android.content.SharedPreferences
+import android.util.Log
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@@ -40,6 +41,11 @@ class FASELHDMOVIES : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    override fun headersBuilder(): Headers.Builder {
+        return super.headersBuilder()
+            .add("Referer", "https://www.faselhd.top/")
+    }
+
     // Popular Anime
 
     override fun popularAnimeSelector(): String = "div#postList div.col-xl-2 a"
@@ -77,26 +83,21 @@ class FASELHDMOVIES : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val refererHeaders = Headers.headersOf("referer", referer)
         val iframeResponse = client.newCall(GET(iframe, refererHeaders))
             .execute().asJsoup()
-        return videosFromElement(iframeResponse.selectFirst(videoListSelector()))
+        return videosFromElement(iframeResponse.selectFirst(videoListSelector()), refererHeaders)
     }
 
-    override fun videoListSelector() = "script:containsData(quality)"
+    override fun videoListSelector() = "script:containsData(m3u8)"
 
-    private fun videosFromElement(element: Element): List<Video> {
-        val data = element.data().substringAfter("if (quality == \"auto\")").substringBefore(";")
-        val sources = data.split("link = ").drop(1)
+    private fun videosFromElement(element: Element, headers: Headers): List<Video> {
+        val masterUrl = element.data().substringAfter("setup({\"file\":\"").substringBefore("\"").replace("\\/", "/")
+        Log.i("lol", masterUrl)
+        val masterPlaylist = client.newCall(GET(masterUrl, headers)).execute().body!!.string()
+        Log.i("lol", "$masterPlaylist")
         val videoList = mutableListOf<Video>()
-        for (source in sources) {
-            val masterUrl = source.substringAfter("\"").substringBeforeLast("\";").replace("\\/", "/").replace("\"", "")
-            val masterPlaylist = client.newCall(GET(masterUrl)).execute().body!!.string()
-            val videoList = mutableListOf<Video>()
-            masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
-                val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
-                val videoUrl = masterUrl.substringBeforeLast("/") + "/" + it.substringAfter("\n").substringBefore("\n")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
-                // val video = Video(videoUrl, quality, videoUrl, null)
-            }
-            return videoList
+        masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
+            val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
+            val videoUrl = it.substringAfter("\n").substringBefore("\n").replace("https", "http")
+            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
         }
         return videoList
     }