From cd22cfa20e83b351d3c2d74402054174f16914fe Mon Sep 17 00:00:00 2001
From: Salman-Git-Hub <ali.salman.sa.01@gmail.com>
Date: Wed, 25 Oct 2023 19:08:51 +0545
Subject: [PATCH 1/5] fix filters data

---
 .../animeextension/en/animetake/AnimeTakeFilters.kt       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTakeFilters.kt b/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTakeFilters.kt
index d75f7587f1..bec06df344 100644
--- a/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTakeFilters.kt
+++ b/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTakeFilters.kt
@@ -101,14 +101,14 @@ object AnimeTakeFilters {
             Pair("Sci-Fi", "Sci-Fi"),
             Pair("Seinen", "Seinen"),
             Pair("Shoujo", "Shoujo"),
-            Pair("Shoujo+Ai", "Shoujo+Ai"),
+            Pair("Shoujo Ai", "Shoujo+Ai"),
             Pair("Shounen", "Shounen"),
-            Pair("Shounen+Ai", "Shounen+Ai"),
+            Pair("Shounen Ai", "Shounen+Ai"),
             Pair("Slice of Life", "Slice+of+Life"),
             Pair("Space", "Space"),
             Pair("Sports", "Sports"),
-            Pair("Strategy+Game", "Strategy+Game"),
-            Pair("Super+Power", "Super+Power"),
+            Pair("Strategy Game", "Strategy+Game"),
+            Pair("Super Power", "Super+Power"),
             Pair("Supernatural", "Supernatural"),
             Pair("Survival", "Survival"),
             Pair("Suspense", "Suspense"),

From 00cae54244b22ca88f2a74d506696f6a55972504 Mon Sep 17 00:00:00 2001
From: Salman-Git-Hub <ali.salman.sa.01@gmail.com>
Date: Wed, 25 Oct 2023 19:09:32 +0545
Subject: [PATCH 2/5] fix episodes

---
 .../animeextension/en/animetake/AnimeTake.kt  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt b/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt
index b01f81fea1..7eb192f429 100644
--- a/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt
+++ b/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt
@@ -119,22 +119,34 @@ class AnimeTake : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================== Episodes ==============================
-    override fun episodeListSelector() = "div#eps > div > a[href]"
+    override fun episodeListSelector() = "div.tab-content"
 
     override fun episodeListParse(response: Response): List<SEpisode> {
         val document = response.asJsoup()
         val episodesLink = document.select(episodeListSelector())
-        return episodesLink.map(::episodeFromElement).reversed()
+        val episodes = mutableListOf<SEpisode>()
+
+        val specialsDiv = episodesLink.select("div#specials")
+        if (specialsDiv.isNotEmpty()) {
+            episodes.addAll(specialsDiv.select("a[href]").map(::episodeFromElement).reversed())
+        }
+        episodes.addAll(
+            episodesLink.select("div#eps").select("a[href]")
+                .map(::episodeFromElement).reversed(),
+        )
+
+        return episodes.toList()
     }
 
     override fun episodeFromElement(element: Element): SEpisode {
         return SEpisode.create().apply {
             setUrlWithoutDomain(element.attr("href"))
-            val upDate = element.select("div.col-xs-12 > span.label").text()
+            val upDate = element.select("div.col-xs-12 > span.front_time").text().trim()
             date_upload = parseDate(upDate)
-            val epName = element.select("div.col-xs-12 > div.anime-title > b").text()
+            val epName = element.select("div.col-xs-12 > div.anime-title > b").text().trim()
+            val epNum = epName.split(" ").last()
             name = epName
-            episode_number = 0F
+            episode_number = epNum.toFloatOrNull() ?: 0F
         }
     }
 

From 4a969547ed93f3b44895592859140bca2586a560 Mon Sep 17 00:00:00 2001
From: Salman-Git-Hub <ali.salman.sa.01@gmail.com>
Date: Wed, 25 Oct 2023 19:09:56 +0545
Subject: [PATCH 3/5] remove Vidstreaming extractor

---
 .../extractors/VidstreamingExtractor.kt       | 135 ------------------
 1 file changed, 135 deletions(-)
 delete mode 100644 src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/extractors/VidstreamingExtractor.kt

diff --git a/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/extractors/VidstreamingExtractor.kt b/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/extractors/VidstreamingExtractor.kt
deleted file mode 100644
index 31a93865a3..0000000000
--- a/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/extractors/VidstreamingExtractor.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.animetake.extractors
-
-import android.util.Base64
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.jsonArray
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
-import uy.kohesive.injekt.injectLazy
-import java.util.Locale
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-@ExperimentalSerializationApi
-class VidstreamingExtractor(private val client: OkHttpClient) {
-
-    private val json: Json by injectLazy()
-
-    fun videosFromUrl(serverUrl: String, prefix: String): List<Video> {
-        try {
-            val document = client.newCall(GET(serverUrl)).execute().asJsoup()
-            val iv = document.select("div.wrapper")
-                .attr("class").substringAfter("container-")
-                .filter { it.isDigit() }.toByteArray()
-            val secretKey = document.select("body[class]")
-                .attr("class").substringAfter("container-")
-                .filter { it.isDigit() }.toByteArray()
-            val decryptionKey = document.select("div.videocontent")
-                .attr("class").substringAfter("videocontent-")
-                .filter { it.isDigit() }.toByteArray()
-            val encryptAjaxParams = cryptoHandler(
-                document.select("script[data-value]")
-                    .attr("data-value"),
-                iv,
-                secretKey,
-                false,
-            ).substringAfter("&")
-
-            val httpUrl = serverUrl.toHttpUrl()
-            val host = "https://" + httpUrl.host + "/"
-            val id = httpUrl.queryParameter("id") ?: throw Exception("error getting id")
-            val encryptedId = cryptoHandler(id, iv, secretKey)
-            val token = httpUrl.queryParameter("token")
-            val qualitySuffix =
-                if (token != null) " (Vid-mp4 - Gogostream)" else " (Vid-mp4 - Vidstreaming)"
-
-            val jsonResponse = client.newCall(
-                GET(
-                    "${host}encrypt-ajax.php?id=$encryptedId&$encryptAjaxParams&alias=$id",
-                    Headers.headersOf(
-                        "X-Requested-With",
-                        "XMLHttpRequest",
-                    ),
-                ),
-            ).execute().body.string()
-            val data =
-                json.decodeFromString<JsonObject>(jsonResponse)["data"]!!.jsonPrimitive.content
-            val decryptedData = cryptoHandler(data, iv, decryptionKey, false)
-            val videoList = mutableListOf<Video>()
-            val autoList = mutableListOf<Video>()
-            val array = json.decodeFromString<JsonObject>(decryptedData)["source"]!!.jsonArray
-            if (array.size == 1 && array[0].jsonObject["type"]!!.jsonPrimitive.content == "hls") {
-                val fileURL = array[0].jsonObject["file"].toString().trim('"')
-                val masterPlaylist = client.newCall(GET(fileURL)).execute().body.string()
-                masterPlaylist.substringAfter("#EXT-X-STREAM-INF:")
-                    .split("#EXT-X-STREAM-INF:").forEach {
-                        val quality = it.substringAfter("RESOLUTION=").substringAfter("x")
-                            .substringBefore(",").substringBefore("\n") + "p"
-                        var videoUrl = it.substringAfter("\n").substringBefore("\n")
-                        if (!videoUrl.startsWith("http")) {
-                            videoUrl = fileURL.substringBeforeLast("/") + "/$videoUrl"
-                        }
-                        videoList.add(Video(videoUrl, prefix + quality + qualitySuffix, videoUrl))
-                    }
-            } else {
-                array.forEach {
-                    val label = it.jsonObject["label"].toString().lowercase(Locale.ROOT)
-                        .trim('"').replace(" ", "")
-                    val fileURL = it.jsonObject["file"].toString().trim('"')
-                    val videoHeaders = Headers.headersOf("Referer", serverUrl)
-                    if (label == "auto") {
-                        autoList.add(
-                            Video(
-                                fileURL,
-                                label + qualitySuffix,
-                                fileURL,
-                                headers = videoHeaders,
-                            ),
-                        )
-                    } else {
-                        videoList.add(
-                            Video(
-                                fileURL,
-                                label + qualitySuffix,
-                                fileURL,
-                                headers = videoHeaders,
-                            ),
-                        )
-                    }
-                }
-            }
-            return videoList.sortedByDescending {
-                it.quality.substringBefore(qualitySuffix).substringBefore("p").toIntOrNull() ?: -1
-            } + autoList
-        } catch (e: Exception) {
-            return emptyList()
-        }
-    }
-
-    private fun cryptoHandler(
-        string: String,
-        iv: ByteArray,
-        secretKeyString: ByteArray,
-        encrypt: Boolean = true,
-    ): String {
-        val ivParameterSpec = IvParameterSpec(iv)
-        val secretKey = SecretKeySpec(secretKeyString, "AES")
-        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-        return if (!encrypt) {
-            cipher.init(Cipher.DECRYPT_MODE, secretKey, ivParameterSpec)
-            String(cipher.doFinal(Base64.decode(string, Base64.DEFAULT)))
-        } else {
-            cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivParameterSpec)
-            Base64.encodeToString(cipher.doFinal(string.toByteArray()), Base64.NO_WRAP)
-        }
-    }
-}

