From 113fecaa249deb2af7661d3dff9735912dfe58c9 Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Sun, 10 Sep 2023 12:48:07 -0300
Subject: [PATCH] refactor: Make extensions use the blogger-extractor lib
 (#2174)

---
 .../dooplay/animeplayer/additional.gradle     |  3 ++
 .../dooplay/animeplayer/src/AnimePlayer.kt    |  2 +-
 .../src/extractors/BloggerExtractor.kt        | 26 -------------
 .../dooplay/animesgratis/additional.gradle    |  1 +
 .../dooplay/animesgratis/src/AnimesOnline.kt  |  2 +-
 .../src/extractors/BloggerExtractor.kt        | 28 --------------
 .../dooplay/animesync/additional.gradle       |  3 ++
 .../dooplay/animesync/src/AnimeSync.kt        |  2 +-
 .../src/extractors/BloggerExtractor.kt        | 26 -------------
 src/id/neonime/build.gradle                   |  1 +
 .../animeextension/id/neonime/NeoNime.kt      |  4 +-
 .../id/neonime/extractors/BloggerExtractor.kt | 38 -------------------
 src/pt/animesgames/build.gradle               |  4 ++
 .../pt/animesgames/AnimesGames.kt             |  2 +-
 .../extractors/BloggerExtractor.kt            | 28 --------------
 src/pt/hentaistube/build.gradle               |  4 ++
 .../pt/hentaistube/HentaisTube.kt             |  2 +-
 .../extractors/BloggerExtractor.kt            | 28 --------------
 18 files changed, 23 insertions(+), 181 deletions(-)
 create mode 100644 multisrc/overrides/dooplay/animeplayer/additional.gradle
 delete mode 100644 multisrc/overrides/dooplay/animeplayer/src/extractors/BloggerExtractor.kt
 delete mode 100644 multisrc/overrides/dooplay/animesgratis/src/extractors/BloggerExtractor.kt
 create mode 100644 multisrc/overrides/dooplay/animesync/additional.gradle
 delete mode 100644 multisrc/overrides/dooplay/animesync/src/extractors/BloggerExtractor.kt
 delete mode 100644 src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/extractors/BloggerExtractor.kt
 delete mode 100644 src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/extractors/BloggerExtractor.kt
 delete mode 100644 src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/extractors/BloggerExtractor.kt

diff --git a/multisrc/overrides/dooplay/animeplayer/additional.gradle b/multisrc/overrides/dooplay/animeplayer/additional.gradle
new file mode 100644
index 000000000..acd2339af
--- /dev/null
+++ b/multisrc/overrides/dooplay/animeplayer/additional.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    implementation(project(":lib-blogger-extractor"))
+}
diff --git a/multisrc/overrides/dooplay/animeplayer/src/AnimePlayer.kt b/multisrc/overrides/dooplay/animeplayer/src/AnimePlayer.kt
index 4d32be08a..c13bd6a6f 100644
--- a/multisrc/overrides/dooplay/animeplayer/src/AnimePlayer.kt
+++ b/multisrc/overrides/dooplay/animeplayer/src/AnimePlayer.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.animeextension.pt.animeplayer
 
