moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-11-15 13:55:03 -05:00
Code Issues Releases Wiki Activity

* F5 F5 sysinfo

Browse Source
This commit is contained in:
Reinhard Pointner 2014-08-01 22:24:33 +00:00
parent f2ef02e9d4
commit ef29483775
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/net/filebot/cli/GroovyPad.java
View File

@ -156,6 +156,9 @@ public class GroovyPad extends JFrame {
File pad = new File(Settings.getApplicationFolder(), name); File pad = new File(Settings.getApplicationFolder(), name);
if (!pad.exists()) { if (!pad.exists()) {
pad.createNewFile(); pad.createNewFile();
// use this default value so people can easily submit bug reports with fn:sysinfo logs
ScriptShellMethods.saveAs("runScript 'fn:sysinfo'", pad);
} }
return FileLocation.create(pad); return FileLocation.create(pad);
} }

42
source/net/filebot/cli/ScriptShellBaseClass.java
View File

@ -27,6 +27,7 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.script.Bindings; import javax.script.Bindings;
@ -43,6 +44,7 @@ import net.filebot.similarity.SeasonEpisodeMatcher.SxE;
import net.filebot.util.FileUtilities; import net.filebot.util.FileUtilities;
import net.filebot.web.Movie; import net.filebot.web.Movie;
import org.codehaus.groovy.runtime.StackTraceUtils;
import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
import com.sun.jna.Platform; import com.sun.jna.Platform;
@ -78,12 +80,17 @@ public abstract class ScriptShellBaseClass extends Script {
try { try {
executeScript(input, null); executeScript(input, null);
} catch (Exception e) { } catch (Exception e) {
printException(e); printException(e, true);
} }
} }
public Object executeScript(String input) throws Throwable { public Object runScript(String input) throws Throwable {
return executeScript(input, null); try {
return executeScript(input, null);
} catch (Exception e) {
printException(e, true);
}
return null;
} }
public Object executeScript(String input, Map<String, ?> bindings, Object... args) throws Throwable { public Object executeScript(String input, Map<String, ?> bindings, Object... args) throws Throwable {
@ -113,16 +120,17 @@ public abstract class ScriptShellBaseClass extends Script {
try { try {
return c.call(); return c.call();
} catch (Exception e) { } catch (Exception e) {
printException(e); printException(e, false);
return null; return null;
} }
} }
public void printException(Throwable t) { public void printException(Throwable t, boolean severe) {
CLILogger.severe(String.format("%s: %s", t.getClass().getSimpleName(), t.getMessage())); if (severe) {
CLILogger.log(Level.SEVERE, String.format("%s: %s", t.getClass().getSimpleName(), t.getMessage()), StackTraceUtils.deepSanitize(t));
// DEBUG } else {
// StackTraceUtils.deepSanitize(t).printStackTrace(); CLILogger.log(Level.WARNING, String.format("%s: %s", t.getClass().getSimpleName(), t.getMessage()));
}
} }
public void die(Object cause) throws Throwable { public void die(Object cause) throws Throwable {
@ -310,7 +318,7 @@ public abstract class ScriptShellBaseClass extends Script {
return cli.rename(input, action, asString(option.get(Option.conflict)), asString(option.get(Option.output)), asString(option.get(Option.format)), asString(option.get(Option.db)), asString(option.get(Option.query)), asString(option.get(Option.order)), asString(option.get(Option.filter)), asString(option.get(Option.lang)), strict); return cli.rename(input, action, asString(option.get(Option.conflict)), asString(option.get(Option.output)), asString(option.get(Option.format)), asString(option.get(Option.db)), asString(option.get(Option.query)), asString(option.get(Option.order)), asString(option.get(Option.filter)), asString(option.get(Option.lang)), strict);
} catch (Exception e) { } catch (Exception e) {
printException(e); printException(e, false);
return null; return null;
} }
} }
@ -325,7 +333,7 @@ public abstract class ScriptShellBaseClass extends Script {
try { try {
return cli.getSubtitles(input, asString(option.get(Option.db)), asString(option.get(Option.query)), asString(option.get(Option.lang)), asString(option.get(Option.output)), asString(option.get(Option.encoding)), asString(option.get(Option.format)), strict); return cli.getSubtitles(input, asString(option.get(Option.db)), asString(option.get(Option.query)), asString(option.get(Option.lang)), asString(option.get(Option.output)), asString(option.get(Option.encoding)), asString(option.get(Option.format)), strict);
} catch (Exception e) { } catch (Exception e) {
printException(e); printException(e, false);
return null; return null;
} }
} }
@ -340,7 +348,7 @@ public abstract class ScriptShellBaseClass extends Script {
try { try {
return cli.getMissingSubtitles(input, asString(option.get(Option.db)), asString(option.get(Option.query)), asString(option.get(Option.lang)), asString(option.get(Option.output)), asString(option.get(Option.encoding)), asString(option.get(Option.format)), strict); return cli.getMissingSubtitles(input, asString(option.get(Option.db)), asString(option.get(Option.query)), asString(option.get(Option.lang)), asString(option.get(Option.output)), asString(option.get(Option.encoding)), asString(option.get(Option.format)), strict);
} catch (Exception e) { } catch (Exception e) {
printException(e); printException(e, false);
return null; return null;
} }
} }
@ -353,7 +361,7 @@ public abstract class ScriptShellBaseClass extends Script {
try { try {
return cli.check(input); return cli.check(input);
} catch (Exception e) { } catch (Exception e) {
printException(e); printException(e, false);
return false; return false;
} }
} }
@ -367,7 +375,7 @@ public abstract class ScriptShellBaseClass extends Script {
try { try {
return cli.compute(input, asString(option.get(Option.output)), asString(option.get(Option.encoding))); return cli.compute(input, asString(option.get(Option.output)), asString(option.get(Option.encoding)));
} catch (Exception e) { } catch (Exception e) {
printException(e); printException(e, false);
return null; return null;
} }
} }
@ -383,7 +391,7 @@ public abstract class ScriptShellBaseClass extends Script {
try { try {
return cli.extract(input, asString(option.get(Option.output)), asString(option.get(Option.conflict)), filter, forceExtractAll); return cli.extract(input, asString(option.get(Option.output)), asString(option.get(Option.conflict)), filter, forceExtractAll);
} catch (Exception e) { } catch (Exception e) {
printException(e); printException(e, false);
return null; return null;
} }
} }
@ -396,7 +404,7 @@ public abstract class ScriptShellBaseClass extends Script {
try { try {
return cli.fetchEpisodeList(asString(option.get(Option.query)), asString(option.get(Option.format)), asString(option.get(Option.db)), asString(option.get(Option.order)), asString(option.get(Option.filter)), asString(option.get(Option.lang))); return cli.fetchEpisodeList(asString(option.get(Option.query)), asString(option.get(Option.format)), asString(option.get(Option.db)), asString(option.get(Option.order)), asString(option.get(Option.filter)), asString(option.get(Option.lang)));
} catch (Exception e) { } catch (Exception e) {
printException(e); printException(e, false);
return null; return null;
} }
} }
@ -409,7 +417,7 @@ public abstract class ScriptShellBaseClass extends Script {
try { try {
return cli.getMediaInfo(input.get(0), asString(option.get(Option.format))); return cli.getMediaInfo(input.get(0), asString(option.get(Option.format)));
} catch (Exception e) { } catch (Exception e) {
printException(e); printException(e, false);
return null; return null;
} }
} }