Skip to content

curseforge: ensure query for modpack is not cached too much #180

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
Mar 28, 2023
Merged

curseforge: ensure query for modpack is not cached too much #180

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
16 changes: 11 additions & 5 deletions src/main/java/me/itzg/helpers/curseforge/CurseForgeInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -69,6 +70,8 @@ public class CurseForgeInstaller {
public static final int LEVEL_DAT_SUFFIX_LEN = LEVEL_DAT_SUFFIX.length();
public static final String CATEGORY_SLUG_MODPACKS = "modpacks";

private static final Duration QUERY_CACHE_RESOLUTION = Duration.ofMinutes(5);

private final Path outputDir;
private final Path resultsFile;

Expand Down Expand Up @@ -115,8 +118,10 @@ public void install(String slug, String fileMatcher, Integer fileId) throws IOEx
final CategoryInfo categoryInfo = loadCategoryInfo(preparedFetch, uriBuilder);

final ModsSearchResponse searchResponse = preparedFetch.fetch(
uriBuilder.resolve("/mods/search?gameId={gameId}&slug={slug}&classId={classId}",
MINECRAFT_GAME_ID, slug, categoryInfo.modpackClassId
uriBuilder.resolve("/mods/search?gameId={gameId}&slug={slug}&classId={classId}&latest={ts}",
MINECRAFT_GAME_ID, slug, categoryInfo.modpackClassId,
// to ensure search results for new modpacks aren't cached
System.currentTimeMillis() / QUERY_CACHE_RESOLUTION.toMillis()
)
)
.toObject(ModsSearchResponse.class)
Expand Down Expand Up @@ -246,9 +251,10 @@ private static CurseForgeFile resolveModpackFile(SharedFetch preparedFetch, UriB
) {
// NOTE latestFiles in mod is only one or two files, so retrieve the full list instead
final GetModFilesResponse resp = preparedFetch.fetch(
// 'latest' parameter is not recognized by the API but rather used to force it not to return
// a cached listing
uriBuilder.resolve("/mods/{modId}/files?latest={ts}", mod.getId(), System.currentTimeMillis())
uriBuilder.resolve("/mods/{modId}/files?latest={ts}", mod.getId(),
// Force query to not return a cached listing
System.currentTimeMillis()/ QUERY_CACHE_RESOLUTION.toMillis()
)
)
.toObject(GetModFilesResponse.class)
.execute();
Expand Down