Skip to content

Commit 8f402fb

Browse files
committed
Add ImportParser and import controller to CommandsFactory
1 parent ab44cff commit 8f402fb

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

src/main/java/org/hydev/mcpm/client/arguments/CommandsFactory.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
import org.hydev.mcpm.client.arguments.parsers.*;
66
import org.hydev.mcpm.client.commands.controllers.*;
77
import org.hydev.mcpm.client.display.presenters.LogExportPresenter;
8+
import org.hydev.mcpm.client.display.presenters.LogImportPresenter;
89
import org.hydev.mcpm.client.display.progress.ProgressBarFetcherListener;
910
import org.hydev.mcpm.client.export.ExportInteractor;
11+
import org.hydev.mcpm.client.export.ImportInteractor;
1012
import org.hydev.mcpm.client.injector.LocalJarFinder;
1113
import org.hydev.mcpm.client.injector.PluginLoader;
1214
import org.hydev.mcpm.client.installer.InstallInteractor;
@@ -61,6 +63,7 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
6163
// Controllers
6264
var exportPluginsController = new ExportController(
6365
new ExportInteractor(tracker), new LogExportPresenter());
66+
var importController = new ImportController(new ImportInteractor(installer), new LogImportPresenter());
6467
var listController = new ListController(new ListAllInteractor(tracker));
6568
var searchController = new SearchPackagesController(searcher, pager);
6669
var mirrorController = new MirrorController(mirror);

src/main/java/org/hydev/mcpm/client/arguments/parsers/ExportPluginsParser.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,8 @@
1010
/**
1111
* Parser for the ExportPluginsBoundary interface.
1212
*/
13-
public class ExportPluginsParser implements CommandParser
13+
public record ExportPluginsParser(ExportController controller) implements CommandParser
1414
{
15-
private final ExportController controller;
16-
17-
public ExportPluginsParser(ExportController controller)
18-
{
19-
this.controller = controller;
20-
}
21-
2215
@Override
2316
public String name()
2417
{

src/main/java/org/hydev/mcpm/client/arguments/parsers/ImportParser.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
import net.sourceforge.argparse4j.inf.Namespace;
44
import net.sourceforge.argparse4j.inf.Subparser;
5+
import org.hydev.mcpm.client.commands.controllers.ImportController;
6+
import org.hydev.mcpm.client.export.ImportInput;
57

68
import java.util.function.Consumer;
79

810
/**
911
* Parser for the import use case
1012
*/
11-
public class ImportParser implements CommandParser {
13+
public record ImportParser(ImportController controller) implements CommandParser {
1214
@Override
1315
public String name() {
1416
return "import";
@@ -21,11 +23,15 @@ public String description() {
2123

2224
@Override
2325
public void configure(Subparser parser) {
24-
26+
parser.addArgument("type").nargs("?").choices("pastebin", "file", "literal")
27+
.setDefault("pastebin") // type of input
28+
.type(String.class).dest("type"); // of type OutputStream
29+
parser.addArgument("input").nargs("?")
30+
.type(String.class).dest("input");
2531
}
2632

2733
@Override
2834
public void run(Namespace details, Consumer<String> log) {
29-
35+
controller.importPlugins(new ImportInput(details.get("type"), details.get("input")), log);
3036
}
3137
}

0 commit comments

Comments
 (0)