fix: make sure DataFetcher only runs once at a time

Skytils · May 16, 2024 · 26ed9bb · 26ed9bb
1 parent 205edae
commit 26ed9bb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/main/kotlin/gg/skytils/skytilsmod/commands/impl/SkytilsCommand.kt b/src/main/kotlin/gg/skytils/skytilsmod/commands/impl/SkytilsCommand.kt
@@ -134,7 +134,8 @@ object SkytilsCommand : BaseCommand("skytils", listOf("st")) {
                 } else {
                     when (args[1].lowercase()) {
                         "data" -> {
-                            DataFetcher.reloadData().invokeOnCompletion {
+                            DataFetcher.reloadData()
+                            DataFetcher.job?.invokeOnCompletion {
                                 it?.run {
                                     UChat.chat("$failPrefix §cFailed to reload repository data due to a ${it::class.simpleName ?: "error"}: ${it.message}!")
                                 }.ifNull {

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/core/DataFetcher.kt b/src/main/kotlin/gg/skytils/skytilsmod/core/DataFetcher.kt
@@ -51,6 +51,8 @@ import kotlin.concurrent.fixedRateTimer
 import kotlin.reflect.jvm.jvmName
 
 object DataFetcher {
+    var job: Job? = null
+
     private fun loadData(): Job {
         return Skytils.IO.launch {
             try {
@@ -213,8 +215,13 @@ object DataFetcher {
         }
 
     @JvmStatic
-    fun reloadData() =
-        loadData()
+    fun reloadData() {
+        if (job?.isActive != true) {
+            job = loadData()
+        } else {
+            UChat.chat("$failPrefix §cData fetch requested while already fetching!")
+        }
+    }
 
     internal fun preload() {}
 

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/SummonSkins.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/SummonSkins.kt
@@ -26,11 +26,12 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.utils.io.jvm.javaio.*
 import kotlinx.coroutines.launch
+import java.util.concurrent.ConcurrentHashMap
 import javax.imageio.ImageIO
 
 object SummonSkins {
     // maps name to url
-    val skinMap = HashMap<String, String>()
+    val skinMap = ConcurrentHashMap<String, String>()
 
     // maps name to dynamic resource
     val skintextureMap = HashMap<String, DynamicResource>()