From 5bc10f3b8b0810f7370700e12e8c6f9e63a6c2a2 Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Mon, 17 Jul 2023 00:12:50 +0000
Subject: [PATCH] refactor: Make extensions use Streamlare lib (#1913)

---
 .../dooplay/cinemathek/additional.gradle      |  1 +
 .../dooplay/cinemathek/src/Cinemathek.kt      |  2 +-
 .../src/extractors/StreamlareExtractor.kt     | 50 -----------------
 .../dooplay/cinevision/additional.gradle      |  1 +
 .../dooplay/cinevision/src/CineVision.kt      |  4 +-
 .../src/extractors/StreamlareExtractor.kt     | 26 ---------
 .../dooplay/multimovies/additional.gradle     |  1 +
 .../dooplay/multimovies/src/Multimovies.kt    |  6 +-
 .../src/extractors/AutoEmbedExtractor.kt      |  1 +
 .../src/extractors/StreamlareExtractor.kt     | 50 -----------------
 src/de/aniflix/build.gradle                   |  1 +
 .../animeextension/de/aniflix/Aniflix.kt      |  4 +-
 .../aniflix/extractors/StreamlareExtractor.kt | 34 -----------
 src/en/allanime/build.gradle                  |  1 +
 .../animeextension/en/allanime/AllAnime.kt    |  2 +-
 .../extractors/StreamlareExtractor.kt         | 46 ---------------
 src/es/pelisplushd/build.gradle               |  1 +
 .../es/pelisplushd/Pelisplushd.kt             |  4 +-
 .../es/pelisplushd/Pelisplusph.kt             |  4 +-
 .../es/pelisplushd/Pelisplusto.kt             |  4 +-
 .../extractors/StreamlareExtractor.kt         | 56 -------------------
 src/id/kuronime/build.gradle                  |  1 +
 .../animeextension/id/kuronime/Kuronime.kt    |  4 +-
 .../extractors/StreamlareExtractor.kt         | 31 ----------
 24 files changed, 26 insertions(+), 309 deletions(-)
 delete mode 100644 multisrc/overrides/dooplay/cinemathek/src/extractors/StreamlareExtractor.kt
 delete mode 100644 multisrc/overrides/dooplay/cinevision/src/extractors/StreamlareExtractor.kt
 delete mode 100644 multisrc/overrides/dooplay/multimovies/src/extractors/StreamlareExtractor.kt
 delete mode 100644 src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamlareExtractor.kt
 delete mode 100644 src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/extractors/StreamlareExtractor.kt
 delete mode 100644 src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamlareExtractor.kt
 delete mode 100644 src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/extractors/StreamlareExtractor.kt

diff --git a/multisrc/overrides/dooplay/cinemathek/additional.gradle b/multisrc/overrides/dooplay/cinemathek/additional.gradle
index 99bb3fb33..9769c8bac 100644
--- a/multisrc/overrides/dooplay/cinemathek/additional.gradle
+++ b/multisrc/overrides/dooplay/cinemathek/additional.gradle
@@ -1,5 +1,6 @@
 dependencies {
     implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib-streamlare-extractor'))
     implementation(project(':lib-streamsb-extractor'))
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1")
 }
diff --git a/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt b/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt
index 9b2af2d4a..76840db1f 100644
--- a/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt
+++ b/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt
@@ -5,9 +5,9 @@ import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.de.cinemathek.extractors.FilemoonExtractor
 import eu.kanade.tachiyomi.animeextension.de.cinemathek.extractors.StreamHideExtractor
-import eu.kanade.tachiyomi.animeextension.de.cinemathek.extractors.StreamlareExtractor
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
diff --git a/multisrc/overrides/dooplay/cinemathek/src/extractors/StreamlareExtractor.kt b/multisrc/overrides/dooplay/cinemathek/src/extractors/StreamlareExtractor.kt
deleted file mode 100644
index 62c5fd937..000000000
--- a/multisrc/overrides/dooplay/cinemathek/src/extractors/StreamlareExtractor.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.cinemathek.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.RequestBody.Companion.toRequestBody
-
-class StreamlareExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String): List<Video> {
-        val id = url.split("/").last()
-        val playlist = client.newCall(
-            POST(
-                "https://slwatch.co/api/video/stream/get",
-                body = "{\"id\":\"$id\"}"
-                    .toRequestBody("application/json".toMediaType()),
-            ),
-        ).execute().body.string()
-
-        val type = playlist.substringAfter("\"type\":\"").substringBefore("\"")
-        return if (type == "hls") {
-            val masterPlaylistUrl = playlist.substringAfter("\"file\":\"").substringBefore("\"").replace("\\/", "/")
-            val masterPlaylist = client.newCall(GET(masterPlaylistUrl)).execute().body.string()
-
-            val separator = "#EXT-X-STREAM-INF"
-            masterPlaylist.substringAfter(separator).split(separator).map {
-                val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
-                val videoUrl = it.substringAfter("\n").substringBefore("\n").let { urlPart ->
-                    when {
-                        !urlPart.startsWith("http") ->
-                            masterPlaylistUrl.substringBefore("master.m3u8") + urlPart
-                        else -> urlPart
-                    }
-                }
-                Video(videoUrl, "Streamlare:$quality", videoUrl)
-            }
-        } else {
-            val separator = "\"label\":\""
-            playlist.substringAfter(separator).split(separator).map {
-                val quality = it.substringAfter(separator).substringBefore("\",") + " (Sl-mp4)"
-                val apiUrl = it.substringAfter("\"file\":\"").substringBefore("\",")
-                    .replace("\\", "")
-                val response = client.newCall(POST(apiUrl)).execute()
-                val videoUrl = response.request.url.toString()
-                Video(videoUrl, "Streamlare:$quality", videoUrl)
-            }
-        }
-    }
-}
diff --git a/multisrc/overrides/dooplay/cinevision/additional.gradle b/multisrc/overrides/dooplay/cinevision/additional.gradle
index e3812495b..45fea9bab 100644
--- a/multisrc/overrides/dooplay/cinevision/additional.gradle
+++ b/multisrc/overrides/dooplay/cinevision/additional.gradle
@@ -1,3 +1,4 @@
 dependencies {
+    implementation(project(":lib-streamlare-extractor"))
     implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1")
 }
