LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 00:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to cancel exports before exporting assets

Browse Source
This commit is contained in:
Jindra Petřík
2023-10-01 18:21:38 +02:00
parent 1dcd66bf5c
commit 3a580c774b
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/AS3ScriptExporter.java
+21 -2
View File
@@ -475,6 +475,11 @@ public class AS3ScriptExporter {
}
if (exportSettings.exportEmbedFlaMode || exportSettings.exportEmbed) {
if (Thread.currentThread().isInterrupted()) {
return ret;
}
final String ASSETS_DIR = outdir + "/_assets/";
List<Tag> exportTagList = new ArrayList<>();
List<DefineSpriteTag> spriteTagList = new ArrayList<>();
@@ -517,15 +522,29 @@ public class AS3ScriptExporter {
try {
BinaryDataExporter bde = new BinaryDataExporter();
bde.exportBinaryData(handler, ASSETS_DIR, rttl, new BinaryDataExportSettings(BinaryDataExportMode.RAW), evl);
if (Thread.currentThread().isInterrupted()) {
return ret;
}
ImageExporter ie = new ImageExporter();
ie.exportImages(handler, ASSETS_DIR, rttl, new ImageExportSettings(ImageExportMode.PNG_GIF_JPEG), evl);
if (Thread.currentThread().isInterrupted()) {
return ret;
}
SoundExporter se = new SoundExporter();
se.exportSounds(handler, ASSETS_DIR, rttl, new SoundExportSettings(SoundExportMode.MP3_WAV), evl);
if (Thread.currentThread().isInterrupted()) {
return ret;
}
FontExporter fe = new FontExporter();
fe.exportFonts(handler, ASSETS_DIR, rttl, new FontExportSettings(FontExportMode.TTF), evl);
if (Thread.currentThread().isInterrupted()) {
return ret;
}
Font4Exporter f4e = new Font4Exporter();
f4e.exportFonts(handler, ASSETS_DIR, rttl, new Font4ExportSettings(Font4ExportMode.CFF), evl);
if (Thread.currentThread().isInterrupted()) {
return ret;
}
if (!spriteTagList.isEmpty()) {
new RetryTask(() -> {
try (FileOutputStream fos = new FileOutputStream(ASSETS_DIR + "/assets.swf")) {
@@ -593,7 +612,7 @@ public class AS3ScriptExporter {
} catch (IOException ex) {
Logger.getLogger(AS3ScriptExporter.class.getName()).log(Level.SEVERE, null, ex);
} catch (InterruptedException ex) {
Logger.getLogger(AS3ScriptExporter.class.getName()).log(Level.SEVERE, null, ex);
return ret;
}
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ExportPackTask.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class ExportPackTask implements Callable<File> {
RunnableIOExResult<File> rio = new RunnableIOExResult<File>() {
@Override
public void run() throws IOException, InterruptedException {
startTime = System.currentTimeMillis();
startTime = System.currentTimeMillis();
this.result = pack.export(abcIndex, file, exportSettings, parallel);
stopTime = System.currentTimeMillis();
}