Merge pull request #13 from JunkFood02/dev

Update yt-dlp when initialize app

Author: JunkFood02

app/build.gradle

@@ -23,7 +23,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

app/src/main/java/com/junkfood/seal/BaseApplication.kt

@@ -7,6 +7,7 @@ import android.content.Context
 import android.os.Environment
 import android.util.Log
 import com.google.android.material.color.DynamicColors
+import com.junkfood.seal.util.DownloadUtil
 import com.junkfood.seal.util.PreferenceUtil
 import com.tencent.mmkv.MMKV
 import com.yausername.ffmpeg.FFmpeg
@@ -22,13 +23,15 @@ class BaseApplication : Application() {
         MMKV.initialize(this)
         DynamicColors.applyToActivitiesIfAvailable(this)
         clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-
         CoroutineScope(Job()).launch {
             withContext(Dispatchers.IO) {
                 try {
                     Log.d(TAG, "onCreate: Init")
                     YoutubeDL.getInstance().init(this@BaseApplication)
                     FFmpeg.getInstance().init(this@BaseApplication)
+                    if (PreferenceUtil.getString("yt-dlp_init").isNullOrEmpty()) {
+                        DownloadUtil.updateYtDlp()
+                    }
                     Log.d(TAG, "onCreate: Init Finish")
                 } catch (e: YoutubeDLException) {
                     Log.e(TAG, "failed to initialize youtubedl-android", e)
@@ -67,7 +70,6 @@ class BaseApplication : Application() {
         }
 
 
-
         @SuppressLint("StaticFieldLeak")
         lateinit var context: Context
     }

app/src/main/java/com/junkfood/seal/ui/viewmodel/DownloadViewModel.kt

@@ -29,10 +29,6 @@ class DownloadViewModel : ViewModel() {
     val url: MutableLiveData<String> = MutableLiveData<String>().apply { value = "" }
     val videoTitle: MutableLiveData<String> = MutableLiveData<String>().apply { value = "" }
 
-    fun updateProgress(progressNum: Float) {
-        _progress.postValue(progressNum)
-    }
-
     fun startDownloadVideo() {
         with(url.value) {
             if (isNullOrBlank()) TextUtil.makeToast(context.getString(R.string.url_empty))
@@ -46,7 +42,7 @@ class DownloadViewModel : ViewModel() {
                         videoTitle.value = videoInfo.title
                     }
                     val downloadResult = DownloadUtil.downloadVideo(this@with, videoInfo)
-                    { fl: Float, _: Long, _: String -> updateProgress(fl) }
+                    { fl: Float, _: Long, _: String -> _progress.postValue(fl) }
                     isDownloading.postValue(false)
                     if (downloadResult.resultCode != DownloadUtil.ResultCode.EXCEPTION)
                         withContext(Dispatchers.Main) {

app/src/main/java/com/junkfood/seal/util/DownloadUtil.kt

@@ -132,7 +132,10 @@ object DownloadUtil {
                 toast(R.string.yt_dlp_update_fail)
             }
         }
-        YoutubeDL.getInstance().version(context)?.let { BaseApplication.ytdlpVersion = it }
+        YoutubeDL.getInstance().version(context)?.let {
+            BaseApplication.ytdlpVersion = it
+            PreferenceUtil.updateString("yt-dlp_init", it)
+        }
         return BaseApplication.ytdlpVersion
     }
 

app/src/main/java/com/junkfood/seal/util/PreferenceUtil.kt

@@ -8,7 +8,7 @@ object PreferenceUtil {
     private val kv = MMKV.defaultMMKV()
 
     fun updateValue(key: String, b: Boolean) = kv.encode(key, b)
-    fun getValue(key: String): Boolean = kv.decodeBool(key, true)
+    fun getValue(key: String): Boolean = kv.decodeBool(key, false)
     fun getString(key: String): String? = kv.decodeString(key)
     fun updateString(key: String, string: String) = kv.encode(key, string)
 }