Minor changes

- trying to delete files on delete
- mark all mods on update check as installed
- also check names

Signed-off-by: DeathsGun <deathsgun@protonmail.com>

Author: DeathsGun

src/main/kotlin/xyz/deathsgun/modmanager/models/FabricMetadata.kt

@@ -21,6 +21,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class FabricMetadata(
     val id: String,
+    val name: String,
     val custom: Custom = Custom(emptyMap())
 ) {
     @Serializable

src/main/kotlin/xyz/deathsgun/modmanager/update/UpdateManager.kt

@@ -27,7 +27,6 @@ import net.fabricmc.loader.api.SemanticVersion
 import net.fabricmc.loader.api.metadata.ModMetadata
 import net.fabricmc.loader.util.version.VersionDeserializer
 import net.minecraft.text.TranslatableText
-import net.minecraft.util.Util
 import org.apache.commons.io.FileUtils
 import org.apache.logging.log4j.LogManager
 import xyz.deathsgun.modmanager.ModManager
@@ -52,9 +51,8 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.security.MessageDigest
 import java.time.Duration
-import java.util.concurrent.TimeUnit
 import java.util.zip.ZipFile
-import kotlin.io.path.name
+import kotlin.io.path.absolutePathString
 
 
 class UpdateManager {
@@ -87,6 +85,7 @@ class UpdateManager {
     }
 
     private fun checkForUpdatesManually(metadata: ModMetadata) {
+        ModManager.modManager.setModState(metadata.id, metadata.id, ModState.INSTALLED)
         val defaultProvider = ModManager.modManager.config.defaultProvider
         val provider = ModManager.modManager.provider[defaultProvider]
         if (provider == null) {
@@ -159,6 +158,7 @@ class UpdateManager {
     }
 
     private fun checkForUpdates(metadata: ModMetadata, ids: Map<String, String>) {
+        ModManager.modManager.setModState(metadata.id, metadata.id, ModState.INSTALLED)
         var provider: IModUpdateProvider? = null
         var id: String? = null
         for ((provId, modId) in ids) {
@@ -293,7 +293,7 @@ class UpdateManager {
             ?: return ModUpdateResult.Error(TranslatableText("modmanager.error.jar.notFound"))
         logger.info("Updating {}", update.mod.name)
         try {
-            oldJar.forceDelete()
+            oldJar.delete()
         } catch (e: Exception) {
             return ModUpdateResult.Error(TranslatableText("modmanager.error.jar.failedDelete", e))
         }
@@ -337,7 +337,9 @@ class UpdateManager {
                 val meta = json.decodeFromString<FabricMetadata>(data)
                 jarFile.close()
                 if (meta.id == mod.id || meta.id == mod.slug || meta.id == mod.slug.replace("-", "") ||
-                    meta.custom.modmanager[ModManager.modManager.config.defaultProvider] == mod.id
+                    meta.custom.modmanager[ModManager.modManager.config.defaultProvider] == mod.id ||
+                    meta.id.replace("_", "-") == mod.id ||
+                    meta.name.equals(mod.name, true)
                 ) {
                     return jar.toPath()
                 }
@@ -360,22 +362,21 @@ class UpdateManager {
         return ids
     }
 
-    private fun getCheckableMods(): List<ModMetadata> {
+    fun getCheckableMods(): List<ModMetadata> {
         return FabricLoader.getInstance().allMods.map { it.metadata }.filter {
             !it.id.startsWith("fabric") &&
                     !CustomValueUtil.getBoolean("fabric-loom:generated", it).orElse(false) &&
                     !blockedIds.contains(it.id)
         }
     }
 
-    private fun Path.forceDelete() {
-        if (Util.getOperatingSystem() == Util.OperatingSystem.WINDOWS) {
-            // Under windows this file gets locked can't be deleted by Java
-            ProcessBuilder("cmd", "/c", "del /f ${this.name}").directory(this.parent.toFile()).start()
-                .waitFor(200, TimeUnit.MILLISECONDS)
-            return
+    private fun Path.delete() {
+        try {
+            Files.delete(this)
+        } catch (e: Exception) {
+            logger.info("Error while deleting {} trying on exit again", this.absolutePathString())
+            this.toFile().deleteOnExit()
         }
-        Files.deleteIfExists(this)
     }
 
     private fun Path.sha512(): String {
@@ -393,7 +394,7 @@ class UpdateManager {
         val jar = findJarByMod(mod)
             ?: return ModRemoveResult.Error(TranslatableText("modmanager.error.jar.notFound"))
         return try {
-            jar.forceDelete()
+            jar.delete()
             ModManager.modManager.setModState(mod.slug, mod.id, ModState.DOWNLOADABLE)
             ModRemoveResult.Success
         } catch (e: Exception) {

src/main/resources/assets/modmanager/config.json

@@ -10,7 +10,8 @@
   "modmanager.button.updateChannel": "Update channel",
   "modmanager.button.save": "Save",
   "modmanager.categories": "Categories",
-  "modmanager.category.updatable": "Updatable Mods",
+  "modmanager.category.updatable": "Updatable mods",
+  "modmanager.category.installed": "Installed mods",
   "modmanager.category.technology": "Technology",
   "modmanager.category.adventure": "Adventure",
   "modmanager.category.magic": "Magic",
@@ -39,6 +40,7 @@
   "modmanager.error.network": "Network error while retrieving data:\n %s",
   "modmanager.error.failedToParse": "Failed to parse response:\n %s",
   "modmanager.error.noCompatibleModVersionFound": "No compatible version found for your current channel!\nTry changing the channel in the Mod Manager settings!",
+  "modmanager.error.jar.notFound": "Error jar file not found. Is it part of another mod?",
   "modmanager.status.installing": "Installing %s...",
   "modmanager.status.install.success": "Successfully installed %s!\nDo you want to go back?",
   "modmanager.status.updating": "Updating %s...",