Merge pull request #116 from Querz/section-import

Section import

build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'idea'
 apply plugin: 'css'
 
 group 'net.querz.mcaselector'
-version '1.10'
+version '1.11'
 
 sourceCompatibility = 1.8
 
@@ -25,8 +25,8 @@ repositories {
 }
 
 dependencies {
-	compile 'com.github.Querz:NBT:5.3'
-	shadow 'com.github.Querz:NBT:5.3'
+	compile 'com.github.Querz:NBT:5.5'
+	shadow 'com.github.Querz:NBT:5.5'
 	testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 

src/main/java/net/querz/mcaselector/Config.java

@@ -161,8 +161,8 @@ public static void loadFromIni() {
 				}
 				config.put(elements[0], elements[1]);
 			});
-		} catch (IOException e) {
-			Debug.error(e);
+		} catch (IOException ex) {
+			Debug.dumpException("failed to read settings.ini", ex);
 		}
 
 		try {
@@ -186,7 +186,7 @@ public static void loadFromIni() {
 			shadeWater = Boolean.parseBoolean(config.getOrDefault("ShadeWater", DEFAULT_SHADE_WATER + ""));
 			debug = Boolean.parseBoolean(config.getOrDefault("Debug", DEFAULT_DEBUG + ""));
 		} catch (Exception ex) {
-			Debug.errorf("error loading settings.ini: %s", ex.getMessage());
+			Debug.dumpException("error loading settings.ini", ex);
 		}
 	}
 
@@ -217,7 +217,7 @@ public static void exportConfig() {
 		try {
 			Files.write(file.toPath(), lines);
 		} catch (IOException ex) {
-			Debug.errorf("error writing settings.ini: %s", ex.getMessage());
+			Debug.dumpException("error writing settings.ini", ex);
 		}
 	}
 

src/main/java/net/querz/mcaselector/changer/BiomeField.java

@@ -35,7 +35,7 @@ public class BiomeField extends Field<Integer> {
 				validIDs.add(id);
 			}
 		} catch (IOException ex) {
-			Debug.error("error reading biomes.csv: ", ex.getMessage());
+			Debug.dumpException("error reading biomes.csv for BiomeField", ex);
 		}
 	}
 

src/main/java/net/querz/mcaselector/changer/FieldType.java

