From f8e3c3460d991437810cc7750990d813340839e7 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Thu, 21 Feb 2019 21:10:24 +0700
Subject: [PATCH] Refactor and extend new ExitCode logic

---
 source/net/filebot/{cli => }/ExitCode.java       | 4 ++--
 source/net/filebot/Main.java                     | 2 +-
 source/net/filebot/cli/ArgumentProcessor.java    | 3 ++-
 source/net/filebot/cli/ScriptShellBaseClass.java | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)
 rename source/net/filebot/{cli => }/ExitCode.java (76%)

diff --git a/source/net/filebot/cli/ExitCode.java b/source/net/filebot/ExitCode.java
similarity index 76%
rename from source/net/filebot/cli/ExitCode.java
rename to source/net/filebot/ExitCode.java
index 6786f163..bfa8c6d0 100644
--- a/source/net/filebot/cli/ExitCode.java
+++ b/source/net/filebot/ExitCode.java
@@ -1,4 +1,4 @@
-package net.filebot.cli;
+package net.filebot;
 
 public class ExitCode {
 
@@ -12,6 +12,6 @@ public class ExitCode {
 
 	public static final int DIE = 4;
 
-	public static final int NO_OPERATION = 10;
+	public static final int NOOP = 100;
 
 }
diff --git a/source/net/filebot/Main.java b/source/net/filebot/Main.java
index c7c3fc6b..8c9813ad 100644
--- a/source/net/filebot/Main.java
+++ b/source/net/filebot/Main.java
@@ -3,10 +3,10 @@ package net.filebot;
 import static java.awt.GraphicsEnvironment.*;
 import static java.util.Arrays.*;
 import static java.util.stream.Collectors.*;
+import static net.filebot.ExitCode.*;
 import static net.filebot.Logging.*;
 import static net.filebot.MediaTypes.*;
 import static net.filebot.Settings.*;
-import static net.filebot.cli.ExitCode.*;
 import static net.filebot.ui.GettingStartedUtil.*;
 import static net.filebot.util.FileUtilities.*;
 import static net.filebot.util.FileUtilities.getChildren;
diff --git a/source/net/filebot/cli/ArgumentProcessor.java b/source/net/filebot/cli/ArgumentProcessor.java
index 03c4c119..28945418 100644
--- a/source/net/filebot/cli/ArgumentProcessor.java
+++ b/source/net/filebot/cli/ArgumentProcessor.java
@@ -1,10 +1,10 @@
 package net.filebot.cli;
 
 import static java.nio.charset.StandardCharsets.*;
+import static net.filebot.ExitCode.*;
 import static net.filebot.Logging.*;
 import static net.filebot.MediaTypes.*;
 import static net.filebot.Settings.*;
-import static net.filebot.cli.ExitCode.*;
 import static net.filebot.util.ExceptionUtilities.*;
 import static net.filebot.util.FileUtilities.*;
 
@@ -75,6 +75,7 @@ public class ArgumentProcessor {
 			return d.getExitCode();
 		}
 
+		log.log(Level.SEVERE, e, e::getMessage);
 		return ERROR;
 	}
 
diff --git a/source/net/filebot/cli/ScriptShellBaseClass.java b/source/net/filebot/cli/ScriptShellBaseClass.java
index 9835ce3e..343e909d 100644
--- a/source/net/filebot/cli/ScriptShellBaseClass.java
+++ b/source/net/filebot/cli/ScriptShellBaseClass.java
@@ -40,6 +40,7 @@ import groovy.lang.Closure;
 import groovy.lang.MissingPropertyException;
 import groovy.lang.Script;
 import groovy.xml.MarkupBuilder;
+import net.filebot.ExitCode;
 import net.filebot.HistorySpooler;
 import net.filebot.RenameAction;
 import net.filebot.StandardRenameAction;
@@ -171,11 +172,11 @@ public abstract class ScriptShellBaseClass extends Script {
 	}
 
 	public void die(Object cause) throws Throwable {
-		die(ExitCode.DIE, cause);
+		die(cause, ExitCode.DIE);
 	}
 
-	public void die(int exitCode, Object... cause) throws Throwable {
-		throw new ScriptDeath(exitCode, getMessage(cause));
+	public void die(Object cause, int exitCode) throws Throwable {
+		throw new ScriptDeath(exitCode, String.valueOf(cause));
 	}
 
 	// define global variable: _args