Merge branch 'master' into Streamingcommunity_fixx

lib/streamhidevid-extractor/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
 }
 
 dependencies {
+    implementation(project(":lib:playlist-utils"))
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
     }

lib/streamhidevid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhidevidextractor/StreamHideVidExtractor.kt

@@ -1,36 +1,25 @@
 package eu.kanade.tachiyomi.lib.streamhidevidextractor
 
 import dev.datlag.jsunpacker.JsUnpacker
-import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import okhttp3.OkHttpClient
 
 class StreamHideVidExtractor(private val client: OkHttpClient) {
-    // from nineanime / ask4movie FilemoonExtractor
-    private val subtitleRegex = Regex("""#EXT-X-MEDIA:TYPE=SUBTITLES.*?NAME="(.*?)".*?URI="(.*?)"""")
+
+    private val playlistUtils by lazy { PlaylistUtils(client) }
 
     fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
         val page = client.newCall(GET(url)).execute().body.string()
-        val unpacked = JsUnpacker.unpackAndCombine(page) ?: return emptyList()
-        val playlistUrl = unpacked.substringAfter("sources:")
+        val playlistUrl = (JsUnpacker.unpackAndCombine(page) ?: page)
+            .substringAfter("sources:")
             .substringAfter("file:\"") // StreamHide
             .substringAfter("src:\"") // StreamVid
             .substringBefore('"')
-
-        val playlistData = client.newCall(GET(playlistUrl)).execute().body.string()
-
-        val subs = subtitleRegex.findAll(playlistData).map {
-            val urlPart = it.groupValues[2]
-            val subUrl = when {
-                !urlPart.startsWith("https:") ->
-                    playlistUrl.substringBeforeLast("/") + "/$urlPart"
-                else -> urlPart
-            }
-            Track(subUrl, it.groupValues[1])
-        }.toList()
-
-        // The playlist usually only have one video quality.
-        return listOf(Video(playlistUrl, "${prefix}StreamHideVid", playlistUrl, subtitleTracks = subs))
+        if (!playlistUrl.startsWith("http")) return emptyList()
+        return playlistUtils.extractFromHls(playlistUrl,
+            videoNameGen = { "${prefix}StreamHideVid - $it" }
+        )
     }
 }

src/es/animefenix/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Animefenix'
     extClass = '.Animefenix'
-    extVersionCode = 35
+    extVersionCode = 36
 }
 
 apply from: "$rootDir/common.gradle"

src/es/asialiveaction/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'AsiaLiveAction'
     extClass = '.AsiaLiveAction'
-    extVersionCode = 27
+    extVersionCode = 28
 }
 
 apply from: "$rootDir/common.gradle"

src/es/doramasflix/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Doramasflix'
     extClass = '.Doramasflix'
-    extVersionCode = 17
+    extVersionCode = 18
 }
 
 apply from: "$rootDir/common.gradle"

src/es/gnula/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Gnula'
     extClass = '.Gnula'
-    extVersionCode = 15
+    extVersionCode = 16
 }
 
 apply from: "$rootDir/common.gradle"

src/es/hentaila/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiLA'
     extClass = '.Hentaila'
-    extVersionCode = 22
+    extVersionCode = 23
     isNsfw = true
 }
 

src/es/lacartoons/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'LACartoons'
     extClass = '.Lacartoons'
-    extVersionCode = 1
+    extVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"

src/es/locopelis/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'LocoPelis'
     extClass = '.LocoPelis'
-    extVersionCode = 21
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"

src/fr/frenchanime/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.FrenchAnime'
     themePkg = 'datalifeengine'
     baseUrl = 'https://french-anime.com'
-    overrideVersionCode = 5
+    overrideVersionCode = 6
 }
 
 apply from: "$rootDir/common.gradle"

src/fr/wiflix/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.Wiflix'
     themePkg = 'datalifeengine'
     baseUrl = 'https://wiflix.voto'
-    overrideVersionCode = 4
+    overrideVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"

src/pt/pifansubs/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.PiFansubs'
     themePkg = 'dooplay'
     baseUrl = 'https://pifansubs.club'
-    overrideVersionCode = 18
+    overrideVersionCode = 19
     isNsfw = true
 }