LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-05 03:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added #2113 Commandline - allow -onerror abort argument on -importScript

Browse Source
This commit is contained in:
Jindra Petřík
2023-11-05 20:00:02 +01:00
parent aecd10f630
commit cc0050f155
7 changed files with 79 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS2ScriptImporter.java
View File

@@ -83,26 +83,38 @@ public class AS2ScriptImporter {
String txt = Helper.readTextFile(fileName);
ActionScript2Parser par = new ActionScript2Parser(asm.getSwf(), asm);
boolean errored = false;
try {
asm.setActions(par.actionsFromString(txt, asm.getSwf().getCharset()));
} catch (ValueTooLargeException ex) {
logger.log(Level.SEVERE, "Script or some of its functions are too large, file: {0}", fileName);
errored = true;
} catch (ActionParseException ex) {
logger.log(Level.SEVERE, "%error% on line %line%, file: %file%".replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)).replace("%file%", fileName), ex);
errored = true;
} catch (CompilationException ex) {
logger.log(Level.SEVERE, "%error% on line %line%, file: %file%".replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)).replace("%file%", fileName), ex);
errored = true;
} catch (IOException ex) {
logger.log(Level.SEVERE, "error during script import, file: %file%".replace("%file%", fileName), ex);
errored = true;
} catch (InterruptedException ex) {
return importCount;
} catch (Exception ex) {
logger.log(Level.SEVERE, "error during script import, file: %file%".replace("%file%", fileName), ex);
errored = true;
}
asm.setModified();
importCount++;
if (listener != null) {
listener.scriptImported();
if (!errored) {
asm.setModified();
importCount++;
if (listener != null) {
listener.scriptImported();
}
} else {
if (listener != null) {
listener.scriptImportError();
}
}
}
@@ -111,18 +123,27 @@ public class AS2ScriptImporter {
asm.getSwf().informListeners("importing_as", fileName);
String txt = Helper.readTextFile(fileName);
boolean errored = false;
try {
asm.setActions(ASMParser.parse(0, true, txt, asm.getSwf().version, false, asm.getSwf().getCharset()));
} catch (IOException ex) {
logger.log(Level.SEVERE, "error during script import, file: %file%".replace("%file%", fileName), ex);
errored = true;
} catch (ActionParseException ex) {
logger.log(Level.SEVERE, "%error% on line %line%, file: %file%".replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)).replace("%file%", fileName), ex);
errored = true;
}
asm.setModified();
importCount++;
if (listener != null) {
listener.scriptImported();
if (!errored) {
asm.setModified();
importCount++;
if (listener != null) {
listener.scriptImported();
}
} else {
if (listener != null) {
listener.scriptImportError();
}
}
}
@@ -144,15 +165,24 @@ public class AS2ScriptImporter {
asm.getSwf().informListeners("importing_as", fileName);
String txt = Helper.readTextFile(fileName);
boolean errored = false;
try {
asm.setConstantPools(Helper.getConstantPoolsFromText(txt));
} catch (ConstantPoolTooBigException ex) {
logger.log(Level.SEVERE, null, ex);
errored = true;
}
asm.setModified();
importCount++;
if (listener != null) {
listener.scriptImported();
if (!errored) {
asm.setModified();
importCount++;
if (listener != null) {
listener.scriptImported();
}
} else {
if (listener != null) {
listener.scriptImportError();
}
}
}
}

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java
View File

@@ -69,6 +69,9 @@ public class AS3ScriptImporter {
for (As3ScriptReplaceExceptionItem item : asre.getExceptionItems()) {
logger.log(Level.SEVERE, "%error% on line %line%, column %col%, file: %file%".replace("%error%", item.getMessage()).replace("%line%", Long.toString(item.getLine())).replace("%file%", fileName).replace("%col%", "" + item.getCol()));
}
if (listener != null) {
listener.scriptImportError();
}
} catch (InterruptedException ex) {
return importCount;
}

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/ScriptImporterProgressListener.java
View File

@@ -23,4 +23,6 @@ package com.jpexs.decompiler.flash.importers;
public interface ScriptImporterProgressListener {
public void scriptImported();
public void scriptImportError();
}