[release] 5.0.6

easybangumiorg · Jan 28, 2024 · 67ee2fa · 67ee2fa
1 parent 09b197b
commit 67ee2fa
Show file tree

Hide file tree

Showing 9 changed files with 578 additions and 28 deletions.
diff --git a/app/schemas/com.heyanle.easybangumi4.cartoon.repository.db.CartoonDatabase/2.json b/app/schemas/com.heyanle.easybangumi4.cartoon.repository.db.CartoonDatabase/2.json
diff --git a/app/src/main/java/com/heyanle/easybangumi4/C.kt b/app/src/main/java/com/heyanle/easybangumi4/C.kt
@@ -47,7 +47,7 @@ object C {
                 icon = R.drawable.telegram,
                 title = stringRes(com.heyanle.easy_i18n.R.string.telegram),
                 msg = stringRes(com.heyanle.easy_i18n.R.string.click_to_join),
-                url = "https://t.me/easybangumi"
+                url = "https://t.me/easy_bangumi"
             ),
             About.Url(
                 icon = R.drawable.github,

diff --git a/app/src/main/java/com/heyanle/easybangumi4/base/DataResult.kt b/app/src/main/java/com/heyanle/easybangumi4/base/DataResult.kt
@@ -1,7 +1,7 @@
 package com.heyanle.easybangumi4.base
 
 import androidx.webkit.internal.ApiFeature.T
-import com.heyanle.easybangumi4.SourceResult
+import com.heyanle.easybangumi4.source_api.SourceResult
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 

diff --git a/app/src/main/java/com/heyanle/easybangumi4/cartoon/CartoonUpdateController.kt b/app/src/main/java/com/heyanle/easybangumi4/cartoon/CartoonUpdateController.kt
@@ -1,9 +1,9 @@
 package com.heyanle.easybangumi4.cartoon
 
-import com.heyanle.easybangumi4.SourceResult
 import com.heyanle.easybangumi4.cartoon.entity.CartoonInfo
 import com.heyanle.easybangumi4.cartoon.repository.db.dao.CartoonInfoDao
 import com.heyanle.easybangumi4.case.SourceStateCase
+import com.heyanle.easybangumi4.source_api.SourceResult
 import com.heyanle.easybangumi4.source_api.entity.Cartoon
 import com.heyanle.easybangumi4.utils.CoroutineProvider
 import kotlinx.coroutines.CoroutineScope

diff --git a/app/src/main/java/com/heyanle/easybangumi4/extension/loader/AbsExtensionLoader.kt b/app/src/main/java/com/heyanle/easybangumi4/extension/loader/AbsExtensionLoader.kt
@@ -138,11 +138,15 @@ abstract class AbsExtensionLoader(
                         publicPath = appInfo.publicSourceDir
                     )
                 }
-            }.map {
+            }.flatMap {
                 if (it is ExtensionSource) {
                     it.packageName = pkgInfo.packageName
+                    listOf(it)
+                }else if(pkgInfo.packageName == "org.easybangumi.extension"){
+                    listOf(it)
+                }else{
+                    emptyList()
                 }
-                it
             }
             appInfo.loadIcon(pkgManager)
             TimeLogUtils.i("ExtensionLoader ${pkgInfo.packageName} inner completely")

diff --git a/app/src/main/java/com/heyanle/easybangumi4/source/utils/WebViewHelperImpl.kt b/app/src/main/java/com/heyanle/easybangumi4/source/utils/WebViewHelperImpl.kt
@@ -12,6 +12,7 @@ import com.heyanle.easybangumi4.source_api.utils.core.setDefaultSettings
 import com.heyanle.easybangumi4.utils.clearWeb
 import com.heyanle.easybangumi4.utils.evaluateJavascript
 import com.heyanle.easybangumi4.utils.getHtml
+import com.heyanle.easybangumi4.utils.logi
 import com.heyanle.easybangumi4.utils.stop
 import com.heyanle.easybangumi4.utils.waitUntil
 import com.heyanle.easybangumi4.utils.waitUntilLoadFinish
@@ -74,7 +75,10 @@ object WebViewHelperImpl : WebViewHelper {
         }
         _globalWebView.resumeTimers()
         _globalWebView.loadUrl(url, header.orEmpty())
