3 files changed, 98 insertions, 29 deletions

diff --git a/build.gradle b/build.gradle
index 26405bd0..ca256805 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'maven'
 
 group = 'cuchaz'
-version = '0.13.2'
+version = '0.14.0'
 
 def generatedSourcesDir = "$buildDir/generated-src"
 
@@ -91,6 +91,8 @@ dependencies {
     compile 'org.ow2.asm:asm-tree:7.1'
     compile 'org.ow2.asm:asm-util:7.1'
 
+    compile 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
+
     application name: "darcula", version: "1.0.0"
     application 'de.sciss:syntaxpane:1.2.+'
     application 'me.xdrop:fuzzywuzzy:1.2.0'
diff --git a/src/main/java/cuchaz/enigma/Main.java b/src/main/java/cuchaz/enigma/Main.java
index 76a3fff0..a6428405 100644
--- a/src/main/java/cuchaz/enigma/Main.java
+++ b/src/main/java/cuchaz/enigma/Main.java
@@ -12,48 +12,97 @@
 package cuchaz.enigma;
 
 import cuchaz.enigma.gui.Gui;
+import cuchaz.enigma.gui.GuiController;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
+import joptsimple.*;
 
-import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 public class Main {
 
-        public static void main(String[] args) throws Exception {
-                Gui gui = new Gui();
+        public static void main(String[] args) throws IOException {
+                OptionParser parser = new OptionParser();
 
-                // parse command-line args
-                if (args.length >= 1) {
-                        gui.getController().openJar(getFile(args[0]).toPath());
-                }
-                if (args.length >= 2) {
-                        Path mappingsFile = getFile(args[1]).toPath();
-                        if (Files.isDirectory(mappingsFile)) {
-                                gui.getController().openMappings(MappingFormat.ENIGMA_DIRECTORY, mappingsFile);
-                        } else {
-                                gui.getController().openMappings(MappingFormat.ENIGMA_FILE, mappingsFile);
+                OptionSpec<Path> jar = parser.accepts("jar", "Jar file to open at startup")
+                                .withRequiredArg()
+                                .withValuesConvertedBy(PathConverter.INSTANCE);
+
+                OptionSpec<Path> mappings = parser.accepts("mappings", "Mappings file to open at startup")
+                                .withRequiredArg()
+                                .withValuesConvertedBy(PathConverter.INSTANCE);
+
+                OptionSpec<Path> profile = parser.accepts("profile", "Profile json to apply at startup")
+                                .withRequiredArg()
+                                .withValuesConvertedBy(PathConverter.INSTANCE);
+
+                parser.accepts("help", "Displays help information");
+
+                try {
+                        OptionSet options = parser.parse(args);
+
+                        if (options.has("help")) {
+                                parser.printHelpOn(System.out);
+                                return;
+                        }
+
+                        Gui gui = new Gui();
+                        GuiController controller = gui.getController();
+
+                        if (options.has(jar)) {
+                                Path jarPath = options.valueOf(jar);
+                                controller.openJar(jarPath);
                         }
-                }
 
-                // DEBUG
-                //gui.getController().openDeclaration(new ClassEntry("none/byp"));
+                        if (options.has(mappings)) {
+                                Path mappingsPath = options.valueOf(mappings);
+                                if (Files.isDirectory(mappingsPath)) {
+                                        controller.openMappings(MappingFormat.ENIGMA_DIRECTORY, mappingsPath);
+                                } else {
+                                        controller.openMappings(MappingFormat.ENIGMA_FILE, mappingsPath);
+                                }
+                        }
+                } catch (OptionException e) {
+                        System.out.println("Invalid arguments: " + e.getMessage());
+                        System.out.println();
+                        parser.printHelpOn(System.out);
+                }
         }
 
-        private static File getFile(String path) {
-                // expand ~ to the home dir
-                if (path.startsWith("~")) {
-                        // get the home dir
-                        File dirHome = new File(System.getProperty("user.home"));
-
-                        // is the path just ~/ or is it ~user/ ?
-                        if (path.startsWith("~/")) {
-                                return new File(dirHome, path.substring(2));
-                        } else {
-                                return new File(dirHome.getParentFile(), path.substring(1));
+        private static class PathConverter implements ValueConverter<Path> {
+                static final ValueConverter<Path> INSTANCE = new PathConverter();
+
+                PathConverter() {
+                }
+
+                @Override
+                public Path convert(String path) {
+                        // expand ~ to the home dir
+                        if (path.startsWith("~")) {
+                                // get the home dir
+                                Path dirHome = Paths.get(System.getProperty("user.home"));
+
+                                // is the path just ~/ or is it ~user/ ?
+                                if (path.startsWith("~/")) {
+                                        return dirHome.resolve(path.substring(2));
+                                } else {
+                                        return dirHome.getParent().resolve(path.substring(1));
+                                }
                         }
+
+                        return Paths.get(path);
                 }
 
-                return new File(path);
+                @Override
+                public Class<? extends Path> valueType() {
+                        return Path.class;
+                }
+
+                @Override
+                public String valuePattern() {
+                        return "path";
+                }
         }
 }
diff --git a/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java b/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java
index af0cf30b..c580f093 100644
--- a/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java
+++ b/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java
@@ -1,9 +1,27 @@
 package cuchaz.enigma.api.service;
 
+import com.google.common.base.Strings;
+import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 public interface ObfuscationTestService extends EnigmaService {
         EnigmaServiceType<ObfuscationTestService> TYPE = EnigmaServiceType.create("obfuscation_test");
 
         boolean testDeobfuscated(Entry<?> entry);
+
+        final class Default implements ObfuscationTestService {
+                Default INSTANCE = new Default();
+
+                Default() {
+                }
+
+                @Override
+                public boolean testDeobfuscated(Entry<?> entry) {
+                        if (entry instanceof ClassEntry) {
+                                String packageName = ((ClassEntry) entry).getPackageName();
+                                return Strings.isNullOrEmpty(packageName);
+                        }
+                        return false;
+                }
+        }
 }