-import eu.kanade.tachiyomi.animeextension.pt.animeplayer.extractors.BloggerExtractor
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.bloggerextractor.BloggerExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
diff --git a/multisrc/overrides/dooplay/animeplayer/src/extractors/BloggerExtractor.kt b/multisrc/overrides/dooplay/animeplayer/src/extractors/BloggerExtractor.kt
deleted file mode 100644
index 732fa49cd..000000000
--- a/multisrc/overrides/dooplay/animeplayer/src/extractors/BloggerExtractor.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.animeplayer.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class BloggerExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, headers: Headers): List<Video> {
-        return client.newCall(GET(url)).execute()
-            .use { it.body.string() }
-            .substringAfter("\"streams\":[")
-            .substringBefore("]")
-            .split("},")
-            .map {
-                val videoUrl = it.substringAfter("{\"play_url\":\"").substringBefore('"')
-                val format = it.substringAfter("\"format_id\":").substringBefore("}")
-                val quality = when (format) {
-                    "18" -> "360p"
-                    "22" -> "720p"
-                    else -> "Unknown"
-                }
-                Video(videoUrl, quality, videoUrl, headers = headers)
-            }
-    }
-}
diff --git a/multisrc/overrides/dooplay/animesgratis/additional.gradle b/multisrc/overrides/dooplay/animesgratis/additional.gradle
index 8bd0e1767..5242b8c4f 100644
--- a/multisrc/overrides/dooplay/animesgratis/additional.gradle
+++ b/multisrc/overrides/dooplay/animesgratis/additional.gradle
@@ -1,4 +1,5 @@
 dependencies {
+    implementation(project(":lib-blogger-extractor"))
     implementation(project(":lib-filemoon-extractor"))
     implementation(project(":lib-streamwish-extractor"))
     implementation(project(":lib-mixdrop-extractor"))
diff --git a/multisrc/overrides/dooplay/animesgratis/src/AnimesOnline.kt b/multisrc/overrides/dooplay/animesgratis/src/AnimesOnline.kt
index 67593c43f..9ddd18ce4 100644
--- a/multisrc/overrides/dooplay/animesgratis/src/AnimesOnline.kt
+++ b/multisrc/overrides/dooplay/animesgratis/src/AnimesOnline.kt
@@ -1,10 +1,10 @@
 package eu.kanade.tachiyomi.animeextension.pt.animesgratis
 
 import eu.kanade.tachiyomi.animeextension.pt.animesgratis.extractors.AnimesOnlinePlayerExtractor
-import eu.kanade.tachiyomi.animeextension.pt.animesgratis.extractors.BloggerExtractor
 import eu.kanade.tachiyomi.animeextension.pt.animesgratis.extractors.RuplayExtractor
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.bloggerextractor.BloggerExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
diff --git a/multisrc/overrides/dooplay/animesgratis/src/extractors/BloggerExtractor.kt b/multisrc/overrides/dooplay/animesgratis/src/extractors/BloggerExtractor.kt
deleted file mode 100644
index d2eec873a..000000000
--- a/multisrc/overrides/dooplay/animesgratis/src/extractors/BloggerExtractor.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.animesgratis.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class BloggerExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, headers: Headers): List<Video> {
-        return client.newCall(GET(url, headers)).execute()
-            .use { it.body.string() }
-            .takeIf { !it.contains("errorContainer") }
-            .let { it ?: return emptyList() }
-            .substringAfter("\"streams\":[")
-            .substringBefore("]")
-            .split("},")
-            .map {
-                val videoUrl = it.substringAfter("{\"play_url\":\"").substringBefore('"')
-                val format = it.substringAfter("\"format_id\":").substringBefore("}")
-                val quality = when (format) {
-                    "18" -> "360p"
-                    "22" -> "720p"
-                    else -> "Unknown"
-                }
-                Video(videoUrl, quality, videoUrl, headers = headers)
-            }
-    }
-}
diff --git a/multisrc/overrides/dooplay/animesync/additional.gradle b/multisrc/overrides/dooplay/animesync/additional.gradle
new file mode 100644
index 000000000..acd2339af
--- /dev/null
+++ b/multisrc/overrides/dooplay/animesync/additional.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    implementation(project(":lib-blogger-extractor"))
+}
diff --git a/multisrc/overrides/dooplay/animesync/src/AnimeSync.kt b/multisrc/overrides/dooplay/animesync/src/AnimeSync.kt
index 0e5254d55..36c68fcbd 100644
--- a/multisrc/overrides/dooplay/animesync/src/AnimeSync.kt
+++ b/multisrc/overrides/dooplay/animesync/src/AnimeSync.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.animeextension.pt.animesync
 
