From fb10d14f8ccf7e4a5c0fc210000a5c35043786d7 Mon Sep 17 00:00:00 2001
From: galaxyoyo <yohann.danello@gmail.com>
Date: Sun, 11 Jan 2015 12:35:38 +0100
Subject: [PATCH] =?UTF-8?q?Modifi=C3=A9=20syst=C3=A8me=20de=20sauvegarde?=
 =?UTF-8?q?=20:=20compression=20en=20GZIP=20(optimisation)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unknown/api/editor/EditorAPI.java         | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/main/java/galaxyoyo/unknown/api/editor/EditorAPI.java b/src/main/java/galaxyoyo/unknown/api/editor/EditorAPI.java
index 26d5d67..0d83152 100644
--- a/src/main/java/galaxyoyo/unknown/api/editor/EditorAPI.java
+++ b/src/main/java/galaxyoyo/unknown/api/editor/EditorAPI.java
@@ -5,18 +5,22 @@ import galaxyoyo.unknown.editor.Map;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileNameExtensionFilter;
 
+import org.apache.logging.log4j.LogManager;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -46,6 +50,7 @@ public class EditorAPI
 		
 		builder.enableComplexMapKeySerialization();
 		builder.serializeNulls();
+		builder.setPrettyPrinting();
 		
 		return builder.create();
 	}
@@ -99,18 +104,18 @@ public class EditorAPI
 		try
 		{
 			file.createNewFile();
-			BufferedWriter bw = new BufferedWriter(new FileWriter(file));
-			
-			for (char c : json.toCharArray())
+	//		BufferedWriter bw = new BufferedWriter(new FileWriter(file));
+			BufferedOutputStream bos = new BufferedOutputStream(new GZIPOutputStream(new FileOutputStream(file)));
+	/*		for (char c : json.toCharArray())
 			{
 				char ch = c;
 				
 				ch = (char) ((((int) c * 2) - 4) * 3);
-				
-				bw.append(ch);
-			}
+			}*/
 			
-			bw.close();
+			bos.write(json.getBytes("UTF-8"));
+			
+			bos.close();
 		}
 		catch (IOException ex)
 		{
@@ -139,18 +144,23 @@ public class EditorAPI
 		String json = null;
 		try
 		{
-			BufferedReader br = new BufferedReader(new FileReader(f));
+			long startTime = System.currentTimeMillis();
+	//		BufferedReader br = new BufferedReader(new FileReader(f));
+			GZIPInputStream gis = new GZIPInputStream(new BufferedInputStream(new FileInputStream(f)));
+			byte[] bytes = new byte[512*1024];
+			int count = 0;
 			String text = "";
-			String ln;
-			while ((ln = br.readLine()) != null)
+			while ((count = gis.read(bytes)) != -1)
 			{
-				text += ln + "\n";
+				text += new String(bytes, 0, count, "UTF-8");
 			}
-			br.close();
+			gis.close();
+			System.out.println("Took : " + (System.currentTimeMillis() - startTime) + " ms");
+			bytes = null;
 			
-			json = "";
+			json = text;
 			
-			for (char c : text.toCharArray())
+	/*		for (char c : text.toCharArray())
 			{
 				char ch = c;
 				
@@ -159,13 +169,15 @@ public class EditorAPI
 				json += ch;
 			}
 			
-			json = json.substring(0, json.length() - 1);
+			json = json.substring(0, json.length() - 1);*/
 		}
 		catch (IOException e)
 		{
 			e.printStackTrace();
 		}
 		
+		LogManager.getLogger(EditorAPI.class).warn(json);
+		
 		RawMap rm = createGson().fromJson(json, RawMap.class);
 		
 		return open(rm);