Wait for all update check taks to be completed

Closes #108
ModManagerMC · Dec 5, 2021 · f0dfb26 · f0dfb26
1 parent f3c7e45
commit f0dfb26
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/src/main/java/xyz/deathsgun/modmanager/mixin/TitleScreenMixin.java b/src/main/java/xyz/deathsgun/modmanager/mixin/TitleScreenMixin.java
@@ -41,7 +41,7 @@ protected TitleScreenMixin(Text title) {
 
     @Inject(at = @At("TAIL"), method = "render")
     public void onRender(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (ModManager.shownUpdateNotification) {
+        if (ModManager.shownUpdateNotification && ModManager.modManager.getUpdate().getFinishedUpdateCheck()) {
             return;
         }
         ModManager.shownUpdateNotification = true;

diff --git a/src/main/kotlin/xyz/deathsgun/modmanager/update/UpdateManager.kt b/src/main/kotlin/xyz/deathsgun/modmanager/update/UpdateManager.kt
@@ -17,14 +17,15 @@
 package xyz.deathsgun.modmanager.update
 
 import com.terraformersmc.modmenu.util.mod.fabric.CustomValueUtil
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import net.fabricmc.loader.api.FabricLoader
 import net.fabricmc.loader.api.metadata.ModMetadata
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.toast.SystemToast
 import net.minecraft.text.TranslatableText
 import org.apache.commons.io.FileUtils
 import org.apache.logging.log4j.LogManager
@@ -51,6 +52,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.security.MessageDigest
 import java.time.Duration
+import java.util.*
 import java.util.zip.ZipFile
 import kotlin.io.path.absolutePathString
 
@@ -62,31 +64,33 @@ class UpdateManager {
     private val http: HttpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(15)).build()
     private val deletableMods = ArrayList<String>()
     val updates = ArrayList<Update>()
+    var finishedUpdateCheck = false
 
     init {
         Runtime.getRuntime().addShutdownHook(Thread(this::saveDeletableFiles))
     }
 
     //region Update Checking
 
-    suspend fun checkUpdates() = coroutineScope {
+    suspend fun checkUpdates() = runBlocking {
         val mods = getCheckableMods()
-        mods.forEach { metadata ->
-            launch {
+        mods.map { metadata ->
+            async {
                 if (findJarByModContainer(metadata) == null) {
                     logger.debug("Skipping update for {} because it has no jar in mods", metadata.id)
-                    return@launch
+                    return@async
                 }
                 val configIds = getIdBy(metadata)
                 if (configIds == null) {
                     logger.debug("Searching for updates for {} using fallback method", metadata.id)
                     checkForUpdatesManually(metadata)
-                    return@launch
+                    return@async
                 }
                 logger.debug("Searching for updates for {} using defined mod id", metadata.id)
                 checkForUpdates(metadata, configIds)
             }
-        }
+        }.awaitAll()
+        finishedUpdateCheck = true
     }
 
     private fun checkForUpdatesManually(metadata: ModMetadata) {
@@ -211,7 +215,12 @@ class UpdateManager {
         when (val modResult = ModManager.modManager.provider[provider.getName().lowercase()]?.getMod(modId)) {
             is ModResult.Success -> {
                 ModManager.modManager.setModState(metadata.id, modId, State.OUTDATED)
-                logger.info("Update for {} found [{} -> {}]", metadata.id, metadata.version.friendlyString, version.version)
+                logger.info(
+                    "Update for {} found [{} -> {}]",
+                    metadata.id,
+                    metadata.version.friendlyString,
+                    version.version
+                )
                 this.updates.add(Update(modResult.mod, metadata.id, metadata.version.friendlyString, version))
             }
             is ModResult.Error -> {