Load CurseForge browse banners asynchronously

Author: Villagers654

launcher/src/main/java/net/modtale/launcher/api/ModtaleApiClient.java

@@ -23,6 +23,7 @@
 import net.modtale.launcher.model.project.ProjectGallery;
 import net.modtale.launcher.model.project.ProjectMeta;
 import net.modtale.launcher.model.project.ProjectPage;
+import net.modtale.launcher.model.project.ProjectSummary;
 import net.modtale.launcher.model.project.ProjectVersion;
 import net.modtale.launcher.model.project.ProjectVersionChangelog;
 import net.modtale.launcher.model.project.VersionDependenciesView;
@@ -194,6 +195,10 @@ public ProjectPage searchCurseForgeMods(ProjectSearchQuery query) {
         return nyoCfClient.search(query);
     }
 
+    public ProjectSummary enrichCurseForgeBrowseBanner(ProjectSummary summary) {
+        return nyoCfClient.enrichBrowseBanner(summary);
+    }
+
     public ProjectDetail getCurseForgeProject(long projectId) {
         return nyoCfClient.project(projectId);
     }

launcher/src/main/java/net/modtale/launcher/api/NyoCfClient.java

@@ -116,6 +116,27 @@ ProjectDetail project(long projectId) {
                 Map.of(), false, false, null, versions(files, website, null), List.of(), List.of());
     }
 
+    ProjectSummary enrichBrowseBanner(ProjectSummary summary) {
+        if (summary == null || !summary.isCurseForge()
+                || (summary.bannerUrl() != null && !summary.bannerUrl().isBlank())) {
+            return summary;
+        }
+        try {
+            long projectId = summary.curseForgeProjectId();
+            JsonNode project = metadata(projectId);
+            validateProject(project, projectId);
+            String bannerUrl = firstScreenshot(project, "thumbnail_url");
+            if (bannerUrl == null) return summary;
+            return new ProjectSummary(
+                    summary.id(), summary.slug(), summary.title(), summary.description(), summary.authorId(),
+                    summary.author(), summary.imageUrl(), bannerUrl, summary.classification(), summary.downloadCount(),
+                    summary.favoriteCount(), summary.updatedAt(), summary.versions(), summary.source(),
+                    summary.websiteUrl(), summary.distributionAllowed());
+        } catch (RuntimeException ignored) {
+            return summary;
+        }
+    }
+
     DownloadUrlResponse download(long projectId, long fileId) {
         JsonNode file = get("/api/v1/hytale/mods/" + positive(projectId) + "/files/" + positive(fileId));
         if (file.path("mod_id").asLong() != projectId || file.path("game_id").asLong() != HYTALE_GAME_ID

launcher/src/main/java/net/modtale/launcher/ui/browse/ProjectBrowseController.java

@@ -69,6 +69,7 @@ public final class ProjectBrowseController {
 
     private static final double RESULTS_INDICATOR_WIDTH = 126;
     private static final double RESULTS_INDICATOR_SHOW_BUFFER = 10;
+    private static final int CURSEFORGE_BANNER_BATCH_SIZE = 4;
     private final ModtaleApiClient apiClient;
     private final Executor executor;
     private final Runnable applySettings;
@@ -126,6 +127,7 @@ public final class ProjectBrowseController {
     private int currentPage;
     private int totalPageCount;
     private long totalResultCount;
+    private long bannerEnrichmentGeneration;
     private BrowseOptions.BrowseViewOption activeBrowseView = BrowseOptions.BrowseViewOption.defaultOption();
 
     public ProjectBrowseController(
@@ -812,13 +814,56 @@ private void finishSearch(ProjectPage page, ProjectSearchQuery query) {
         updateResultsIndicator(totalResultCount, false);
         updatePaginationControls();
         renderProjects();
+        if (sourceSelector.source() == ProjectBrowseSource.CURSEFORGE) {
+            loadCurseForgeBanners(++bannerEnrichmentGeneration, page.content());
+        } else {
+            bannerEnrichmentGeneration++;
+        }
         log.accept("Found " + page.content().size() + " projects.");
         ProjectSearchQuery nextQuery = searchQuery();
         if (!nextQuery.equals(query) && searchState.shouldSearchForLayout(nextQuery, currentProjects)) {
             requestProjects();
         }
     }
 
+    private void loadCurseForgeBanners(long generation, List<ProjectSummary> projects) {
+        List<ProjectSummary> missing = projects.stream()
+                .filter(ProjectSummary::isCurseForge)
+                .filter(project -> project.bannerUrl() == null || project.bannerUrl().isBlank())
+                .toList();
+        loadCurseForgeBannerBatch(generation, missing, 0);
+    }
+
+    private void loadCurseForgeBannerBatch(long generation, List<ProjectSummary> projects, int start) {
+        if (start >= projects.size() || generation != bannerEnrichmentGeneration) return;
+        int end = Math.min(start + CURSEFORGE_BANNER_BATCH_SIZE, projects.size());
+        List<CompletableFuture<ProjectSummary>> requests = projects.subList(start, end).stream()
+                .map(project -> CompletableFuture.supplyAsync(
+                        () -> apiClient.enrichCurseForgeBrowseBanner(project), executor))
+                .toList();
+        CompletableFuture.allOf(requests.toArray(CompletableFuture[]::new))
+                .whenComplete((ignored, error) -> Platform.runLater(() -> {
+                    if (error != null || generation != bannerEnrichmentGeneration
+                            || sourceSelector.source() != ProjectBrowseSource.CURSEFORGE) {
+                        return;
+                    }
+                    Map<String, ProjectSummary> enriched = new LinkedHashMap<>();
+                    for (CompletableFuture<ProjectSummary> request : requests) {
+                        ProjectSummary project = request.getNow(null);
+                        if (project != null && project.bannerUrl() != null && !project.bannerUrl().isBlank()) {
+                            enriched.put(project.id(), project);
+                        }
+                    }
+                    if (!enriched.isEmpty()) {
+                        currentProjects = currentProjects.stream()
+                                .map(project -> enriched.getOrDefault(project.id(), project))
+                                .toList();
+                        renderProjects();
+                    }
+                    loadCurseForgeBannerBatch(generation, projects, end);
+                }));
+    }
+
     private void renderProjectsForLayoutChange() {
         if (currentProjects.isEmpty()) {
             return;

launcher/src/test/java/net/modtale/launcher/api/NyoCfClientTest.java

@@ -69,11 +69,13 @@ void mapsBrowseDetailVersionsAndExactVerifiedDownload() {
         client.search(new ProjectSearchQuery("compost", "mods", "Early Access", "downloads",
                 0, 20, null, null, null, null, null, null));
         assertEquals(0, detailRequests.get());
+        var enrichedBrowseProject = client.enrichBrowseBanner(browse.content().getFirst());
         ProjectDetail detail = client.project(1450386);
         DownloadUrlResponse download = client.download(1450386, 8747324);
 
         assertEquals("curseforge:1450386", browse.content().getFirst().routeKey());
         assertEquals(null, browse.content().getFirst().bannerUrl());
+        assertEquals("https://media.forgecdn.net/screenshot-thumb.png", enrichedBrowseProject.bannerUrl());
         assertEquals(2, browseRequests.get());
         assertTrue(browse.content().getFirst().isCurseForge());
         assertEquals("<p>Rich project description</p>", detail.about());