1 files changed, 26 insertions, 38 deletions

diff --git a/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java b/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java
index 75d3791..775bd3e 100644
--- a/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java
+++ b/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java
@@ -1,47 +1,35 @@
 package cuchaz.enigma.command;
 
+import cuchaz.enigma.throwables.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
+import cuchaz.enigma.utils.Utils;
 
-import java.io.File;
+import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Locale;
+import java.nio.file.Paths;
 
 public class ConvertMappingsCommand extends Command {
-
-        public ConvertMappingsCommand() {
-                super("convertmappings");
-        }
-
-        @Override
-        public String getUsage() {
-                return "<enigma mappings> <converted mappings> <ENIGMA_FILE|ENIGMA_DIRECTORY|SRG_FILE>";
-        }
-
-        @Override
-        public boolean isValidArgument(int length) {
-                return length == 3;
-        }
-
-        @Override
-        public void run(String... args) throws Exception {
-                Path fileMappings = getReadablePath(getArg(args, 0, "enigma mappings", true));
-                File result = getWritableFile(getArg(args, 1, "converted mappings", true));
-                String name = getArg(args, 2, "format desc", true);
-                MappingFormat saveFormat;
-                try {
-                        saveFormat = MappingFormat.valueOf(name.toUpperCase(Locale.ROOT));
-                } catch (IllegalArgumentException e) {
-                        throw new IllegalArgumentException(name + "is not a valid mapping format!");
-                }
-
-                System.out.println("Reading mappings...");
-
-                MappingFormat readFormat = chooseEnigmaFormat(fileMappings);
-                EntryTree<EntryMapping> mappings = readFormat.read(fileMappings, new ConsoleProgressListener());
-                System.out.println("Saving new mappings...");
-
-                saveFormat.write(mappings, result.toPath(), new ConsoleProgressListener());
-        }
+    public ConvertMappingsCommand() {
+        super("convert-mappings");
+    }
+
+    @Override
+    public String getUsage() {
+        return "<source-format> <source> <result-format> <result>";
+    }
+
+    @Override
+    public boolean isValidArgument(int length) {
+        return length == 4;
+    }
+
+    @Override
+    public void run(String... args) throws IOException, MappingParseException {
+        EntryTree<EntryMapping> mappings = MappingCommandsUtil.read(args[0], Paths.get(args[1]));
+
+        Path output = Paths.get(args[3]);
+        Utils.delete(output);
+        MappingCommandsUtil.write(mappings, args[2], output);
+    }
 }