Merge pull request #631 from qdsfdhvh/bugfix/catch_execute_error

catch execute error
qdsfdhvh · Oct 13, 2024 · f0d77f8 · f0d77f8
2 parents 6c16fab + af72d65
commit f0d77f8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/app/web/build.gradle.kts b/app/web/build.gradle.kts
@@ -21,8 +21,3 @@ kotlin {
         }
     }
 }
-
-compose.experimental {
-    web.application {
-    }
-}
diff --git a/image-loader/src/commonMain/kotlin/com/seiko/imageloader/ImageLoader.kt b/image-loader/src/commonMain/kotlin/com/seiko/imageloader/ImageLoader.kt
@@ -62,13 +62,24 @@ private class RealImageLoader(
 
     override suspend fun execute(request: ImageRequest): ImageResult {
         return withContext(requestCoroutineContext) {
-            val chain = createInterceptorChain(
-                initialRequest = request,
-                initialOptions = getOptions(request),
-                config = config,
-                flowCollector = null,
+            runCatching {
+                val chain = createInterceptorChain(
+                    initialRequest = request,
+                    initialOptions = getOptions(request),
+                    config = config,
+                    flowCollector = null,
+                )
+                chain.proceed(request)
+            }.fold(
+                onSuccess = { it },
+                onFailure = {
+                    if (it !is CancellationException) {
+                        ImageResult.OfError(it)
+                    } else {
+                        throw it
+                    }
+                },
             )
-            chain.proceed(request)
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,3 @@ kotlin { @@
             }
         }
     }
-    compose.experimental {
-        web.application {
-        }
-    }