@@ -44,8 +44,8 @@ public enum FieldType {
 	public Field<?> newInstance() {
 		try {
 			return clazz.newInstance();
-		} catch (InstantiationException | IllegalAccessException e) {
-			Debug.error(e);
+		} catch (InstantiationException | IllegalAccessException ex) {
+			Debug.dumpException("failed to create new change field instance", ex);
 			return null;
 		}
 	}

src/main/java/net/querz/mcaselector/debug/Debug.java

@@ -8,30 +8,31 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
 
 public final class Debug {
 
 	private Debug() {}
 
-	private static ExceptionInfo lastException = null;
+	private static final Map<ExceptionInfo, ExceptionInfo> lastExceptions = new ConcurrentHashMap<>();
 
 	public static void dump(Object... objects) {
 		if (Config.debug()) {
 			for (Object o : objects) {
 				if (o instanceof Exception) {
-					if (lastException == null) {
-						lastException = new ExceptionInfo((Exception) o);
+					ExceptionInfo info = new ExceptionInfo((Exception) o);
+					if (!lastExceptions.containsKey(info)) {
+						lastExceptions.put(info, info);
 						if (logWriter != null) {
 							appendLogFile(getStacktraceAsString((Exception) o));
 						}
 						((Exception) o).printStackTrace();
-					} else if (!lastException.equals((Exception) o)) {
-						lastException.flush();
-						lastException = new ExceptionInfo((Exception) o);
-						System.out.println(lastException.getOneLine());
 					} else {
-						lastException.poke();
+						// poke original instance
+						lastExceptions.get(info).poke();
 					}
 				} else {
 					if (logWriter != null) {
@@ -55,19 +56,16 @@ public static void dumpf(String format, Object... objects) {
 	public static void error(Object... objects) {
 		for (Object o : objects) {
 			if (o instanceof Exception) {
-				if (lastException == null) {
-					lastException = new ExceptionInfo((Exception) o);
+				ExceptionInfo info = new ExceptionInfo((Exception) o);
+				if (!lastExceptions.containsKey(info)) {
+					lastExceptions.put(info, info);
 					if (logWriter != null) {
 						appendLogFile(getStacktraceAsString((Exception) o));
 					}
 					((Exception) o).printStackTrace();
-				} else if (!lastException.equals((Exception) o)) {
-					lastException.flush();
-					lastException = new ExceptionInfo((Exception) o);
-					System.out.println(lastException.getOneLine());
 				} else {
-					System.out.println(lastException.getOneLine());
-					lastException.poke();
+					// poke original instance
+					lastExceptions.get(info).poke();
 				}
 			} else {
 				if (logWriter != null) {
@@ -78,6 +76,10 @@ public static void error(Object... objects) {
 		}
 	}
 
+	public static void dumpException(String msg, Exception ex) {
+		error(new Exception(msg), ex);
+	}
+
 	public static void errorf(String format, Object... objects) {
 		if (logWriter != null) {
 			appendLogFile(String.format(format, objects));
@@ -124,8 +126,11 @@ public synchronized void close() {
 			try {
 				System.out.println("closing log file");
 				if (br != null) {
-					if (lastException != null) {
-						lastException.flush();
+					if (!lastExceptions.isEmpty()) {
+						for (ExceptionInfo info : lastExceptions.keySet()) {
+							info.flush();
+						}
+						lastExceptions.clear();
 					}
 					try {
 						br.flush();
@@ -151,6 +156,17 @@ private void repeatedFlush() {
 			while (br != null) {
 				try {
 					Thread.sleep(10000);
+
+					long now = System.currentTimeMillis();
+
+					lastExceptions.entrySet().removeIf(e -> {
+						if (now - e.getValue().timestamp > 10000) {
+							e.getValue().flush();
+							return true;
+						}
+						return false;
+					});
+
 					if (br != null) {
 						br.flush();
 					}
@@ -226,6 +242,7 @@ private static class ExceptionInfo {
 		long timestamp;
 		String oneLine;
 		int count = 0;
+		int hashCode;
 
 		ExceptionInfo(Exception ex) {
 			exception = ex.getClass();
@@ -238,46 +255,37 @@ private static class ExceptionInfo {
 			timestamp = System.currentTimeMillis();
 			oneLine = getExceptionOneLine(ex);
 
-			new Thread(() -> {
-				try {
-					Thread.sleep(10000);
-					long remainingTime;
-					while ((remainingTime = System.currentTimeMillis() - timestamp) < 10000) {
-						Thread.sleep(remainingTime);
-					}
-					flush();
-					lastException = null;
-				} catch (InterruptedException e) {
-					System.out.println("failed to flush exception");
-					e.printStackTrace();
-				}
-			}).start();
+			hashCode = Objects.hash(exception, line, file);
+		}
+
+		@Override
+		public boolean equals(Object ex) {
+			return exception == ((ExceptionInfo) ex).exception
+					&& line == ((ExceptionInfo) ex).line
+					&& file.equals(((ExceptionInfo) ex).file);
 		}
 
-		boolean equals(Exception ex) {
-			return exception == ex.getClass()
-					&& (line > 0
-					&& ex.getStackTrace().length > 0
-					&& line == ex.getStackTrace()[0].getLineNumber()
-					&& file.equals(ex.getStackTrace()[0].getFileName())
-					|| line == -1
-					&& ex.getStackTrace().length == 0);
+		@Override
+		public String toString() {
+			return "ExceptionInfo: " + exception.getSimpleName() + " at " + file + "L" + line + " #" + hashCode;
+		}
+
+		@Override
+		public int hashCode() {
+			return hashCode;
 		}
 
 		void flush() {
 			if (count > 0) {
-				appendLogFile(" ... " + count + " more of " + lastException.getOneLine());
-				System.out.println(lastException.getOneLine());
+				String line = " ... " + count + " more of " + oneLine;
+				appendLogFile(line);
+				System.out.println(line);
 			}
 		}
 
 		void poke() {
 			timestamp = System.currentTimeMillis();
 			count++;
 		}
-
-		String getOneLine() {
-			return oneLine;
-		}
 	}
 }

src/main/java/net/querz/mcaselector/filter/BiomeFilter.java

@@ -32,7 +32,7 @@ public class BiomeFilter extends TextFilter<List<Integer>> {
 				validIDs.add(id);
 			}
 		} catch (IOException ex) {
-			Debug.error("error reading biomes.csv: ", ex.getMessage());
+			Debug.dumpException("error reading biomes.csv for BiomeFilter", ex);
 		}
 	}
 

src/main/java/net/querz/mcaselector/filter/EntityFilter.java

@@ -29,7 +29,7 @@ public class EntityFilter extends TextFilter<List<String>> {
 				validNames.add("minecraft:" + line);
 			}
 		} catch (IOException ex) {
-			Debug.error("error reading entity-names.csv: ", ex.getMessage());
+			Debug.dumpException("error reading entity-names.csv", ex);
 		}
 	}
 

src/main/java/net/querz/mcaselector/filter/FilterType.java

@@ -35,8 +35,8 @@ public Format getFormat() {
 	public Filter<?> create() {
 		try {
 			return clazz.newInstance();
-		} catch (InstantiationException | IllegalAccessException e) {
-			Debug.error(e);
+		} catch (InstantiationException | IllegalAccessException ex) {
+			Debug.dumpException("failed to create new filter instance", ex);
 		}
 		return null;
 	}

src/main/java/net/querz/mcaselector/filter/PaletteFilter.java

@@ -24,7 +24,7 @@ public class PaletteFilter extends TextFilter<List<String>> {
 				validNames.add(line);
 			}
 		} catch (IOException ex) {
-			Debug.error("error reading block-names.csv: ", ex.getMessage());
+			Debug.dumpException("error reading block-names.csv", ex);
 		}
 	}
 

src/main/java/net/querz/mcaselector/headless/ParamExecutor.java

@@ -17,6 +17,9 @@
 import net.querz.mcaselector.debug.Debug;
 import net.querz.mcaselector.io.FileHelper;
 import net.querz.mcaselector.point.Point2i;
+import net.querz.mcaselector.range.Range;
+import net.querz.mcaselector.range.RangeParser;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
@@ -65,6 +68,7 @@ public Future<Boolean> parseAndRun() {
 			pi.registerDependencies("offset-x", null, new ActionKey("mode", "import"));
 			pi.registerDependencies("offset-z", null, new ActionKey("mode", "import"));
 			pi.registerDependencies("overwrite", null, new ActionKey("mode", "import"));
+			pi.registerDependencies("sections", null, new ActionKey("mode", "import"));
 			pi.registerDependencies("selection", null, new ActionKey("mode", "import"));
 			pi.registerDependencies("zoom-level", null, new ActionKey("mode", "cache"));
 			for (int z = Config.getMinZoomLevel(); z <= Config.getMaxZoomLevel(); z *= 2) {
@@ -96,7 +100,7 @@ public Future<Boolean> parseAndRun() {
 		} catch (Exception ex) {
 			Debug.error("Error: " + ex.getMessage());
 			if (params.get() != null && params.get().containsKey("debug")) {
-				Debug.error(ex);
+				Debug.dumpException("Error executing in headless mode", ex);
 			}
 			future.run();
 			return future;
@@ -216,12 +220,17 @@ private static void runModeImport(Map<String, String> params, FutureTask<Boolean
 			selection = SelectionUtil.importSelection(selectionFile);
 		}
 
+		List<Range> ranges = null;
+		if (params.containsKey("sections")) {
+			ranges = RangeParser.parseRanges(params.get("sections"), ",");
+		}
+
 		printHeadlessSettings();
 
 		ConsoleProgress progress = new ConsoleProgress();
 		progress.onDone(future);
 
-		ChunkImporter.importChunks(input, progress, true, overwrite, selection, new Point2i(offsetX, offsetZ));
+		ChunkImporter.importChunks(input, progress, true, overwrite, selection, ranges, new Point2i(offsetX, offsetZ));
 	}
 
 	private static void runModeExport(Map<String, String> params, FutureTask<Boolean> future) throws IOException {

src/main/java/net/querz/mcaselector/io/CacheHelper.java

@@ -120,8 +120,8 @@ private static String readVersionFromFile(File file) {
 		String version = null;
 		try (BufferedReader br = new BufferedReader(new FileReader(file))) {
 			version = br.readLine();
-		} catch (IOException e) {
-			Debug.error("failed to read version from file: " + e.getMessage());
+		} catch (IOException ex) {
+			Debug.dumpException("failed to read version from file " + file, ex);
 		}
 		return version;
 	}
@@ -147,7 +147,7 @@ private static void updateVersionFile() {
 		try (BufferedWriter bw = new BufferedWriter(new FileWriter(versionFile))) {
 			bw.write(applicationVersion);
 		} catch (IOException ex) {
-			Debug.error(ex);
+			Debug.dumpException("failed to write cache version file", ex);
 		}
 	}
 }

src/main/java/net/querz/mcaselector/io/ChunkFilterDeleter.java

@@ -140,7 +140,7 @@ public void execute() {
 					Files.move(tmpFile.toPath(), getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
 				}
 			} catch (Exception ex) {
-				Debug.error(ex);
+				Debug.dumpException("failed to delete filtered chunks from " + getFile().getName(), ex);
 			}
 			progressChannel.incrementProgress(getFile().getName());
 			Debug.dumpf("took %s to save data to %s", t, getFile().getName());

src/main/java/net/querz/mcaselector/io/ChunkFilterExporter.java

@@ -148,7 +148,7 @@ public void execute() {
 					Files.move(tmpFile.toPath(), destination.toPath(), StandardCopyOption.REPLACE_EXISTING);
 				}
 			} catch (Exception ex) {
-				Debug.error(ex);
+				Debug.dumpException("failed to save exported filtered chunks in " + getFile().getName(), ex);
 			}
 			progressChannel.incrementProgress(getFile().getName());
 			Debug.dumpf("took %s to save data to %s", t, getFile().getName());

src/main/java/net/querz/mcaselector/io/ChunkFilterSelector.java

@@ -121,7 +121,7 @@ public void execute() {
 					Debug.dumpf("took %s to delete chunk indices in %s", t, getFile().getName());
 				}
 			} catch (Exception ex) {
-				Debug.errorf("error selecting chunks in %s", getFile().getName());
+				Debug.dumpException("error selecting chunks in " + getFile().getName(), ex);
 			}
 			progressChannel.incrementProgress(getFile().getName());
 		}