Skip to content

modrinth: fail when a requested project is not available for loader+game version #248

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
Jun 17, 2023
Merged

modrinth: fail when a requested project is not available for loader+game version #248

Show file tree
Hide file tree
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
27 changes: 17 additions & 10 deletions src/main/java/me/itzg/helpers/modrinth/ModrinthApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
package me.itzg.helpers.modrinth;

import static me.itzg.helpers.http.Uris.QueryParameters.queryParameters;

import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
import java.util.List;
import me.itzg.helpers.errors.GenericException;
import me.itzg.helpers.errors.InvalidParameterException;
import me.itzg.helpers.http.Fetch;
import me.itzg.helpers.http.FileDownloadedHandler;
import me.itzg.helpers.http.SharedFetch;
Expand All @@ -12,15 +21,6 @@
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;

import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
import java.util.List;

import static me.itzg.helpers.http.Uris.QueryParameters.queryParameters;

public class ModrinthApiClient implements AutoCloseable {

private final UriBuilder uriBuilder;
Expand Down Expand Up @@ -118,7 +118,14 @@ public Mono<List<Version>> getVersionsForProject(String projectIdOrSlug,
)
)
.toObjectList(Version.class)
.assemble();
.assemble()
.flatMap(versions ->
versions.isEmpty() ? Mono.error(new InvalidParameterException(
String.format("No files are available for the project %s for loader %s and Minecraft version %s",
projectIdOrSlug, loader, gameVersion
)))
: Mono.just(versions)
);
}

public Mono<Version> getVersionFromId(String versionId) {
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/me/itzg/helpers/modrinth/ModrinthCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,12 @@ else if (projectRef.hasVersionId()) {
}
else {
final List<Version> versions = getVersionsForProject(project.getId());
if (versions.isEmpty()) {
throw new InvalidParameterException(
String.format("No files are available for the project '%s' (%s) for %s loader and Minecraft version %s",
project.getTitle(), project.getSlug(), loader, gameVersion
));
}
return pickVersion(versions);
}
}
Expand Down