diff --git a/multisrc/overrides/dooplay/cinevision/src/CineVision.kt b/multisrc/overrides/dooplay/cinevision/src/CineVision.kt
index 56e1e6599..8a8164df8 100644
--- a/multisrc/overrides/dooplay/cinevision/src/CineVision.kt
+++ b/multisrc/overrides/dooplay/cinevision/src/CineVision.kt
@@ -1,9 +1,9 @@
 package eu.kanade.tachiyomi.animeextension.pt.cinevision
 
 import eu.kanade.tachiyomi.animeextension.pt.cinevision.extractors.EmbedflixExtractor
-import eu.kanade.tachiyomi.animeextension.pt.cinevision.extractors.StreamlareExtractor
 import eu.kanade.tachiyomi.animeextension.pt.cinevision.extractors.VidmolyExtractor
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
@@ -39,7 +39,7 @@ class CineVision : DooPlay(
             "vidmoly.to" in url ->
                 VidmolyExtractor(client).getVideoList(url, name)
             "streamlare.com" in url ->
-                StreamlareExtractor(client).videosFromUrl(url, name)
+                StreamlareExtractor(client).videosFromUrl(url, name + " -")
             "embedflix.in" in url ->
                 EmbedflixExtractor(client).videosFromUrl(url)
             else -> emptyList<Video>()
diff --git a/multisrc/overrides/dooplay/cinevision/src/extractors/StreamlareExtractor.kt b/multisrc/overrides/dooplay/cinevision/src/extractors/StreamlareExtractor.kt
deleted file mode 100644
index 233475230..000000000
--- a/multisrc/overrides/dooplay/cinevision/src/extractors/StreamlareExtractor.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.cinevision.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.POST
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.RequestBody.Companion.toRequestBody
-
-class StreamlareExtractor(private val client: OkHttpClient) {
-
-    fun videosFromUrl(url: String, name: String): List<Video> {
-        val id = url.substringAfter("/e/").substringBefore("/")
-        val body = "{\"id\":\"$id\"}".toRequestBody("application/json".toMediaType())
-        val playlist = client.newCall(
-            POST("https://sltube.org/api/video/stream/get", body = body),
-        ).execute().use { it.body.string() }
-        val separator = "\"label\":\""
-        return playlist.substringAfter(separator).split(separator).map {
-            val quality = "$name - " + it.substringAfter(separator).substringBefore("\",")
-            val videoUrl = it.substringAfter("file\":\"").substringBefore("\",")
-                .replace("\\", "")
-
-            Video(videoUrl, quality, videoUrl)
-        }
-    }
-}
diff --git a/multisrc/overrides/dooplay/multimovies/additional.gradle b/multisrc/overrides/dooplay/multimovies/additional.gradle
index 19ced95f5..a75ef9fce 100644
--- a/multisrc/overrides/dooplay/multimovies/additional.gradle
+++ b/multisrc/overrides/dooplay/multimovies/additional.gradle
@@ -1,4 +1,5 @@
 dependencies {
+    implementation(project(':lib-streamlare-extractor'))
     implementation(project(':lib-streamsb-extractor'))
     implementation(project(':lib-voe-extractor'))
     implementation(project(':lib-dood-extractor'))
diff --git a/multisrc/overrides/dooplay/multimovies/src/Multimovies.kt b/multisrc/overrides/dooplay/multimovies/src/Multimovies.kt
index f9653d793..8a1540ffc 100644
--- a/multisrc/overrides/dooplay/multimovies/src/Multimovies.kt
+++ b/multisrc/overrides/dooplay/multimovies/src/Multimovies.kt
@@ -12,6 +12,7 @@ import eu.kanade.tachiyomi.animeextension.en.multimovies.extractors.MultimoviesC
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
@@ -106,6 +107,7 @@ class Multimovies : DooPlay(
                     .build()
                 AutoEmbedExtractor(client).videosFromUrl(url, headers = newHeaders)
             }
+            url.contains("streamlare.com") -> StreamlareExtractor(client).videosFromUrl(url)
             else -> emptyList()
         }
     }