-import eu.kanade.tachiyomi.animeextension.pt.animesync.extractors.BloggerExtractor
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.bloggerextractor.BloggerExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
diff --git a/multisrc/overrides/dooplay/animesync/src/extractors/BloggerExtractor.kt b/multisrc/overrides/dooplay/animesync/src/extractors/BloggerExtractor.kt
deleted file mode 100644
index deb6f9dd8..000000000
--- a/multisrc/overrides/dooplay/animesync/src/extractors/BloggerExtractor.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.animesync.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class BloggerExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, headers: Headers): List<Video> {
-        return client.newCall(GET(url)).execute()
-            .use { it.body.string() }
-            .substringAfter("\"streams\":[")
-            .substringBefore("]")
-            .split("},")
-            .map {
-                val url = it.substringAfter("{\"play_url\":\"").substringBefore('"')
-                val format = it.substringAfter("\"format_id\":").substringBefore("}")
-                val quality = when (format) {
-                    "18" -> "360p"
-                    "22" -> "720p"
-                    else -> "Unknown"
-                }
-                Video(url, "Blogger - $quality", url, headers = headers)
-            }
-    }
-}
diff --git a/src/id/neonime/build.gradle b/src/id/neonime/build.gradle
index 38a85098f..54e7fc907 100644
--- a/src/id/neonime/build.gradle
+++ b/src/id/neonime/build.gradle
@@ -11,6 +11,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-blogger-extractor'))
     implementation(project(':lib-gdriveplayer-extractor'))
     implementation(project(':lib-yourupload-extractor'))
     implementation(project(':lib-okru-extractor'))
diff --git a/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt b/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt
index 00aef89b6..08a55f8de 100644
--- a/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt
+++ b/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.id.neonime.extractors.BloggerExtractor
 import eu.kanade.tachiyomi.animeextension.id.neonime.extractors.LinkBoxExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -14,6 +13,7 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
 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.bloggerextractor.BloggerExtractor
 import eu.kanade.tachiyomi.lib.gdriveplayerextractor.GdrivePlayerExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