-        _globalWebView.waitUntil(Regex(callBackRegex), timeOut)
+        _globalWebView.waitUntil(Regex(callBackRegex), timeOut, true)
+            .apply {
+                ("waitUntil: "+this).logi("WebView.waitUntil")
+            }
         _globalWebView.evaluateJavascript(actionJs)
         _globalWebView.getHtml().also {
             _globalWebView.stop()
@@ -93,11 +97,15 @@ object WebViewHelperImpl : WebViewHelper {
         _globalWebView.settings.userAgentString = userAgentString
         _globalWebView.resumeTimers()
         _globalWebView.loadUrl(url, header.orEmpty())
-        _globalWebView.waitUntilLoadFinish(timeOut)
-        _globalWebView.evaluateJavascript(actionJs)
-        _globalWebView.waitUntil(Regex(regex), timeOut).also {
-            _globalWebView.stop()
+        val r = _globalWebView.waitUntil(Regex(regex), timeOut, false)
+        if(r.isNotEmpty() || actionJs == null){
+            return@withContext r
         }
+        _globalWebView.evaluateJavascript(actionJs)
+        "regex ${regex} ${Regex(regex)}".logi("WebView.waitUntil")
+        _globalWebView.waitUntil(Regex(regex), timeOut, true)
+    }.apply {
+        ("interceptResource: "+this).logi("WebView.waitUntil")
     }
 
     override suspend fun interceptBlob(

diff --git a/app/src/main/java/com/heyanle/easybangumi4/ui/search_migrate/PagingSearchSource.kt b/app/src/main/java/com/heyanle/easybangumi4/ui/search_migrate/PagingSearchSource.kt
@@ -2,7 +2,7 @@ package com.heyanle.easybangumi4.ui.search_migrate
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import com.heyanle.easybangumi4.SourceResult
+import com.heyanle.easybangumi4.source_api.SourceResult
 import com.heyanle.easybangumi4.source_api.component.search.SearchComponent
 import com.heyanle.easybangumi4.source_api.entity.CartoonCover
 import com.heyanle.easybangumi4.utils.logi

diff --git a/app/src/main/java/com/heyanle/easybangumi4/utils/WebViewUtils.kt b/app/src/main/java/com/heyanle/easybangumi4/utils/WebViewUtils.kt
@@ -3,9 +3,11 @@ package com.heyanle.easybangumi4.utils
 import android.webkit.WebView
 import com.heyanle.easybangumi4.source.utils.LightweightGettingWebViewClient
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
 import org.apache.commons.text.StringEscapeUtils
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
@@ -50,26 +52,45 @@ suspend fun WebView.waitUntilLoadFinish(timeoutMs: Long = 8000L) {
     waitUntil(null, timeoutMs)
 }
 
-suspend fun WebView.waitUntil(regex: Regex? = null, timeoutMs: Long = 8000L): String {
-    return withContext(Dispatchers.Main) {
-        suspendCoroutine { con ->
-            launch {
-                delay(timeoutMs)
-                con.resume("")
-            }
-            webViewClient = object : LightweightGettingWebViewClient(regex) {
-                override fun onPageFinished(view: WebView?, url: String?) {
-                    "onPageFinished: $url".logi("WebView.waitUntil")
-                    if (regex == null) con.resume("")
-                }
+suspend fun WebView.waitUntil(regex: Regex? = null, timeoutMs: Long = 8000L, stopLoading: Boolean = false): String {
+    return try {
+        withTimeout(timeoutMs) {
+            suspendCoroutine<String> { con ->
+//            launch(Dispatchers.IO) {
+//                delay(timeoutMs)
+//                runCatching {
+//                    con.resume("")
+//                }
+//            }
+                launch(Dispatchers.Main) {
+                    webViewClient = object : LightweightGettingWebViewClient(regex) {
+                        override fun onPageFinished(view: WebView?, url: String?) {
+                            "onPageFinished: $url".logi("WebView.waitUntil")
+                            runCatching {
+                                if (regex == null) con.resume("")
+                            }
+                        }
 
-                override fun onLoadResource(view: WebView?, url: String?) {
-                    "onLoadResource: $url".logi("WebView.waitUntil")
-                    if (regex != null && url != null && regex.matches(url)) {
-                        con.resume(url)
+                        override fun onLoadResource(view: WebView?, url: String?) {
+                            "onLoadResource: $url".logi("WebView.waitUntil")
+                            if (regex != null && url != null && regex.matches(url)) {
+                                "onLoadResource: match ${regex}".logi("WebView.waitUntil")
+                                runCatching {
+                                    con.resume(url)
+                                }
+                                if(stopLoading){
+                                    stopLoading()
+                                }
+                            }
+                        }
                     }
                 }
+            }.apply {
+                "suspendCoroutine ${regex}".logi("WebView.waitUntil")
             }
         }
+    } catch (ex: TimeoutCancellationException) {
+        ex.printStackTrace()
+        return ""
     }
 }
diff --git a/buildSrc/src/main/java/com/heyanle/buildsrc/Android.kt b/buildSrc/src/main/java/com/heyanle/buildsrc/Android.kt
@@ -10,7 +10,7 @@ object Android {
     const val compileSdk = 34
 
     const val versionCode = 78
-    const val versionName = "5.0.5"
+    const val versionName = "5.0.6"
 
 
 }