U several improvements and refactoring

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/utils/CharsetUtil.java

@@ -1,42 +1,44 @@
 package io.github.fvarrui.javapackager.utils;
 
-import static io.github.fvarrui.javapackager.utils.CommandUtils.execute;
-
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.SystemUtils;
 
 public class CharsetUtil {
-
+	
+	private static Charset commandLineCharset;
+	
     public static Charset getCommandLineCharset(){
-    	if (SystemUtils.IS_OS_WINDOWS) {
-	        try{
-	            String result = execute("cmd", "/k", "chcp");
-	            String code = find("\\d+", result);
-	            switch (code){
-	                case "037": return Charset.forName("IBM037");
-	                case "936": return Charset.forName("gb2312");
-	                case "950": return Charset.forName("big5");
-	                case "1145": return Charset.forName("IBM01145");
-	                case "1200": return StandardCharsets.UTF_16;
-	                case "51936": return Charset.forName("EUC-CN");
-	                case "65001": return StandardCharsets.UTF_8;
-	            }
-	        } catch (Exception e){
-	        	// do nothing
-	        }
+    	if (commandLineCharset == null) {
+	    	if (SystemUtils.IS_OS_WINDOWS) {
+		        commandLineCharset = chcp();
+	    	} else {
+	    		commandLineCharset = Charset.defaultCharset();
+	    	}
     	}
-        return Charset.defaultCharset();
+        return commandLineCharset;
     }
-
-    private static String find(String pattern,String data){
-        Pattern r = Pattern.compile(pattern);
-        Matcher matcher = r.matcher(data);
-        matcher.find();
-        return matcher.group();
+    
+    private static Charset chcp() {
+        try{
+            String result = CommandUtils.run("cmd /k chcp");	        	
+            String code = StringUtils.find("\\d+", result);
+            Logger.debug("'chcp' code found: " + code);
+            switch (code){
+            	case "37": 
+                case "037": return Charset.forName("IBM037");
+                case "936": return Charset.forName("gb2312");
+                case "950": return Charset.forName("big5");
+                case "1145": return Charset.forName("IBM01145");
+                case "1200": return StandardCharsets.UTF_16;
+                case "51936": return Charset.forName("EUC-CN");
+                case "65001": return StandardCharsets.UTF_8;
+            }
+        } catch (Exception e){
+        	// do nothing
+        }
+        return Charset.defaultCharset();
     }
 
 }

src/main/java/io/github/fvarrui/javapackager/utils/CommandUtils.java

@@ -68,5 +68,13 @@ public static ExecutionResult executeWithResult(File workingDirectory, String ex
 
 		return result;
 	}
+	
+	public static String run(String command) throws IOException {
+    	Process p = Runtime.getRuntime().exec(command);
+        BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+        String result = br.readLine();	        	
+		br.close();
+		return result;
+	}
 
 }

src/main/java/io/github/fvarrui/javapackager/utils/StringUtils.java

@@ -1,9 +1,19 @@
 package io.github.fvarrui.javapackager.utils;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class StringUtils {
-	
+
 	public static String dosToUnix(String input) {
 		return input.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n");
 	}
 
+	public static String find(String pattern, String data) {
+		Pattern r = Pattern.compile(pattern);
+		Matcher matcher = r.matcher(data);
+		matcher.find();
+		return matcher.group();
+	}
+
 }