move NewPipe init to NewPipeUtils

z-huang · Jan 9, 2025 · 01f4df1 · 01f4df1
1 parent 3239896
commit 01f4df1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/innertube/src/main/java/com/zionhuang/innertube/NewPipe.kt b/innertube/src/main/java/com/zionhuang/innertube/NewPipe.kt
@@ -6,6 +6,7 @@ import io.ktor.http.URLBuilder
 import io.ktor.http.parseQueryString
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
+import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.downloader.Downloader
 import org.schabi.newpipe.extractor.downloader.Request
 import org.schabi.newpipe.extractor.downloader.Response
@@ -14,7 +15,7 @@ import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
 import org.schabi.newpipe.extractor.services.youtube.YoutubeJavaScriptPlayerManager
 import java.io.IOException
 
-object NewPipeDownloaderImpl : Downloader() {
+private object NewPipeDownloaderImpl : Downloader() {
 
     private val client = OkHttpClient.Builder().build()
 
@@ -59,6 +60,10 @@ object NewPipeDownloaderImpl : Downloader() {
 
 object NewPipeUtils {
 
+    init {
+        NewPipe.init(NewPipeDownloaderImpl)
+    }
+
     fun getSignatureTimestamp(videoId: String): Result<Int> = runCatching {
         YoutubeJavaScriptPlayerManager.getSignatureTimestamp(videoId)
     }

diff --git a/innertube/src/main/java/com/zionhuang/innertube/YouTube.kt b/innertube/src/main/java/com/zionhuang/innertube/YouTube.kt
@@ -51,7 +51,6 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonPrimitive
-import org.schabi.newpipe.extractor.NewPipe
 import java.net.Proxy
 
 /**
@@ -61,10 +60,6 @@ import java.net.Proxy
 object YouTube {
     private val innerTube = InnerTube()
 
-    init {
-        NewPipe.init(NewPipeDownloaderImpl)
-    }
-
     var locale: YouTubeLocale
         get() = innerTube.locale
         set(value) {