cf-files: correctly handle duplicate file refs (#421)

itzg · Apr 27, 2024 · 466c00b · 466c00b
1 parent d55e8f8
commit 466c00b
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 2 deletions.
diff --git a/src/main/java/me/itzg/helpers/curseforge/CurseForgeFilesCommand.java b/src/main/java/me/itzg/helpers/curseforge/CurseForgeFilesCommand.java
@@ -199,7 +199,12 @@ private static Map<ModFileIds, FileEntry> buildPreviousFilesFromManifest(CurseFo
             oldManifest.getEntries().stream()
                 .collect(Collectors.toMap(
                     FileEntry::getIds,
-                    fileEntry -> fileEntry
+                    fileEntry -> fileEntry,
+                    // merge by picking first
+                    (t, t2) -> {
+                        log.warn("Duplicate files detected in previous manifest: {} vs {}", t, t2);
+                        return t;
+                    }
                 ))
             : Collections.emptyMap();
     }

diff --git a/src/main/java/me/itzg/helpers/curseforge/ModFileRefResolver.java b/src/main/java/me/itzg/helpers/curseforge/ModFileRefResolver.java
@@ -66,6 +66,7 @@ public Mono<List<CurseForgeFile>> resolveModFiles(List<String> modFileRefs, Stri
     @NotNull
     private static Flux<String> expandFileListings(List<String> modFileRefs) {
         return Flux.fromStream(modFileRefs.stream()
+                .distinct()
                 // handle @-file containing refs
                 .flatMap(ref -> {
                     if (ref.startsWith("@")) {

diff --git a/src/main/java/me/itzg/helpers/files/Manifests.java b/src/main/java/me/itzg/helpers/files/Manifests.java
@@ -144,7 +144,7 @@ public static <M extends BaseManifest> M load(Path outputDir, String id, Class<M
         }
     }
 
-    private static Path buildManifestPath(Path outputDir, String id) {
+    public static Path buildManifestPath(Path outputDir, String id) {
         return outputDir.resolve(String.format(
             ".%s-manifest%s", id, SUFFIX
         ));

diff --git a/src/test/java/me/itzg/helpers/curseforge/CurseForgeFilesCommandTest.java b/src/test/java/me/itzg/helpers/curseforge/CurseForgeFilesCommandTest.java
@@ -1,14 +1,24 @@
 package me.itzg.helpers.curseforge;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.Collections;
+import me.itzg.helpers.curseforge.model.CurseForgeFile;
+import me.itzg.helpers.curseforge.model.CurseForgeMod;
+import me.itzg.helpers.curseforge.model.FileIndex;
+import me.itzg.helpers.curseforge.model.ModsSearchResponse;
+import me.itzg.helpers.files.Manifests;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.io.TempDir;
@@ -107,4 +117,83 @@ void usingListingFile() throws IOException {
         assertThat(tempDir.resolve("plugins/worldguard-bukkit-7.0.7-dist.jar")).exists();
 
     }
+
+    @Test
+    void handlesDuplicateManifestEntries() throws IOException {
+        final Path manifestFile = Files.write(tempDir.resolve(Manifests.buildManifestPath(tempDir, CurseForgeFilesManifest.ID)), ("{\n"
+            + "  \"@type\": \"me.itzg.helpers.curseforge.CurseForgeFilesManifest\",\n"
+            + "  \"timestamp\": \"2024-04-27T17:48:56.529386300Z\",\n"
+            + "  \"files\": null,\n"
+            + "  \"entries\": [\n"
+            + "    {\n"
+            + "      \"ids\": {\n"
+            + "        \"modId\": 667389,\n"
+            + "        \"fileId\": 4802504\n"
+            + "      },\n"
+            + "      \"filePath\": \"mods\\\\goblintraders-fabric-1.20.1-1.9.3.jar\"\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"ids\": {\n"
+            + "        \"modId\": 667389,\n"
+            + "        \"fileId\": 4802504\n"
+            + "      },\n"
+            + "      \"filePath\": \"mods\\\\goblintraders-fabric-1.20.1-1.9.3.jar\"\n"
+            + "    }\n"
+            + "  ]\n"
+            + "}").getBytes(StandardCharsets.UTF_8));
+
+        wm.stubFor(get(urlPathEqualTo("/v1/mods/search"))
+            .withQueryParam("gameId", WireMock.equalTo("432"))
+            .withQueryParam("slug", WireMock.equalTo("goblintraders-fabric"))
+            .withQueryParam("classId", WireMock.equalTo("6"))
+            .willReturn(
+                jsonResponse(new ModsSearchResponse()
+                    .setData(singletonList(
+                        new CurseForgeMod()
+                            .setId(667389)
+                            .setClassId(6)
+                            .setGameId(432)
+                            .setLatestFilesIndexes(singletonList(
+                                new FileIndex()
+                                    .setGameVersion("1.20.1")
+                                    .setFileId(4802504)
+                            ))
+                            .setLatestFiles(singletonList(
+                                new CurseForgeFile()
+                                    .setId(4802504)
+                                    .setModId(667389)
+                                    .setDependencies(Collections.emptyList())
+                                    // reference cdn.json declaration
+                                    .setDownloadUrl(wm.baseUrl() + "/files/goblintraders-fabric-1.20.1-1.9.3.jar")
+                                    .setFileName("goblintraders-fabric-1.20.1-1.9.3.jar")
+                            ))
+                    )), 200)
+            )
+        );
+
+        int exitCode = new CommandLine(
+            new CurseForgeFilesCommand()
+        )
+            .setCaseInsensitiveEnumValuesAllowed(true)
+            .execute(
+                "--api-base-url", wm.baseUrl(),
+                "--api-key", "test",
+                "--output-directory", tempDir.toString(),
+                "--default-category", "mc-mods",
+                "--game-version=1.20.1",
+                "--mod-loader=fabric",
+                "https://www.curseforge.com/minecraft/mc-mods/goblintraders-fabric",
+                "https://www.curseforge.com/minecraft/mc-mods/goblintraders-fabric"
+            );
+
+        assertThat(exitCode).isEqualTo(0);
+
+        assertThat(manifestFile)
+            .exists();
+
+        final CurseForgeFilesManifest manifest = Manifests.load(tempDir, CurseForgeFilesManifest.ID, CurseForgeFilesManifest.class);
+        assertThat(manifest).isNotNull();
+        assertThat(manifest.getEntries()).hasSize(1);
+        assertThat(manifest.getEntries().get(0).getIds()).isEqualTo(new ModFileIds(667389, 4802504));
+    }
 }