Implement Enigma directory format (#1)

Others changes:
~ Rework File menu
~ Force UTF-8 for all I/O operations
~ Enigma now detect the original file format and use the correct one when you save a mapping

6 files changed, 123 insertions, 34 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/Mappings.java b/src/main/java/cuchaz/enigma/mapping/Mappings.java
index b51e1a4..1f4ca02 100644
--- a/src/main/java/cuchaz/enigma/mapping/Mappings.java
+++ b/src/main/java/cuchaz/enigma/mapping/Mappings.java
@@ -24,8 +24,15 @@ public class Mappings {
 
     protected Map<String, ClassMapping> classesByObf;
     protected Map<String, ClassMapping> classesByDeobf;
+    private final FormatType originMapping;
 
-    public Mappings() {
+    public Mappings()
+    {
+        this(FormatType.ENIGMA_DIRECTORY);
+    }
+
+    public Mappings(FormatType originMapping) {
+        this.originMapping = originMapping;
         this.classesByObf = Maps.newHashMap();
         this.classesByDeobf = Maps.newHashMap();
     }
@@ -145,4 +152,14 @@ public class Mappings {
         }
         return mappingChain;
     }
+
+    public FormatType getOriginMappingFormat()
+    {
+        return originMapping;
+    }
+
+    public enum FormatType
+    {
+        JSON_DIRECTORY, ENIGMA_FILE, ENIGMA_DIRECTORY, SRG_FILE
+    }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaReader.java
index 776d908..70f3f18 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaReader.java
@@ -1,23 +1,49 @@
 package cuchaz.enigma.mapping;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.Queues;
+import cuchaz.enigma.throwables.MappingConflict;
+import cuchaz.enigma.throwables.MappingParseException;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
+import java.io.*;
 import java.util.Deque;
 
-import cuchaz.enigma.throwables.MappingConflict;
-import cuchaz.enigma.throwables.MappingParseException;
+public class MappingsEnigmaReader
+{
 
-public class MappingsReaderOld {
+    public Mappings read(File file) throws IOException, MappingParseException {
+        Mappings mappings;
 
-    public Mappings read(Reader in) throws IOException, MappingParseException {
-        return read(new BufferedReader(in));
+        // Multiple file
+        if (file.isDirectory())
+        {
+            mappings = new Mappings(Mappings.FormatType.ENIGMA_DIRECTORY);
+            readDirectory(mappings, file);
+        }
+        else
+        {
+            mappings = new Mappings();
+            readFile(mappings, new BufferedReader(new InputStreamReader(new FileInputStream(file), Charsets.UTF_8)));
+        }
+        return mappings;
     }
 
-    public Mappings read(BufferedReader in) throws IOException, MappingParseException {
-        Mappings mappings = new Mappings();
+    public void readDirectory(Mappings mappings, File directory) throws IOException, MappingParseException {
+        File[] files = directory.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.isFile())
+                    readFile(mappings, new BufferedReader(new InputStreamReader(new FileInputStream(file), Charsets.UTF_8)));
+                else if (file.isDirectory())
+                    readDirectory(mappings, file.getAbsoluteFile());
+            }
+        }
+        else
+            throw new IOException("Cannot access directory" + directory.getAbsolutePath());
+    }
+
+    public Mappings readFile(Mappings mappings, BufferedReader in) throws IOException, MappingParseException {
+
         Deque<Object> mappingStack = Queues.newArrayDeque();
 
         int lineNumber = 0;
@@ -96,7 +122,7 @@ public class MappingsReaderOld {
                 e.printStackTrace();
             }
         }
-
+        in.close();
         return mappings;
     }
 
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsOldWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
index 8b766a3..a3b0616 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsOldWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
@@ -10,17 +10,66 @@
  ******************************************************************************/
 package cuchaz.enigma.mapping;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
+import com.google.common.base.Charsets;
+
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class MappingsOldWriter {
+public class MappingsEnigmaWriter {
         
-        public void write(Writer out, Mappings mappings) throws IOException {
-                write(new PrintWriter(out), mappings);
+        public void write(File out, Mappings mappings, boolean isDirectoryFormat) throws IOException {
+                if (!isDirectoryFormat)
+                {
+                        PrintWriter outputWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(out), Charsets.UTF_8));
+                        write(outputWriter, mappings);
+                        outputWriter.close();
+                }
+                else
+                        writeAsDirectory(out, mappings);
+        }
+
+        public void writeAsDirectory(File target, Mappings mappings) throws IOException {
+                if (!target.exists() && !target.mkdirs())
+                        throw  new IOException("Cannot create mapping directory!");
+
+                for (ClassMapping classMapping : sorted(mappings.classes())) {
+                        File obFile = new File(target, classMapping.getObfFullName() + ".mapping");
+                        File result;
+                        if (classMapping.getDeobfName() == null)
+                                result = obFile;
+                        else
+                        {
+                                // Make sure that old version of the file doesn't exist
+                                if (obFile.exists())
+                                        obFile.delete();
+                                result = new File(target, classMapping.getDeobfName() + ".mapping");
+                        }
+
+                        if (!result.getParentFile().exists())
+                                result.getParentFile().mkdirs();
+                        result.createNewFile();
+                        PrintWriter outputWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(result), Charsets.UTF_8));
+                        write(outputWriter, classMapping, 0);
+                        outputWriter.close();
+                }
+
+                // Remove empty directories
+                File[] fileList = target.listFiles();
+                if (fileList != null)
+                {
+                        for (File file : fileList)
+                        {
+                                if (file.isDirectory())
+                                {
+                                        File[] childFiles = file.listFiles();
+                                        if (childFiles != null && childFiles.length == 0)
+                                                file.delete();
+                                }
+                        }
+                }
+
         }
         
         public void write(PrintWriter out, Mappings mappings) throws IOException {
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsJsonReader.java
index b2b6d09..8f5bde3 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsJsonReader.java
@@ -10,22 +10,20 @@
  ******************************************************************************/
 package cuchaz.enigma.mapping;
 
+import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.*;
 
 import cuchaz.enigma.json.JsonClass;
 import cuchaz.enigma.throwables.MappingConflict;
 
-public class MappingsReader {
+public class MappingsJsonReader {
 
     public Mappings read(File in) throws IOException {
-        Mappings mappings = new Mappings();
+        Mappings mappings = new Mappings(Mappings.FormatType.JSON_DIRECTORY);
         readDirectory(mappings, in);
         return mappings;
     }
@@ -35,7 +33,8 @@ public class MappingsReader {
         if (fList != null) {
             for (File file : fList) {
                 if (file.isFile() && Files.getFileExtension(file.getName()).equalsIgnoreCase("json")) {
-                    readFile(mappings, new BufferedReader(new FileReader(file)));
+                    readFile(mappings, new BufferedReader(new InputStreamReader(new FileInputStream(file),
+                            Charsets.UTF_8)));
                 } else if (file.isDirectory()) {
                     readDirectory(mappings, file.getAbsoluteFile());
                 }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsJsonWriter.java
index 4793166..db95322 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsJsonWriter.java
@@ -10,19 +10,18 @@
  ******************************************************************************/
 package cuchaz.enigma.mapping;
 
+import com.google.common.base.Charsets;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import cuchaz.enigma.json.*;
 
-public class MappingsWriter {
+public class MappingsJsonWriter {
 
     public void write(File file, Mappings mappings) throws IOException {
         if (!file.isDirectory()) {
@@ -44,7 +43,7 @@ public class MappingsWriter {
                 File f = new File(file, jsonClass.getName() + ".json");
                 f.getParentFile().mkdirs();
                 f.createNewFile();
-                FileWriter writer = new FileWriter(f);
+                PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(f), Charsets.UTF_8));
                 writer.write(gson.toJson(jsonClass));
                 writer.close();
             }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java
index 64da709..a05b915 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java
@@ -1,10 +1,9 @@
 package cuchaz.enigma.mapping;
 
+import com.google.common.base.Charsets;
 import cuchaz.enigma.Deobfuscator;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -22,7 +21,7 @@ public class MappingsSRGWriter {
 
         Mappings mappings = deobfuscator.getMappings();
 
-        FileWriter writer = new FileWriter(file);
+        PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8));
         List<String> fieldMappings = new ArrayList<>();
         List<String> methodMappings = new ArrayList<>();
         for (ClassMapping classMapping : sorted(mappings.classes())) {