@@ -160,12 +162,12 @@ class Multimovies : DooPlay(
     }
 
     // ============================== Filters ===============================
-	
+
     override fun getFilterList() = getMultimoviesFilterList()
     override val fetchGenres = false
 
     // =============================== Latest ===============================
-	
+
     override fun latestUpdatesNextPageSelector() = "div.pagination > *:last-child:not(span):not(.current)"
 
     // ============================== Settings ==============================
diff --git a/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt b/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt
index 4f53de697..159547b3e 100644
--- a/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt
+++ b/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt
@@ -684,6 +684,7 @@ import app.cash.quickjs.QuickJs
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
diff --git a/multisrc/overrides/dooplay/multimovies/src/extractors/StreamlareExtractor.kt b/multisrc/overrides/dooplay/multimovies/src/extractors/StreamlareExtractor.kt
deleted file mode 100644
index a33c73da7..000000000
--- a/multisrc/overrides/dooplay/multimovies/src/extractors/StreamlareExtractor.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.multimovies.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.RequestBody.Companion.toRequestBody
-
-class StreamlareExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, prefix: String): List<Video> {
-        val id = url.split("/").last()
-        val playlist = client.newCall(
-            POST(
-                "https://slwatch.co/api/video/stream/get",
-                body = "{\"id\":\"$id\"}"
-                    .toRequestBody("application/json".toMediaType()),
-            ),
-        ).execute().body.string()
-
-        val type = playlist.substringAfter("\"type\":\"").substringBefore("\"")
-        return if (type == "hls") {
-            val masterPlaylistUrl = playlist.substringAfter("\"file\":\"").substringBefore("\"").replace("\\/", "/")
-            val masterPlaylist = client.newCall(GET(masterPlaylistUrl)).execute().body.string()
-
-            val separator = "#EXT-X-STREAM-INF"
-            masterPlaylist.substringAfter(separator).split(separator).map {
-                val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
-                val videoUrl = it.substringAfter("\n").substringBefore("\n").let { urlPart ->
-                    when {
-                        !urlPart.startsWith("http") ->
-                            masterPlaylistUrl.substringBefore("master.m3u8") + urlPart
-                        else -> urlPart
-                    }
-                }
-                Video(videoUrl, "$prefix $quality (Streamlare)", videoUrl)
-            }
-        } else {
-            val separator = "\"label\":\""
-            playlist.substringAfter(separator).split(separator).map {
-                val quality = it.substringAfter(separator).substringBefore("\",") + " (Sl-mp4)"
-                val apiUrl = it.substringAfter("\"file\":\"").substringBefore("\",")
-                    .replace("\\", "")
-                val response = client.newCall(POST(apiUrl)).execute()
-                val videoUrl = response.request.url.toString()
-                Video(videoUrl, "$prefix $quality (Streamlare)", videoUrl)
-            }
-        }
-    }
-}
diff --git a/src/de/aniflix/build.gradle b/src/de/aniflix/build.gradle
index 45dc2b5c2..964b20c6d 100644
--- a/src/de/aniflix/build.gradle
+++ b/src/de/aniflix/build.gradle
@@ -11,6 +11,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-streamlare-extractor'))
     implementation(project(':lib-voe-extractor'))
     implementation(project(':lib-streamtape-extractor'))
     implementation(project(':lib-dood-extractor'))
