better error management in RezeneratorRunner, see #10

fredszaq · Jul 14, 2013 · 4d382c1 · 4d382c1
1 parent 539a2c9
commit 4d382c1
Show file tree

Hide file tree

Showing 3 changed files with 241 additions and 11 deletions.
diff --git a/rezenerator-core/src/main/java/com/tlorrain/android/rezenerator/core/RezeneratorRunner.java b/rezenerator-core/src/main/java/com/tlorrain/android/rezenerator/core/RezeneratorRunner.java
@@ -16,6 +16,7 @@
 import com.google.common.base.CaseFormat;
 import com.tlorrain.android.rezenerator.core.definition.Definition;
 import com.tlorrain.android.rezenerator.core.definition.DefinitionWrapper;
+import com.tlorrain.android.rezenerator.core.log.Logger;
 import com.tlorrain.android.rezenerator.core.processor.Processor;
 
 public class RezeneratorRunner {
@@ -24,41 +25,59 @@ public class RezeneratorRunner {
 
 	private Map<String, Processor> processors;
 
-	public void run(Configuration configuration) {
+	public boolean run(Configuration configuration) {
+		boolean sucessful = true;
 		final File inDir = configuration.getInDir();
 		final File baseOutDir = configuration.getBaseOutDir();
 		init(configuration.getScannedPackages());
 		if (!inDir.exists() || !inDir.isDirectory()) {
 			throw new IllegalStateException(inDir.getName() + " doesn't exist or is not a directory !");
 		}
+		Logger logger = configuration.getLogger();
 		for (File inFile : inDir.listFiles()) {
-			configuration.getLogger().info("Processing file : " + inFile.getName());
+			logger.info("Processing file : " + inFile.getName());
 			String[] nameSplit = inFile.getName().split("\\.");
 			if (nameSplit.length != 4) {
-				configuration.getLogger().error("Filename must be formated this way : android_id.definition.processor.ext");
+				logger.error("Filename must be formated this way : android_id.definition.processor.ext");
+				sucessful = false;
 				continue;
 			}
 			String bareFileName = nameSplit[0] + ".png";
 			DefinitionWrapper definitionWrapper = definitions.get(nameSplit[1]);
+			if (definitionWrapper == null) {
+				logger.error("Could not find definition " + nameSplit[1]);
+				sucessful = false;
+				continue;
+			}
 			Processor processor = processors.get(nameSplit[2]);
+			if (processor == null) {
+				logger.error("Could not find processor " + nameSplit[2]);
+				sucessful = false;
+				continue;
+			}
 
 			try {
 				Set<Entry<String, Dimensions>> entrySet = definitionWrapper.getConfigurations().entrySet();
 				for (Entry<String, Dimensions> entry : entrySet) {
 					File outFile = getOutFile(baseOutDir, entry.getKey(), bareFileName);
 					if (configuration.isForceUpdate() || shouldProcess(inFile, outFile, entry.getValue())) {
-						processor.process(inFile, outFile, entry.getValue(), configuration.getLogger());
+						sucessful &= processor.process(inFile, outFile, entry.getValue(), logger);
 					} else {
-						configuration.getLogger().info("Skipping " + outFile);
+						logger.info("Skipping " + outFile);
 					}
 				}
 			} catch (Exception e) {
-				configuration.getLogger().error(e.getMessage());
-				configuration.getLogger().verbose(e);
+				logger.error(e.getMessage());
+				logger.verbose(e);
+				sucessful = false;
 			}
 
 		}
-		configuration.getLogger().info("Rezenerator processing done !");
+		logger.info("Rezenerator processing done !");
+		if (!sucessful) {
+			logger.error("There were some errors !");
+		}
+		return sucessful;
 	}
 
 	private boolean shouldProcess(File inFile, File outFile, Dimensions dims) throws IOException {

diff --git a/...rator-core/src/test/java/com/tlorrain/android/rezenerator/core/RezeneratorRunnerTest.java b/...rator-core/src/test/java/com/tlorrain/android/rezenerator/core/RezeneratorRunnerTest.java
@@ -25,9 +25,13 @@ public void setup() throws Exception {
 
 	@Test
 	public void basic() throws Exception {
-		rezeneratorRunner.run(config);
+		assertThat(rezeneratorRunner.run(config)).isTrue();
 		checkOutDir(outDir);
+	}
 
+	@Test
+	public void error() throws Exception {
+		assertThat(rezeneratorRunner.run(config.setInDir(new File("src/test/resources/runner-error")))).isFalse();
 	}
 
 	@Test
@@ -48,7 +52,7 @@ public void existingFiles() throws Exception {
 		Thread.sleep(1000); // time resolution on some files systems is 1s, so
 							// lets wait that to be sure
 
-		rezeneratorRunner.run(config);
+		assertThat(rezeneratorRunner.run(config)).isTrue();
 
 		assertThat(mdpi.lastModified()).isEqualTo(lastModifiedMdpi);
 		assertThat(hdpi.lastModified()).isEqualTo(lastModifiedHdpi);
@@ -75,7 +79,7 @@ public void forceUpdate() throws Exception {
 		Thread.sleep(1000); // time resolution on some files systems is 1s, so
 							// lets wait that to be sure
 
-		rezeneratorRunner.run(config().setForceUpdate(true));
+		assertThat(rezeneratorRunner.run(config().setForceUpdate(true))).isTrue();
 
 		assertThat(mdpi.lastModified()).isGreaterThan(lastModifiedMdpi);
 		assertThat(hdpi.lastModified()).isGreaterThan(lastModifiedHdpi);