From d6e3a56b310ea132d0e9f5c1aa5d71d09fb99d1b Mon Sep 17 00:00:00 2001
From: Salman-Git-Hub <ali.salman.sa.01@gmail.com>
Date: Wed, 25 Oct 2023 19:11:07 +0545
Subject: [PATCH 4/5] migrate to GogoStreamExtractor

---
 src/en/animetake/build.gradle                               | 1 +
 .../tachiyomi/animeextension/en/animetake/AnimeTake.kt      | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/en/animetake/build.gradle b/src/en/animetake/build.gradle
index b7ce729314..f96bdd0bd5 100644
--- a/src/en/animetake/build.gradle
+++ b/src/en/animetake/build.gradle
@@ -13,6 +13,7 @@ dependencies {
     implementation(project(":lib-dood-extractor"))
     implementation(project(":lib-mp4upload-extractor"))
     implementation(project(":lib-filemoon-extractor"))
+    implementation(project(":lib-gogostream-extractor"))
 }
 
 apply from: "$rootDir/common.gradle"
\ No newline at end of file
diff --git a/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt b/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt
index 7eb192f429..a70d9e1a81 100644
--- a/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt
+++ b/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt
@@ -4,7 +4,6 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.en.animetake.extractors.VidstreamingExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.SAnime
@@ -13,6 +12,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.gogostreamextractor.GogoStreamExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
@@ -153,7 +153,7 @@ class AnimeTake : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     // ============================ Video Links =============================
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
-    private val vidstreamingExtractor by lazy { VidstreamingExtractor(client) }
+    private val gogoStreamExtractor by lazy { GogoStreamExtractor(client) }
     private val filemoonExtractor by lazy { FilemoonExtractor(client) }
 
     override fun videoListParse(response: Response): List<Video> {
@@ -181,7 +181,7 @@ class AnimeTake : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     private fun extractVideo(url: String): List<Video> {
-        val videos = vidstreamingExtractor.videosFromUrl(url, "Vidstreaming - ")
+        val videos = gogoStreamExtractor.videosFromUrl(url)
 
         val request = GET(url)
         val response = client.newCall(request).execute()

From 86e943cd74f1217b93f24f4c41ba9be0ae9b000d Mon Sep 17 00:00:00 2001
From: Salman-Git-Hub <ali.salman.sa.01@gmail.com>
Date: Wed, 25 Oct 2023 19:11:42 +0545
Subject: [PATCH 5/5] update extVersionCode

---
 src/en/animetake/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/en/animetake/build.gradle b/src/en/animetake/build.gradle
index f96bdd0bd5..cb43df015c 100644
--- a/src/en/animetake/build.gradle
+++ b/src/en/animetake/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'AnimeTake'
     pkgNameSuffix = 'en.animetake'
     extClass = '.AnimeTake'
-    extVersionCode = 1
+    extVersionCode = 2
     containsNsfw = false
 }