@@ -228,7 +228,7 @@ class NeoNime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     videoList.addAll(OkruExtractor(client).videosFromUrl(link))
                 }
                 hosterSelection.contains("yourupload") && link.contains("blogger.com") -> {
-                    videoList.addAll(BloggerExtractor(client).videosFromUrl(link, it.text()))
+                    videoList.addAll(BloggerExtractor(client).videosFromUrl(link, headers, it.text()))
                 }
                 hosterSelection.contains("linkbox") && link.contains("yourupload.com") -> {
                     videoList.addAll(YourUploadExtractor(client).videoFromUrl(link, headers, it.text(), "Original - "))
diff --git a/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/extractors/BloggerExtractor.kt b/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/extractors/BloggerExtractor.kt
deleted file mode 100644
index 7558abd63..000000000
--- a/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/extractors/BloggerExtractor.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.id.neonime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
-import okhttp3.OkHttpClient
-import uy.kohesive.injekt.injectLazy
-
-@Serializable
-data class VideoConfig(
-    val streams: List<Stream>,
-) {
-    @Serializable
-    data class Stream(
-        val play_url: String,
-        val format_id: Int,
-    )
-}
-
-class BloggerExtractor(private val client: OkHttpClient) {
-
-    private val json: Json by injectLazy()
-
-    fun videosFromUrl(url: String, name: String): List<Video> {
-        val document = client.newCall(GET(url)).execute().asJsoup()
-
-        val jsElement = document.selectFirst("script:containsData(VIDEO_CONFIG)") ?: return emptyList()
-        val js = jsElement.data()
-        val json = json.decodeFromString<VideoConfig>(js.substringAfter("var VIDEO_CONFIG = "))
-
-        return json.streams.map {
-            Video(it.play_url, "${it.format_id} - $name", it.play_url)
-        }
-    }
-}
diff --git a/src/pt/animesgames/build.gradle b/src/pt/animesgames/build.gradle
index 339c4f520..bc74b9462 100644
--- a/src/pt/animesgames/build.gradle
+++ b/src/pt/animesgames/build.gradle
@@ -12,4 +12,8 @@ ext {
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-blogger-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/AnimesGames.kt b/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/AnimesGames.kt
index 29a899c91..5cb84e5f1 100644
--- a/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/AnimesGames.kt
+++ b/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/AnimesGames.kt
@@ -1,12 +1,12 @@
 package eu.kanade.tachiyomi.animeextension.pt.animesgames
 
-import eu.kanade.tachiyomi.animeextension.pt.animesgames.extractors.BloggerExtractor
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
 import eu.kanade.tachiyomi.animesource.model.SAnime
 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.bloggerextractor.BloggerExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.asObservableSuccess
diff --git a/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/extractors/BloggerExtractor.kt b/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/extractors/BloggerExtractor.kt
deleted file mode 100644
index c6e1125c0..000000000
--- a/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/extractors/BloggerExtractor.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.animesgames.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class BloggerExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, headers: Headers): List<Video> {
-        return client.newCall(GET(url, headers)).execute()
-            .use { it.body.string() }
-            .takeIf { !it.contains("errorContainer") }
-            .let { it ?: return emptyList() }
-            .substringAfter("\"streams\":[")
-            .substringBefore("]")
-            .split("},")
-            .map {
-                val videoUrl = it.substringAfter("{\"play_url\":\"").substringBefore('"')
-                val format = it.substringAfter("\"format_id\":").substringBefore("}")
-                val quality = when (format) {
-                    "18" -> "360p"
-                    "22" -> "720p"
-                    else -> "Unknown"
-                }
-                Video(videoUrl, quality, videoUrl, headers = headers)
-            }
-    }
-}
diff --git a/src/pt/hentaistube/build.gradle b/src/pt/hentaistube/build.gradle
index 27f0d0e92..86e766660 100644
--- a/src/pt/hentaistube/build.gradle
+++ b/src/pt/hentaistube/build.gradle
@@ -13,4 +13,8 @@ ext {
     containsNsfw = true
 }
 
+dependencies {
+    implementation(project(':lib-blogger-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt b/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt
index 1fb94638f..8b2557501 100644
--- a/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt
+++ b/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt
@@ -6,7 +6,6 @@ import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.pt.hentaistube.HentaisTubeFilters.applyFilterParams
 import eu.kanade.tachiyomi.animeextension.pt.hentaistube.dto.ItemsListDto
-import eu.kanade.tachiyomi.animeextension.pt.hentaistube.extractors.BloggerExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
@@ -14,6 +13,7 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
 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.bloggerextractor.BloggerExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.util.asJsoup
diff --git a/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/extractors/BloggerExtractor.kt b/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/extractors/BloggerExtractor.kt
deleted file mode 100644
index f7e6af295..000000000
--- a/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/extractors/BloggerExtractor.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.hentaistube.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class BloggerExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, headers: Headers): List<Video> {
-        return client.newCall(GET(url, headers)).execute()
-            .use { it.body.string() }
-            .takeIf { !it.contains("errorContainer") }
-            .let { it ?: return emptyList() }
-            .substringAfter("\"streams\":[")
-            .substringBefore("]")
-            .split("},")
-            .map {
-                val videoUrl = it.substringAfter("{\"play_url\":\"").substringBefore('"')
-                val format = it.substringAfter("\"format_id\":").substringBefore("}")
-                val quality = when (format) {
-                    "18" -> "360p"
-                    "22" -> "720p"
-                    else -> "Unknown"
-                }
-                Video(videoUrl, quality, videoUrl, headers = headers)
-            }
-    }
-}