diff --git a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
index 659b8d6da..4c98f48e2 100644
--- a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
+++ b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
@@ -10,7 +10,6 @@ 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.dto.Season
-import eu.kanade.tachiyomi.animeextension.de.aniflix.extractors.StreamlareExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
@@ -19,6 +18,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -216,7 +216,7 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
                     }
                 }
                 link.contains("https://streamlare") && hosterSelection?.contains("slare") == true -> {
-                    videoList.addAll(StreamlareExtractor(client).videosFromUrl(link, stream))
+                    videoList.addAll(StreamlareExtractor(client).videosFromUrl(link, suffix = stream.lang ?: "Unknown language"))
                 }
             }
         }
diff --git a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamlareExtractor.kt b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamlareExtractor.kt
deleted file mode 100644
index b60e2d8b3..000000000
--- a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamlareExtractor.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.aniflix.extractors
-
-import eu.kanade.tachiyomi.animeextension.de.aniflix.dto.Stream
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.POST
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.RequestBody.Companion.toRequestBody
-
-class StreamlareExtractor(private val client: OkHttpClient) {
-
-    fun videosFromUrl(url: String, stream: Stream): List<Video> {
-        val id = url.split("/").last()
-        val videoList = mutableListOf<Video>()
-        val playlist = client.newCall(
-            POST(
-                "https://slwatch.co/api/video/stream/get",
-                body = "{\"id\":\"$id\"}"
-                    .toRequestBody("application/json".toMediaType()),
-            ),
-        )
-            .execute().body.string()
-
-        playlist.substringAfter("\"label\":\"").split("\"label\":\"").forEach {
-            val quality = it.substringAfter("\"label\":\"").substringBefore("\",") + ", ${stream.lang}"
-            val token = it.substringAfter("\"file\":\"https:\\/\\/larecontent.com\\/video?token=")
-                .substringBefore("\",")
-            val response = client.newCall(POST("https://larecontent.com/video?token=$token")).execute()
-            val videoUrl = response.request.url.toString()
-            videoList.addAll((listOf(Video(videoUrl, quality, videoUrl))))
-        }
-        return videoList
-    }
-}
diff --git a/src/en/allanime/build.gradle b/src/en/allanime/build.gradle
index 86cf89dcf..ad2fcf458 100644
--- a/src/en/allanime/build.gradle
+++ b/src/en/allanime/build.gradle
@@ -11,6 +11,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-streamlare-extractor'))
     implementation(project(':lib-mp4upload-extractor'))
     implementation(project(':lib-streamsb-extractor'))
     implementation(project(':lib-dood-extractor'))
diff --git a/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt b/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt
index caf3bd725..c4f0f05fa 100644
--- a/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt
+++ b/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt
@@ -6,7 +6,6 @@ import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.en.allanime.extractors.AllAnimeExtractor
-import eu.kanade.tachiyomi.animeextension.en.allanime.extractors.StreamlareExtractor
 import eu.kanade.tachiyomi.animeextension.en.allanime.extractors.VidstreamingExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -18,6 +17,7 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
