Trease-Focus
diff --git a/‎composeApp/src/commonMain/kotlin/neth/iecal/trease/ui/components/TreeGrowthPlayer.kt‎
Lines changed: 2 additions & 2 deletions b/‎composeApp/src/commonMain/kotlin/neth/iecal/trease/ui/components/TreeGrowthPlayer.kt‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎composeApp/src/commonMain/kotlin/neth/iecal/trease/utils/CacheManager.kt‎
Lines changed: 9 additions & 53 deletions b/‎composeApp/src/commonMain/kotlin/neth/iecal/trease/utils/CacheManager.kt‎
Lines changed: 9 additions & 53 deletions
diff --git a/‎composeApp/src/commonMain/kotlin/neth/iecal/trease/utils/VideoCache.kt‎
Lines changed: 61 additions & 0 deletions b/‎composeApp/src/commonMain/kotlin/neth/iecal/trease/utils/VideoCache.kt‎
Lines changed: 61 additions & 0 deletions
@@ -26,6 +26,7 @@ import kotlinx.coroutines.delay
 import neth.iecal.trease.PlatformVideoPlayer
 import neth.iecal.trease.models.TimerStatus
 import neth.iecal.trease.utils.CacheManager
+import neth.iecal.trease.utils.getCachedVideoPath
 import neth.iecal.trease.viewmodels.HomeScreenViewModel
 
 
@@ -71,11 +72,10 @@ fun TreeGrowthPlayer(
     )
 
     LaunchedEffect(selectedTreeId, selectedMinutes) {
-        val cacheManager = CacheManager()
         val remoteUrl = "https://trease-focus.github.io/cache-trees/video/$selectedTreeId.webm"
 
         try {
-            val localPath = cacheManager.getCachedVideoPath(remoteUrl, selectedTreeId)
+            val localPath = getCachedVideoPath(remoteUrl, selectedTreeId)
             statePlayer.openUri(localPath)
             isReady = true
 
 
@@ -16,69 +16,25 @@ import okio.use
 
 class CacheManager {
 
-    private val client = getPlatformHttpClient()
     private val fileSystem = getFileSystem()
 
 
-    suspend fun getCachedVideoPath(
-        url: String,
-        videoId: String
-    ): String {
-        val cachePath = getCacheDir().toPath()
-
-        if (!fileSystem.exists(cachePath)) {
-            fileSystem.createDirectories(cachePath)
-        }
-
-        val filePath = cachePath.resolve("$videoId.webm")
-
-        if (fileSystem.exists(filePath)) {
-            return filePath.toString()
-        }
-
-        try {
-            val response = client.get(url)
-            val channel = response.bodyAsChannel()
-
-            val sink = fileSystem.sink(filePath).buffer()
-
-            try {
-                while (!channel.isClosedForRead) {
-                    val packet = channel.readRemaining(8_192)
-                    while (!packet.isEmpty) {
-                        sink.write(packet.readBytes())
-                    }
-                }
-            } finally {
-                sink.flush()
-                sink.close()
-            }
-
-        } catch (e: Exception) {
-            if (fileSystem.exists(filePath)) {
-                fileSystem.delete(filePath)
-            }
-            throw e
-        }
-
-        return filePath.toString()
-    }
-
-
     suspend fun saveFile(
         fileName: String,
         content: String
     ) {
-        val cachePath = getCacheDir().toPath()
+        return withContext(Dispatchers.Main) {
+            val cachePath = getCacheDir().toPath()
 
-        if (!fileSystem.exists(cachePath)) {
-            fileSystem.createDirectories(cachePath)
-        }
+            if (!fileSystem.exists(cachePath)) {
+                fileSystem.createDirectories(cachePath)
+            }
 
-        val filePath = cachePath.resolve(fileName)
+            val filePath = cachePath.resolve(fileName)
 
-        fileSystem.sink(filePath).buffer().use { sink ->
-            sink.writeUtf8(content)
+            fileSystem.sink(filePath).buffer().use { sink ->
+                sink.writeUtf8(content)
+            }
         }
     }
 
 
@@ -0,0 +1,61 @@
+package neth.iecal.trease.utils
+
+import io.ktor.client.request.get
+import io.ktor.client.statement.bodyAsChannel
+import io.ktor.utils.io.core.isEmpty
+import io.ktor.utils.io.core.readBytes
+import io.ktor.utils.io.readRemaining
+import neth.iecal.trease.getCacheDir
+import neth.iecal.trease.getFileSystem
+import neth.iecal.trease.getPlatformHttpClient
+import okio.Path.Companion.toPath
+import okio.buffer
+
+
+suspend fun getCachedVideoPath(
+    url: String,
+    videoId: String
+): String {
+
+    val client = getPlatformHttpClient()
+    val fileSystem = getFileSystem()
+
+    val cachePath = getCacheDir().toPath()
+
+    if (!fileSystem.exists(cachePath)) {
+        fileSystem.createDirectories(cachePath)
+    }
+
+    val filePath = cachePath.resolve("$videoId.webm")
+
+    if (fileSystem.exists(filePath)) {
+        return filePath.toString()
+    }
+
+    try {
+        val response = client.get(url)
+        val channel = response.bodyAsChannel()
+
+        val sink = fileSystem.sink(filePath).buffer()
+
+        try {
+            while (!channel.isClosedForRead) {
+                val packet = channel.readRemaining(8_192)
+                while (!packet.isEmpty) {
+                    sink.write(packet.readBytes())
+                }
+            }
+        } finally {
+            sink.flush()
+            sink.close()
+        }
+
+    } catch (e: Exception) {
+        if (fileSystem.exists(filePath)) {
+            fileSystem.delete(filePath)
+        }
+        throw e
+    }
+
+    return filePath.toString()
+}