Skip to content

cf: when "no matching files found" include retrieved filenames in error #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 12, 2025
Merged

cf: when "no matching files found" include retrieved filenames in error #557

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/main/java/me/itzg/helpers/curseforge/CurseForgeApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
import java.time.Duration;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import me.itzg.helpers.cache.ApiCaching;
import me.itzg.helpers.curseforge.model.Category;
Expand Down Expand Up @@ -174,19 +176,25 @@ public CurseForgeFile resolveModpackFile(
.toObject(GetModFilesResponse.class)
.execute();

return resp.getData().stream()
final List<CurseForgeFile> files = resp.getData();

return files.stream()
.filter(file ->
// even though we're preparing a server, we need client modpack to get deterministic manifest layout
!file.isServerPack() &&
(fileMatcher == null || file.getFileName().contains(fileMatcher)))
.findFirst()
.orElseThrow(() -> {
final String names = files.stream()
.map(CurseForgeFile::getFileName)
.collect(Collectors.joining(","));

log.debug("No matching files for mod id={} name={} trying fileMatcher={}, sample of latest files={}",
mod.getId(), mod.getName(),
fileMatcher, mod.getLatestFiles()
);
return new GenericException(String.format("No matching files found for mod '%s' (%d) using fileMatcher '%s'",
mod.getSlug(), mod.getId(), fileMatcher)
return new GenericException(String.format("No matching files found for mod '%s' (%d) using fileMatcher '%s': %s",
mod.getSlug(), mod.getId(), fileMatcher, names)
);
});
}
Expand Down