diff --git a/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/extractors/StreamlareExtractor.kt b/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/extractors/StreamlareExtractor.kt
deleted file mode 100644
index f7c6a7098..000000000
--- a/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/extractors/StreamlareExtractor.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.allanime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.RequestBody.Companion.toRequestBody
-
-class StreamlareExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String): List<Video> {
-        val id = url.split("/").last()
-        val videoList = mutableListOf<Video>()
-        val playlist = client.newCall(
-            POST(
-                "https://slwatch.co/api/video/stream/get",
-                body = "{\"id\":\"$id\"}"
-                    .toRequestBody("application/json".toMediaType()),
-            ),
-        ).execute().body.string()
-
-        val type = playlist.substringAfter("\"type\":\"").substringBefore("\"")
-        if (type == "hls") {
-            val masterPlaylistUrl = playlist.substringAfter("\"file\":\"").substringBefore("\"").replace("\\/", "/")
-            val masterPlaylist = client.newCall(GET(masterPlaylistUrl)).execute().body.string()
-
-            val separator = "#EXT-X-STREAM-INF"
-            masterPlaylist.substringAfter(separator).split(separator).map {
-                val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore("\n").substringBefore(",") + "p"
-                var videoUrl = it.substringAfter("\n").substringBefore("\n")
-                if (!videoUrl.startsWith("http")) videoUrl = "${masterPlaylistUrl.substringBefore("master.m3u8")}$videoUrl"
-                videoList.add(Video(videoUrl, "$quality (Streamlare)", videoUrl))
-            }
-        } else {
-            playlist.substringAfter("\"label\":\"").split("\"label\":\"").forEach {
-                val quality = it.substringAfter("\"label\":\"").substringBefore("\",") + " (Sl-mp4)"
-                val token = it.substringAfter("\"file\":\"https:\\/\\/larecontent.com\\/video?token=")
-                    .substringBefore("\",")
-                val response = client.newCall(POST("https://larecontent.com/video?token=$token")).execute()
-                val videoUrl = response.request.url.toString()
-                videoList.add(Video(videoUrl, "$quality (Streamlare)", videoUrl))
-            }
-        }
-        return videoList
-    }
-}
diff --git a/src/es/pelisplushd/build.gradle b/src/es/pelisplushd/build.gradle
index 109247ac6..ea203b08b 100644
--- a/src/es/pelisplushd/build.gradle
+++ b/src/es/pelisplushd/build.gradle
@@ -10,6 +10,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-streamlare-extractor'))
     implementation(project(':lib-yourupload-extractor'))
     implementation(project(':lib-streamtape-extractor'))
     implementation(project(':lib-streamsb-extractor'))
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
index 6422be5dd..e0e2c0035 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import android.util.Base64
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.StreamlareExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -14,6 +13,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 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.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
@@ -189,7 +189,7 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
             } else if (server.lowercase() == "voex") {
                 VoeExtractor(client).videoFromUrl(url, "Voex")?.let { videoList.add(it) }
             } else if (server.lowercase() == "streamlare") {
-                StreamlareExtractor(client).videosFromUrl(url)?.let { videoList.add(it) }
+                videoList.addAll(StreamlareExtractor(client).videosFromUrl(url))
             } else if (server.lowercase() == "doodstream") {
                 val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
                 DoodExtractor(client).videoFromUrl(url2, "DoodStream", false)?.let { videoList.add(it) }
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
index 01a5f0447..b9a99c308 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.animeextension.es.pelisplushd
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.FilemoonExtractor
-import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.StreamlareExtractor
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.SAnime
@@ -11,6 +10,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
@@ -189,7 +189,7 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
             }
         }
         if (embedUrl.contains("streamlare")) {
-            StreamlareExtractor(client).videosFromUrl(url)?.let { videoList.add(it) }
+            videoList.addAll(StreamlareExtractor(client).videosFromUrl(url))
         }
         return videoList
     }
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt
index 46beedf16..a1ee02487 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt
@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.animeextension.es.pelisplushd
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.FilemoonExtractor
-import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.StreamlareExtractor
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.SAnime
@@ -11,6 +10,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
@@ -184,7 +184,7 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
             }
         }
         if (embedUrl.contains("streamlare")) {
-            StreamlareExtractor(client).videosFromUrl(url)?.let { videoList.add(it) }
+            videoList.addAll(StreamlareExtractor(client).videosFromUrl(url))
         }
         return videoList
     }
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamlareExtractor.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamlareExtractor.kt
deleted file mode 100644
index 4e411fb5d..000000000
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamlareExtractor.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.jsonObject
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-import uy.kohesive.injekt.injectLazy
-
-class StreamlareExtractor(private val client: OkHttpClient) {
-    private val json: Json by injectLazy()
-    fun videosFromUrl(url: String): Video? {
-        val id = url.substringAfter("/e/").substringBefore("?poster")
-        val videoUrlResponse =
-            client.newCall(POST("https://slwatch.co/api/video/stream/get?id=$id")).execute()
-                .asJsoup()
-        json.decodeFromString<JsonObject>(
-            videoUrlResponse.select("body").text(),
-        )["result"]?.jsonObject?.forEach { quality ->
-            if (quality.toString().contains("file=\"")) {
-                val videoUrl = quality.toString().substringAfter("file=\"").substringBefore("\"").trim()
-                val type = if (videoUrl.contains(".m3u8")) "HSL" else "MP4"
-                val headers = Headers.Builder()
-                    .add("authority", videoUrl.substringBefore("/hls").substringBefore("/mp4"))
-                    .add("origin", "https://slwatch.co")
-                    .add("referer", "https://slwatch.co/e/" + url.substringAfter("/e/"))
-                    .add(
-                        "sec-ch-ua",
-                        "\"Not?A_Brand\";v=\"8\", \"Chromium\";v=\"108\", \"Google Chrome\";v=\"108\"",
-                    )
-                    .add("sec-ch-ua-mobile", "?0")
-                    .add("sec-ch-ua-platform", "\"Windows\"")
-                    .add("sec-fetch-dest", "empty")
-                    .add("sec-fetch-mode", "cors")
-                    .add("sec-fetch-site", "cross-site")
-                    .add(
-                        "user-agent",
-                        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/),108.0.0.0 Safari/537.36",
-                    )
-                    .add("Accept-Encoding", "gzip, deflate, br")
-                    .add("accept", "*/*")
-                    .add(
-                        "accept-language",
-                        "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7,zh-TW;q=0.6,zh-CN;q=0.5,zh;q=0.4",
-                    )
-                    .build()
-                return Video(videoUrl, "Streamlare:$type", videoUrl, headers = headers)
-            }
-        }
-        return null
-    }
-}
diff --git a/src/id/kuronime/build.gradle b/src/id/kuronime/build.gradle
index 04f0a198b..d59be40a0 100644
--- a/src/id/kuronime/build.gradle
+++ b/src/id/kuronime/build.gradle
@@ -11,6 +11,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-streamlare-extractor'))
     implementation(project(':lib-mp4upload-extractor'))
     implementation(project(':lib-yourupload-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
diff --git a/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/Kuronime.kt b/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/Kuronime.kt
index 61cf0f4e8..8a993e642 100644
--- a/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/Kuronime.kt
+++ b/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/Kuronime.kt
@@ -9,7 +9,6 @@ import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.id.kuronime.extractors.AnimekuExtractor
 import eu.kanade.tachiyomi.animeextension.id.kuronime.extractors.HxFileExtractor
 import eu.kanade.tachiyomi.animeextension.id.kuronime.extractors.LinkBoxExtractor
-import eu.kanade.tachiyomi.animeextension.id.kuronime.extractors.StreamlareExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.SAnime
@@ -17,6 +16,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
@@ -151,7 +151,7 @@ class Kuronime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     videoList.addAll(YourUploadExtractor(client).videoFromUrl(decoded, headers, opt.text(), "Original - "))
                 }
                 hosterSelection.contains("streamlare") && decoded.contains("streamlare.com") -> {
-                    videoList.addAll(StreamlareExtractor(client).videosFromUrl(decoded, opt.text()))
+                    videoList.addAll(StreamlareExtractor(client).videosFromUrl(decoded, suffix = "- " + opt.text()))
                 }
                 hosterSelection.contains("hxfile") && decoded.contains("hxfile.co") -> {
                     videoList.addAll(HxFileExtractor(client).getVideoFromUrl(decoded, opt.text()))
diff --git a/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/extractors/StreamlareExtractor.kt b/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/extractors/StreamlareExtractor.kt
deleted file mode 100644
index 2c8361fad..000000000
--- a/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/extractors/StreamlareExtractor.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.id.kuronime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.POST
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.RequestBody.Companion.toRequestBody
-
-class StreamlareExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, name: String): List<Video> {
-        val id = url.split("/").last()
-        val videoList = mutableListOf<Video>()
-        val playlist = client.newCall(
-            POST(
-                "https://slwatch.co/api/video/stream/get",
-                body = "{\"id\":\"$id\"}"
-                    .toRequestBody("application/json".toMediaType()),
-            ),
-        ).execute().body.string()
-
-        playlist.substringAfter("\"label\":\"").split("\"label\":\"").forEach {
-            val quality = it.substringAfter("\"label\":\"").substringBefore("\",") + " - $name"
-            val token = it.substringAfter("\"file\":\"https:\\/\\/larecontent.com\\/video?token=")
-                .substringBefore("\",")
-            val response = client.newCall(POST("https://larecontent.com/video?token=$token")).execute()
-            val videoUrl = response.request.url.toString()
-            videoList.add(Video(videoUrl, quality, videoUrl))
-        }
-        return videoList
-    }
-}