syncronize dotlottie assets loading

alexzhirkevich · Jul 16, 2024 · d432ddb · d432ddb
1 parent 2de3925
commit d432ddb
Showing 1 changed file with 25 additions and 20 deletions.
diff --git a/...ie-dot/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/DotLottieAssetsManager.kt b/...ie-dot/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/DotLottieAssetsManager.kt
@@ -3,6 +3,8 @@ package io.github.alexzhirkevich.compottie
 import io.github.alexzhirkevich.compottie.assets.ImageRepresentable
 import io.github.alexzhirkevich.compottie.assets.LottieImageSpec
 import io.github.alexzhirkevich.compottie.assets.LottieAssetsManager
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import okio.Path
 import okio.Path.Companion.toPath
 
@@ -11,27 +13,30 @@ internal class DotLottieAssetsManager(
     private val root : Path? = null
 ) : LottieAssetsManager {
 
-    override suspend fun image(image: LottieImageSpec): ImageRepresentable? {
-
-        val trimPath = image.path
-            .removePrefix("/")
-            .removeSuffix("/")
-            .takeIf(String::isNotEmpty)
-
-        val trimName = image.name
-            .removePrefix("/")
-            .removeSuffix("/")
-            .takeIf(String::isNotEmpty)
+    private val mutex = Mutex()
 
-        load(null, trimPath, trimName)?.let {
-            return ImageRepresentable.Bytes(it)
-        }
-
-        return load("/images", trimPath, trimName)?.let {
-            ImageRepresentable.Bytes(it)
-        } ?: run {
-            Compottie.logger?.warn("Failed to decode dotLottie asset $trimName")
-            null
+    override suspend fun image(image: LottieImageSpec): ImageRepresentable? {
+        return mutex.withLock {
+            val trimPath = image.path
+                .removePrefix("/")
+                .removeSuffix("/")
+                .takeIf(String::isNotEmpty)
+
+            val trimName = image.name
+                .removePrefix("/")
+                .removeSuffix("/")
+                .takeIf(String::isNotEmpty)
+
+            load(null, trimPath, trimName)?.let {
+                return ImageRepresentable.Bytes(it)
+            }
+
+            load("/images", trimPath, trimName)?.let {
+                ImageRepresentable.Bytes(it)
+            } ?: run {
+                Compottie.logger?.warn("Failed to decode dotLottie asset $trimName")
+                null
+            }
         }
     }