fix timeout

DatL4g · Apr 19, 2024 · 32782dd · 32782dd
1 parent e085fa9
commit 32782dd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/...commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/MediumScreenComponent.kt b/...commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/MediumScreenComponent.kt
@@ -266,7 +266,7 @@ class MediumScreenComponent(
     override val rating: StateFlow<Int> = combine(
         mediumSuccessState.mapNotNull {
             it?.data?.entry?.score?.toInt()
-        },
+        }.flowOn(ioDispatcher()),
         changedRating
     ) { t1, t2 ->
         if (t2 > -1) {
@@ -338,16 +338,20 @@ class MediumScreenComponent(
         }
 
         return tokenResult.isSuccess.alsoTrue {
-            val query = MediaListEntryQuery(
-                id = Optional.present(mediaId.saveFirstOrNull() ?: mediaId.value)
-            )
-            val execution = CatchResult.timeout(5.seconds) {
-                apolloClient.query(query).execute()
-            }.asNullableSuccess()
-
-            execution?.data?.MediaList?.let { entry ->
-                changedRating.emit(entry.score?.toInt() ?: changedRating.value)
-            }
+            requestMediaListEntry()
+        }
+    }
+
+    private suspend fun requestMediaListEntry() {
+        val query = MediaListEntryQuery(
+            id = Optional.present(mediaId.saveFirstOrNull() ?: mediaId.value)
+        )
+        val execution = CatchResult.timeout(5.seconds) {
+            apolloClient.query(query).execute()
+        }.asNullableSuccess()
+
+        execution?.data?.MediaList?.let { entry ->
+            changedRating.emit(entry.score?.toInt() ?: changedRating.value)
         }
     }
 
@@ -362,6 +366,11 @@ class MediumScreenComponent(
                     }
                 }
             } else {
+                val currentRating = rating.saveFirstOrNull() ?: rating.value
+                if (currentRating <= -1) {
+                    requestMediaListEntry()
+                }
+
                 withMainContext {
                     onLoggedIn()
                 }

diff --git a/model/src/commonMain/kotlin/dev/datlag/aniflow/model/CatchResult.kt b/model/src/commonMain/kotlin/dev/datlag/aniflow/model/CatchResult.kt
@@ -3,10 +3,7 @@ package dev.datlag.aniflow.model
 import dev.datlag.aniflow.model.CatchResult.Companion.result
 import dev.datlag.aniflow.model.CatchResult.Success
 import dev.datlag.tooling.async.suspendCatching
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.withTimeout
+import kotlinx.coroutines.*
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
@@ -121,8 +118,10 @@ sealed interface CatchResult<T> {
             time: Duration,
             block: suspend CoroutineScope.() -> T
         ): CatchResult<T & Any> = coroutineScope {
-            val result = suspendCatching {
-                withTimeout(time, block)
+            val result: Result<T> = try {
+                Result.success(withTimeout(time, block))
+            } catch (timeout: TimeoutCancellationException) {
+                Result.failure(timeout)
             }
 
             return@coroutineScope if (result.isFailure) {