fix streamtape hoster

DatL4g · Nov 27, 2023 · 9cffa39 · 9cffa39
1 parent abac0ae
commit 9cffa39
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts
@@ -55,7 +55,6 @@ kotlin {
                 implementation(libs.aboutlibraries.compose)
 
                 api(libs.kamel)
-                api(libs.napier)
                 api(libs.moko.resources.compose)
                 api(libs.blurhash)
 

diff --git a/model/build.gradle.kts b/model/build.gradle.kts
@@ -31,6 +31,7 @@ kotlin {
                 api(libs.serialization.json)
                 api(libs.coroutines)
                 api(libs.datetime)
+                api(libs.napier)
             }
         }
 

diff --git a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/Video.kt b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/Video.kt
@@ -6,7 +6,7 @@ import dev.datlag.burningseries.model.common.setFrom
 import dev.datlag.burningseries.model.common.suspendCatching
 import dev.datlag.burningseries.network.common.getSources
 import dev.datlag.burningseries.network.scraper.hoster.MixDrop
-import dev.datlag.burningseries.network.scraper.hoster.StreamTape
+import dev.datlag.burningseries.network.scraper.hoster.Streamtape
 import dev.datlag.jsunpacker.JsUnpacker
 import io.ktor.client.*
 import io.ktor.http.*
@@ -19,7 +19,7 @@ data object Video {
 
     private val MANIPULATION_LIST = setOf(
         MixDrop(),
-        StreamTape()
+        Streamtape()
     )
 
     suspend fun loadVideos(client: HttpClient, url: String): Stream? {

diff --git a/...ries/network/scraper/hoster/StreamTape.kt → ...ries/network/scraper/hoster/Streamtape.kt b/...ries/network/scraper/hoster/StreamTape.kt → ...ries/network/scraper/hoster/Streamtape.kt
@@ -2,9 +2,10 @@ package dev.datlag.burningseries.network.scraper.hoster
 
 import dev.datlag.burningseries.model.common.listFrom
 import dev.datlag.burningseries.network.scraper.Video
+import io.github.aakira.napier.Napier
 import ktsoup.KtSoupDocument
 
-class StreamTape : Manipulation {
+class Streamtape : Manipulation {
     override fun match(url: String): Boolean {
         return "(?://|\\.)(s(?:tr)?(?:eam|have)?(?:ta?p?e?|cloud|adblock(?:plus|er))\\.(?:com|cloud|net|pe|site|link|cc|online|fun|cash|to|xyz))/(?:e|v)/([0-9a-zA-Z]+)".toRegex().containsMatchIn(url)
     }
@@ -33,17 +34,23 @@ class StreamTape : Manipulation {
 
         val srcUrl = buildString {
             parts.forEach { part ->
-                val p1 = "\"([^\"]*)".toRegex().find(part)?.groupValues?.get(1)
-                var p2 = 0
+                val partValues = "[\"']?(\\S+)[\"']\\S*\\s*\\([\"'](\\S+)[\"']".toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE)).find(part)?.groupValues
+                Napier.e(partValues.toString())
+                val p1 = partValues?.get(1)
+                val p2 = partValues?.get(2)
+                var p3 = 0
                 if (part.contains("substring")) {
-                    "substring\\((\\d+)".toRegex(RegexOption.IGNORE_CASE).findAll(part).forEach { result ->
+                    "substring\\((\\d+)".toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE)).findAll(part).forEach { result ->
                         result.groupValues.getOrNull(1)?.trim()?.toIntOrNull()?.let {
-                            p2 += it
+                            p3 += it
                         }
                     }
                 }
                 p1?.let {
-                    append(it.substring(p2))
+                    append(it)
+                }
+                p2?.let {
+                    append(it.substring(p3))
                 }
             }
             append("&stream=1")