aniflix: add stape extractor

src/de/aniflix/build.gradle

@@ -6,7 +6,7 @@ ext {
     extName = 'Aniflix'
     pkgNameSuffix = 'de.aniflix'
     extClass = '.Aniflix'
-    extVersionCode = 5
+    extVersionCode = 6
     libVersion = '12'
 }
 

src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt

@@ -3,11 +3,14 @@ package eu.kanade.tachiyomi.animeextension.de.aniflix
 import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
+import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.de.aniflix.dto.AnimeDetailsDto
 import eu.kanade.tachiyomi.animeextension.de.aniflix.dto.AnimeDto
 import eu.kanade.tachiyomi.animeextension.de.aniflix.dto.Episode
 import eu.kanade.tachiyomi.animeextension.de.aniflix.dto.Release
+import eu.kanade.tachiyomi.animeextension.de.aniflix.extractors.DoodExtractor
+import eu.kanade.tachiyomi.animeextension.de.aniflix.extractors.StreamTapeExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
@@ -44,11 +47,6 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-
     private val json = Json {
         isLenient = true
         ignoreUnknownKeys = true
@@ -168,10 +166,20 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
         if (streams.isNullOrEmpty()) return emptyList()
         val videoList = mutableListOf<Video>()
         for (stream in streams) {
-            val quality = "${stream.hoster!!.name}, ${stream.lang!!}"
+            val quality = "${stream.hoster?.name}, ${stream.lang}"
-            if (stream.link!!.contains("https://dood")) {
+            val link = stream.link ?: return emptyList()
-                val tld = stream.link.substringAfter("https://dood.").substringBefore("/")
+            val hosterSelection = preferences.getStringSet("hoster_selection", null)
-                videoList.add(Video(stream.link, quality, null, null, doodHeaders(tld)))
+            when {
+                link.contains("https://dood") && hosterSelection?.contains("dood") == true -> {
+                    val video = DoodExtractor(client).videoFromUrl(link, quality)
+                    videoList.add(video)
+                }
+                link.contains("https://streamtape") && hosterSelection?.contains("stape") == true -> {
+                    val video = StreamTapeExtractor(client).videoFromUrl(link, quality)
+                    if (video != null) {
+                        videoList.add(video)
+                    }
+                }
             }
         }
         return videoList
@@ -208,41 +216,16 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
         return newList
     }
 
-    override fun videoUrlParse(response: Response): String {
+    override fun videoUrlParse(response: Response) = throw Exception("not used")
-        val url = response.request.url.toString()
-        if (url.contains("https://dood")) {
-            val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-            val content = response.body!!.string()
-            if (!content.contains("'/pass_md5/")) throw Exception("Error with doodstream mirror")
-            val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-            val token = md5.substringAfterLast("/")
-            val randomString = getRandomString()
-            val expiry = System.currentTimeMillis()
-            val videoUrlStart = client.newCall(
-                GET(
-                    "https://dood.$doodTld/pass_md5/$md5",
-                    Headers.headersOf("referer", url)
-                )
-            ).execute().body!!.string()
-            return "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        }
-        return response.request.url.toString()
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
 
+    @Suppress("UNCHECKED_CAST")
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         val hosterPref = ListPreference(screen.context).apply {
             key = "preferred_hoster"
             title = "Standard-Hoster"
-            entries = arrayOf("Doodstream")
+            entries = arrayOf("Streamtape", "Doodstream")
-            entryValues = arrayOf("https://dood")
+            entryValues = arrayOf("https://streamtape.com", "https://dood")
-            setDefaultValue("https://dood")
+            setDefaultValue("https://streamtape.com")
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -267,7 +250,19 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
                 preferences.edit().putString(key, entry).commit()
             }
         }
+        val subSelection = MultiSelectListPreference(screen.context).apply {
+            key = "hoster_selection"
+            title = "Hoster auswählen"
+            entries = arrayOf("Streamtape", "Doodstream")
+            entryValues = arrayOf("stape", "dood")
+            setDefaultValue(setOf("stape", "dood"))
+
+            setOnPreferenceChangeListener { _, newValue ->
+                preferences.edit().putStringSet(key, newValue as Set<String>).commit()
+            }
+        }
         screen.addPreference(subPref)
         screen.addPreference(hosterPref)
+        screen.addPreference(subSelection)
     }
 }

src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/DoodExtractor.kt

@@ -0,0 +1,40 @@
+package eu.kanade.tachiyomi.animeextension.de.aniflix.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class DoodExtractor(val client: OkHttpClient) {
+    fun videoFromUrl(url: String, quality: String): Video {
+        val response = client.newCall(GET(url)).execute()
+        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
+        val content = response.body!!.string()
+        if (!content.contains("'/pass_md5/")) throw Exception("Error with doodstream mirror")
+        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
+        val token = md5.substringAfterLast("/")
+        val randomString = getRandomString()
+        val expiry = System.currentTimeMillis()
+        val videoUrlStart = client.newCall(
+            GET(
+                "https://dood.$doodTld/pass_md5/$md5",
+                Headers.headersOf("referer", url)
+            )
+        ).execute().body!!.string()
+        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
+
+        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+    }
+
+    private fun getRandomString(length: Int = 10): String {
+        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
+        return (1..length)
+            .map { allowedChars.random() }
+            .joinToString("")
+    }
+
+    private fun doodHeaders(tld: String) = Headers.Builder().apply {
+        add("User-Agent", "Aniyomi")
+        add("Referer", "https://dood.$tld/")
+    }.build()
+}

src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamTapeExtractor.kt

@@ -0,0 +1,19 @@
+package eu.kanade.tachiyomi.animeextension.de.aniflix.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class StreamTapeExtractor(val client: OkHttpClient) {
+    fun videoFromUrl(url: String, quality: String): Video? {
+        val id = url.substringAfterLast("/")
+        val document = client.newCall(GET(url)).execute().asJsoup()
+        val script = document.select("script:containsData(document.getElementById('robotlink'))")
+            .firstOrNull()?.data()?.substringAfter("document.getElementById('robotlink').innerHTML = '")
+            ?: return null
+        val videoUrl = "https:" + script.substringBefore("'") +
+            script.substringAfter("+ ('xcd").substringBefore("'")
+        return Video(url, quality, videoUrl, null)
+    }
+}