Get modrinth id by first getting the mod by the fabric id

Closes #18 Signed-off-by: DeathsGun <deathsgun@protonmail.com>
ModManagerMC · Aug 24, 2021 · 99b9eba · 99b9eba
1 parent 364a8fb
commit 99b9eba
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/src/main/java/xyz/deathsgun/modmanager/providers/modrinth/Modrinth.java b/src/main/java/xyz/deathsgun/modmanager/providers/modrinth/Modrinth.java
@@ -116,7 +116,6 @@ private ArrayList<SummarizedMod> getSummarizedMods(int page, int limit, URIBuild
         uriBuilder.addParameter("version", String.format("versions=%s", MinecraftClient.getInstance().getGame().getVersion().getReleaseTarget()));
         uriBuilder.addParameter("offset", String.valueOf(page * limit));
         uriBuilder.addParameter("limit", String.valueOf(limit));
-        logger.info("Using {} for query", uriBuilder.toString());
         HttpRequest request = HttpRequest.newBuilder().GET().setHeader("User-Agent", "ModManager " + ModManager.getVersion())
                 .uri(uriBuilder.build()).build();
         HttpResponse<String> response = this.http.send(request, HttpResponse.BodyHandlers.ofString());

diff --git a/src/main/java/xyz/deathsgun/modmanager/services/ManipulationService.java b/src/main/java/xyz/deathsgun/modmanager/services/ManipulationService.java
@@ -28,7 +28,7 @@ public class ManipulationService extends Thread {
     private final ArrayList<ManipulationTask> tasks = new ArrayList<>();
 
     public ManipulationService() {
-        setName("ModMenu-M");
+        setName("ModMenu");
         start();
     }
 

diff --git a/src/main/java/xyz/deathsgun/modmanager/services/UpdateCheckService.java b/src/main/java/xyz/deathsgun/modmanager/services/UpdateCheckService.java
@@ -46,7 +46,7 @@ public class UpdateCheckService extends Thread {
 
     public UpdateCheckService() {
         super();
-        setName("ModManager-U");
+        setName("ModManager");
     }
 
     @Override
@@ -71,17 +71,27 @@ private void checkForUpdate(ModMetadata metadata) {
             }
             updates.add(new AvailableUpdates(modId, metadata.getId(), version));
         } catch (Exception e) {
-            logger.error("Failed to check for updates for {}", metadata.getId());
+            logger.error("Failed to check for updates for {}: {}", metadata.getId(), e.getMessage());
         }
     }
 
     private String findModId(ModMetadata container) throws Exception {
         IModProvider provider = ModManager.getModProvider();
-        List<SummarizedMod> hits = provider.getMods(container.getName(), 0, 1);
+        try {
+            DetailedMod mod = provider.getMod(container.getId()); // Try mod id most of the time it's also the Modrinth slug
+            return mod.id();
+        } catch (Exception ignored) {
+        }
+        List<SummarizedMod> hits = provider.getMods(container.getName(), 0, 10);
         if (hits.isEmpty()) {
             throw new Exception(String.format("Mod %s not found on %s", container.getId(), provider.getName()));
         }
-        return hits.get(0).id();
+        for (SummarizedMod hit : hits) {
+            if (hit.name().equals(container.getName())) {
+                return hit.id();
+            }
+        }
+        throw new Exception(String.format("Mod %s not found on %s", container.getId(), provider.getName()));
     }
 
     @Nullable
@@ -101,10 +111,11 @@ private ModVersion getUpdateVersion(String modId, ModMetadata container) throws
                 latestVersion = version;
             }
         }
-        if (latest == null || installedVersion.compareTo(latestVersion) > 0) {
+        if (latest == null || installedVersion.compareTo(latestVersion) >= 0) {
             logger.info("No update for {} found!", container.getId());
             return null;
         }
+        logger.info("Found an update for {} {} new version: {}", container.getId(), container.getVersion().toString(), latestVersion.toString());
         return latest;
     }
 

diff --git a/src/main/java/xyz/deathsgun/modmanager/tasks/ModDownloadTask.java b/src/main/java/xyz/deathsgun/modmanager/tasks/ModDownloadTask.java
@@ -37,7 +37,7 @@ protected void execute() throws Exception {
         if (subject == null) {
             throw new Exception("Summarized mod is empty");
         }
-        InstallationUtil.downloadMod(http, InstallationUtil.getVersionForMod(subject));
+        InstallationUtil.downloadMod(http, InstallationUtil.getInstallableVersionForMod(subject));
         ModManager.getModManipulationManager().markManuallyInstalled(subject);
     }
 

diff --git a/src/main/java/xyz/deathsgun/modmanager/tasks/ModUpdateTask.java b/src/main/java/xyz/deathsgun/modmanager/tasks/ModUpdateTask.java
@@ -41,7 +41,7 @@ protected void execute() throws Exception {
         }
         //TODO: Delete file directly
         jar.toFile().deleteOnExit();
-        InstallationUtil.downloadMod(http, InstallationUtil.getVersionForMod(subject));
+        InstallationUtil.downloadMod(http, InstallationUtil.getInstallableVersionForMod(subject));
         ModManager.getModManipulationManager().markManuallyUpdated(subject);
         ModManager.getUpdateChecker().removeUpdate(subject.id());
     }

diff --git a/src/main/java/xyz/deathsgun/modmanager/util/InstallationUtil.java b/src/main/java/xyz/deathsgun/modmanager/util/InstallationUtil.java
@@ -8,6 +8,7 @@
 import xyz.deathsgun.modmanager.api.mod.Asset;
 import xyz.deathsgun.modmanager.api.mod.ModVersion;
 import xyz.deathsgun.modmanager.api.mod.SummarizedMod;
+import xyz.deathsgun.modmanager.api.mod.VersionType;
 import xyz.deathsgun.modmanager.api.provider.IModProvider;
 
 import java.net.URI;
@@ -21,10 +22,11 @@
 
 public class InstallationUtil {
 
-    public static ModVersion getVersionForMod(SummarizedMod mod) throws Exception {
+    public static ModVersion getInstallableVersionForMod(SummarizedMod mod) throws Exception {
         IModProvider provider = ModManager.getModProvider();
         List<ModVersion> versions = provider.getVersionsForMod(mod.id()).stream()
-                .filter(value -> value.gameVersions().contains(MinecraftVersion.GAME_VERSION.getReleaseTarget())).collect(Collectors.toList());
+                .filter(value -> value.gameVersions().contains(MinecraftVersion.GAME_VERSION.getReleaseTarget()))
+                .filter(value -> value.type() == VersionType.RELEASE).collect(Collectors.toList());
         ModVersion latest = null;
         SemanticVersion latestVersion = null;
         for (ModVersion modVersion : versions) {