Skip to content

cf: cleanup remaining parallelism that's redundant #201

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
Apr 14, 2023
Merged

cf: cleanup remaining parallelism that's redundant #201

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
6 changes: 0 additions & 6 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 @@ -71,10 +71,6 @@ public class CurseForgeInstaller {
@Getter @Setter
private String apiKey;

@Getter
@Setter
private int parallelism = 4;

@Getter
@Setter
private boolean forceSynchronize;
Expand Down Expand Up @@ -506,7 +502,6 @@ private Mono<Set<Integer>> resolveFromSlugOrIds(
safeStreamFrom(global), safeStreamFrom(specific)
)
)
.parallel(parallelism)
.flatMap(s -> {
try {
final int id = Integer.parseInt(s);
Expand All @@ -515,7 +510,6 @@ private Mono<Set<Integer>> resolveFromSlugOrIds(
return context.cfApi.slugToId(categoryInfo, s);
}
})
.sequential()
.collect(Collectors.toSet());
}

Expand Down
27 changes: 10 additions & 17 deletions src/main/java/me/itzg/helpers/curseforge/InstallCurseForgeCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
package me.itzg.helpers.curseforge;

import me.itzg.helpers.files.ResultsFileWriter;
import me.itzg.helpers.http.PathOrUri;
import me.itzg.helpers.http.PathOrUriConverter;
import me.itzg.helpers.http.SharedFetchArgs;
import me.itzg.helpers.json.ObjectMappers;
import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command;
import picocli.CommandLine.ExitCode;
import picocli.CommandLine.Option;
import static me.itzg.helpers.http.Fetch.fetch;

import java.io.IOException;
import java.nio.file.Path;
Expand All @@ -18,8 +10,15 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static me.itzg.helpers.http.Fetch.fetch;
import me.itzg.helpers.files.ResultsFileWriter;
import me.itzg.helpers.http.PathOrUri;
import me.itzg.helpers.http.PathOrUriConverter;
import me.itzg.helpers.http.SharedFetchArgs;
import me.itzg.helpers.json.ObjectMappers;
import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command;
import picocli.CommandLine.ExitCode;
import picocli.CommandLine.Option;

@Command(name = "install-curseforge", subcommands = {
SchemasCommand.class
Expand Down Expand Up @@ -109,11 +108,6 @@ static class Listed {
@Option(names = "--force-synchronize")
boolean forceSynchronize;

@Option(names = "--parallel-downloads", defaultValue = "4",
description = "Default: ${DEFAULT-VALUE}"
)
int parallelDownloads;

@Option(names = "--set-level-from",
description = "When WORLD_FILE, a world file included the modpack will be unzipped into a folder under 'saves' and referenced as 'LEVEL' in the results file."
+ "\nWhen OVERRIDES and the overrides contains a world save directory (contains level.dat), then that directory will be referenced as 'LEVEL' in the results file."
Expand Down Expand Up @@ -169,7 +163,6 @@ public Integer call() throws Exception {
final CurseForgeInstaller installer = new CurseForgeInstaller(outputDirectory, resultsFile)
.setExcludeIncludes(excludeIncludes)
.setForceSynchronize(forceSynchronize)
.setParallelism(parallelDownloads)
.setLevelFrom(levelFrom)
.setOverridesSkipExisting(overridesSkipExisting)
.setSharedFetchOptions(sharedFetchArgs.options())
Expand Down