Add apiUrl for updating yt-dlp from other repos

JunkFood02 · Feb 1, 2023 · 970b819 · 970b819
1 parent a3b9717
commit 970b819
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/yausername/youtubedl_android_example/MainActivity.java b/app/src/main/java/com/yausername/youtubedl_android_example/MainActivity.java
@@ -95,7 +95,7 @@ private void updateYoutubeDL() {
 
         updating = true;
         progressBar.setVisibility(View.VISIBLE);
-        Disposable disposable = Observable.fromCallable(() -> YoutubeDL.getInstance().updateYoutubeDL(getApplication()))
+        Disposable disposable = Observable.fromCallable(() -> YoutubeDL.getInstance().updateYoutubeDL(getApplication(), null))
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(status -> {
@@ -113,7 +113,7 @@ private void updateYoutubeDL() {
                     }
                     updating = false;
                 }, e -> {
-                    if(BuildConfig.DEBUG) Log.e(TAG, "failed to update", e);
+                    if (BuildConfig.DEBUG) Log.e(TAG, "failed to update", e);
                     progressBar.setVisibility(View.GONE);
                     Toast.makeText(MainActivity.this, "update failed", Toast.LENGTH_LONG).show();
                     updating = false;

diff --git a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDL.kt b/library/src/main/java/com/yausername/youtubedl_android/YoutubeDL.kt
@@ -212,10 +212,10 @@ object YoutubeDL {
 
     @Synchronized
     @Throws(YoutubeDLException::class)
-    fun updateYoutubeDL(appContext: Context): UpdateStatus? {
+    fun updateYoutubeDL(appContext: Context, apiUrl: String? = null): UpdateStatus? {
         assertInit()
         return try {
-            YoutubeDLUpdater.update(appContext)
+            YoutubeDLUpdater.update(appContext, apiUrl)
         } catch (e: IOException) {
             throw YoutubeDLException("failed to update youtube-dl", e)
         }

diff --git a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLUpdater.kt b/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLUpdater.kt
@@ -15,9 +15,10 @@ import java.net.URL
 internal object YoutubeDLUpdater {
     private const val releasesUrl = "https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest"
     private const val youtubeDLVersionKey = "youtubeDLVersion"
+
     @Throws(IOException::class, YoutubeDLException::class)
-    fun update(appContext: Context): UpdateStatus {
-        val json = checkForUpdate(appContext) ?: return UpdateStatus.ALREADY_UP_TO_DATE
+    fun update(appContext: Context, apiUrl: String? = null): UpdateStatus {
+        val json = checkForUpdate(appContext, apiUrl) ?: return UpdateStatus.ALREADY_UP_TO_DATE
         val downloadUrl = getDownloadUrl(json)
         val file = download(appContext, downloadUrl)
         val ytdlpDir = getYoutubeDLDir(appContext)
@@ -44,8 +45,8 @@ internal object YoutubeDLUpdater {
     }
 
     @Throws(IOException::class)
-    private fun checkForUpdate(appContext: Context): JsonNode? {
-        val url = URL(releasesUrl)
+    private fun checkForUpdate(appContext: Context, apiUrl: String? = null): JsonNode? {
+        val url = URL(apiUrl ?: releasesUrl)
         val json: JsonNode = YoutubeDL.objectMapper.readTree(url)
         val newVersion = getTag(json)
         val oldVersion = SharedPrefsHelper[appContext, youtubeDLVersionKey]