[fix] Fix an issue that using the debounce operator on the download p…

…age causes some information not to be updated
SkyD666 · Sep 14, 2024 · 327bdd2 · 327bdd2
1 parent c9a5a93
commit 327bdd2
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 24 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,7 +22,7 @@ android {
         minSdk = 24
         targetSdk = 35
         versionCode = 24
-        versionName = "2.1-beta04"
+        versionName = "2.1-beta05"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/java/com/skyd/anivu/base/mvi/MviIntent.kt b/app/src/main/java/com/skyd/anivu/base/mvi/MviIntent.kt
@@ -6,9 +6,7 @@ import androidx.compose.runtime.remember
 import com.skyd.anivu.ext.startWith
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
 
 /**

diff --git a/app/src/main/java/com/skyd/anivu/base/mvi/MviViewModel.kt b/app/src/main/java/com/skyd/anivu/base/mvi/MviViewModel.kt
@@ -1,6 +1,7 @@
 package com.skyd.anivu.base.mvi
 
 import androidx.annotation.MainThread
+import kotlinx.coroutines.MainCoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 
@@ -18,7 +19,7 @@ interface MviViewModel<I : MviIntent, S : MviViewState, E : MviSingleEvent> {
     val singleEvent: Flow<E>
 
     /**
-     * Must be called in [kotlinx.coroutines.Dispatchers.Main.immediate],
+     * Must be called in [MainCoroutineDispatcher.immediate],
      * otherwise it will throw an exception.
      *
      * If you want to process an intent from other [kotlinx.coroutines.CoroutineDispatcher],

diff --git a/app/src/main/java/com/skyd/anivu/ext/FlowExt.kt b/app/src/main/java/com/skyd/anivu/ext/FlowExt.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.buffer
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
@@ -21,6 +20,7 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.produceIn
+import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import java.util.concurrent.atomic.AtomicBoolean
@@ -87,6 +87,6 @@ fun <T> Flow<T>.collectIn(
     flowWithLifecycle(lifecycleOwner.lifecycle, minActiveState).collect(action)
 }
 
-fun <T> Flow<T>.debounceWithoutFirst(timeoutMillis: Long) = merge(
-    take(1), drop(1).debounce(timeoutMillis)
+fun <T> Flow<T>.sampleWithoutFirst(timeoutMillis: Long) = merge(
+    take(1), drop(1).sample(timeoutMillis)
 )
diff --git a/app/src/main/java/com/skyd/anivu/model/repository/ArticleRepository.kt b/app/src/main/java/com/skyd/anivu/model/repository/ArticleRepository.kt
@@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.parcelize.Parcelize
 import javax.inject.Inject
+import kotlin.coroutines.cancellation.CancellationException
 
 @Parcelize
 sealed class ArticleSort(open val asc: Boolean) : Parcelable {
@@ -105,8 +106,10 @@ class ArticleRepository @Inject constructor(
                                     feedDao.updateFeed(feedWithArticle.feed)
                                 }?.articles
                             }.onFailure { e ->
-                                e.printStackTrace()
-                                (feedUrl + "\n" + e.message).showToast()
+                                if (e !is CancellationException) {
+                                    e.printStackTrace()
+                                    (feedUrl + "\n" + e.message).showToast()
+                                }
                             }.getOrNull()
                         }
                         val articleBeanList = articleBeanListAsync.await() ?: return@async

diff --git a/app/src/main/java/com/skyd/anivu/model/repository/download/DownloadManager.kt b/app/src/main/java/com/skyd/anivu/model/repository/download/DownloadManager.kt
@@ -2,7 +2,7 @@ package com.skyd.anivu.model.repository.download
 
 import androidx.work.WorkManager
 import com.skyd.anivu.appContext
-import com.skyd.anivu.ext.debounceWithoutFirst
+import com.skyd.anivu.ext.sampleWithoutFirst
 import com.skyd.anivu.model.bean.download.DownloadInfoBean
 import com.skyd.anivu.model.bean.download.DownloadInfoBean.DownloadState
 import com.skyd.anivu.model.bean.download.DownloadLinkUuidMapBean
@@ -21,8 +21,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
@@ -62,7 +60,7 @@ object DownloadManager {
     private fun Flow<DownloadManagerIntent>.onEachIntent(): Flow<DownloadManagerIntent> {
         return merge(
             filterIsInstance<DownloadManagerIntent.UpdateDownloadInfo>()
-                .debounceWithoutFirst(100)
+                .sampleWithoutFirst(100)
                 .onEach { intent ->
                     downloadInfoDao.updateDownloadInfo(intent.downloadInfoBean)
                     putDownloadInfoToMap(
@@ -82,7 +80,7 @@ object DownloadManager {
                 }.catch { it.printStackTrace() },
 
             filterIsInstance<DownloadManagerIntent.UpdateDownloadProgress>()
-                .debounceWithoutFirst(1000)
+                .sampleWithoutFirst(1000)
                 .onEach { intent ->
                     val result = downloadInfoDao.updateDownloadProgress(
                         link = intent.link,
@@ -105,7 +103,7 @@ object DownloadManager {
                 }.catch { it.printStackTrace() },
 
             filterIsInstance<DownloadManagerIntent.UpdateDownloadSize>()
-                .debounceWithoutFirst(1000)
+                .sampleWithoutFirst(1000)
                 .onEach { intent ->
                     val result = downloadInfoDao.updateDownloadSize(
                         link = intent.link, size = intent.size,
@@ -116,7 +114,7 @@ object DownloadManager {
                 }.catch { it.printStackTrace() },
 
             filterIsInstance<DownloadManagerIntent.UpdateDownloadName>()
-                .debounceWithoutFirst(200)
+                .sampleWithoutFirst(200)
                 .onEach { intent ->
                     if (intent.name.isNullOrBlank()) return@onEach
                     val result = downloadInfoDao.updateDownloadName(
@@ -146,7 +144,7 @@ object DownloadManager {
                 .catch { it.printStackTrace() },
 
             filterIsInstance<DownloadManagerIntent.UpdateDownloadDescription>()
-                .debounceWithoutFirst(500)
+                .sampleWithoutFirst(500)
                 .onEach { intent ->
                     val result = downloadInfoDao.updateDownloadDescription(
                         link = intent.link,

diff --git a/app/src/main/java/com/skyd/anivu/model/repository/download/DownloadRepository.kt b/app/src/main/java/com/skyd/anivu/model/repository/download/DownloadRepository.kt
@@ -2,7 +2,7 @@ package com.skyd.anivu.model.repository.download
 
 import com.skyd.anivu.base.BaseRepository
 import com.skyd.anivu.config.Const
-import com.skyd.anivu.ext.debounceWithoutFirst
+import com.skyd.anivu.ext.sampleWithoutFirst
 import com.skyd.anivu.model.bean.download.DownloadInfoBean
 import com.skyd.anivu.model.worker.download.DownloadTorrentWorker
 import kotlinx.coroutines.Dispatchers
@@ -18,8 +18,8 @@ class DownloadRepository @Inject constructor() : BaseRepository() {
     suspend fun requestDownloadingVideos(): Flow<List<DownloadInfoBean>> {
         return combine(
             DownloadManager.getDownloadInfoList().distinctUntilChanged(),
-            DownloadTorrentWorker.peerInfoMapFlow.debounceWithoutFirst(1000),
-            DownloadTorrentWorker.torrentStatusMapFlow.debounceWithoutFirst(1000),
+            DownloadTorrentWorker.peerInfoMapFlow.sampleWithoutFirst(1000),
+            DownloadTorrentWorker.torrentStatusMapFlow.sampleWithoutFirst(1000),
         ) { list, peerInfoMap, uploadPayloadRateMap ->
             list.map { downloadInfoBean ->
                 downloadInfoBean.copy().apply {

diff --git a/app/src/main/java/com/skyd/anivu/ui/screen/feed/FeedScreen.kt b/app/src/main/java/com/skyd/anivu/ui/screen/feed/FeedScreen.kt
@@ -1,7 +1,6 @@
 package com.skyd.anivu.ui.screen.feed
 
 import androidx.activity.compose.BackHandler
-import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets

diff --git a/app/src/main/java/com/skyd/anivu/ui/screen/feed/item/Group1Item.kt b/app/src/main/java/com/skyd/anivu/ui/screen/feed/item/Group1Item.kt
@@ -3,7 +3,6 @@ package com.skyd.anivu.ui.screen.feed.item
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding

diff --git a/app/src/main/java/com/skyd/anivu/ui/screen/feed/reorder/ReorderGroupPartialStateChange.kt b/app/src/main/java/com/skyd/anivu/ui/screen/feed/reorder/ReorderGroupPartialStateChange.kt
@@ -1,7 +1,6 @@
 package com.skyd.anivu.ui.screen.feed.reorder
 
 import com.skyd.anivu.model.bean.GroupVo
-import com.skyd.anivu.ui.screen.feed.reorder.ReorderGroupPartialStateChange.GroupList.Success
 
 
 internal sealed interface ReorderGroupPartialStateChange {

diff --git a/...ain/java/com/skyd/anivu/ui/screen/feed/requestheaders/RequestHeadersPartialStateChange.kt b/...ain/java/com/skyd/anivu/ui/screen/feed/requestheaders/RequestHeadersPartialStateChange.kt
@@ -1,7 +1,6 @@
 package com.skyd.anivu.ui.screen.feed.requestheaders
 
 import com.skyd.anivu.model.bean.FeedBean
-import com.skyd.anivu.ui.screen.feed.reorder.ReorderGroupPartialStateChange.GroupList.Success
 
 
 internal sealed interface RequestHeadersPartialStateChange {