summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java')
-rw-r--r--src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java b/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java
index 1f6a069..f57f1fa 100644
--- a/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java
+++ b/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java
@@ -2,6 +2,8 @@ package cuchaz.enigma.command;
2 2
3import cuchaz.enigma.throwables.MappingParseException; 3import cuchaz.enigma.throwables.MappingParseException;
4import cuchaz.enigma.translation.mapping.EntryMapping; 4import cuchaz.enigma.translation.mapping.EntryMapping;
5import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
6import cuchaz.enigma.translation.mapping.MappingSaveParameters;
5import cuchaz.enigma.translation.mapping.tree.EntryTree; 7import cuchaz.enigma.translation.mapping.tree.EntryTree;
6import cuchaz.enigma.utils.Utils; 8import cuchaz.enigma.utils.Utils;
7 9
@@ -26,12 +28,14 @@ public class ComposeMappingsCommand extends Command {
26 28
27 @Override 29 @Override
28 public void run(String... args) throws IOException, MappingParseException { 30 public void run(String... args) throws IOException, MappingParseException {
29 EntryTree<EntryMapping> left = MappingCommandsUtil.read(args[0], Paths.get(args[1])); 31 MappingSaveParameters saveParameters = new MappingSaveParameters(MappingFileNameFormat.BY_DEOBF);
30 EntryTree<EntryMapping> right = MappingCommandsUtil.read(args[2], Paths.get(args[3])); 32
33 EntryTree<EntryMapping> left = MappingCommandsUtil.read(args[0], Paths.get(args[1]), saveParameters);
34 EntryTree<EntryMapping> right = MappingCommandsUtil.read(args[2], Paths.get(args[3]), saveParameters);
31 EntryTree<EntryMapping> result = MappingCommandsUtil.compose(left, right, args[6].equals("left") || args[6].equals("both"), args[6].equals("right") || args[6].equals("both")); 35 EntryTree<EntryMapping> result = MappingCommandsUtil.compose(left, right, args[6].equals("left") || args[6].equals("both"), args[6].equals("right") || args[6].equals("both"));
32 36
33 Path output = Paths.get(args[5]); 37 Path output = Paths.get(args[5]);
34 Utils.delete(output); 38 Utils.delete(output);
35 MappingCommandsUtil.write(result, args[4], output); 39 MappingCommandsUtil.write(result, args[4], output, saveParameters);
36 } 40 }
37} 41}