LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-04 02:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

show warning when parallel export and single file export are both enabled

Browse Source
This commit is contained in:
honfika@gmail.com
2016-04-30 14:00:04 +02:00
parent 435fef8199
commit 0419fbc399
5 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
View File

@@ -275,7 +275,9 @@ public class ScriptPack extends AS3ClassTreeItem {
}
}
Path.createDirectorySafe(file.getParentFile());
if (file != null) {
Path.createDirectorySafe(file.getParentFile());
}
try (FileTextWriter writer = exportSettings.singleFile ? null : new FileTextWriter(Configuration.getCodeFormatting(), new FileOutputStream(file))) {
FileTextWriter writer2 = exportSettings.singleFile ? exportSettings.singleFileWriter : writer;

30
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/AS3ScriptExporter.java
View File

@@ -376,22 +376,26 @@ public class AS3ScriptExporter {
}
}
File file = item.getExportFile(outdir, exportSettings);
String filePath = file.getPath();
if (files.contains(filePath.toLowerCase())) {
String parentPath = file.getParent();
String fileName = file.getName();
String extension = Path.getExtension(fileName);
String fileNameWithoutExtension = Path.getFileNameWithoutExtension(file);
int i = 2;
do {
filePath = Path.combine(parentPath, fileNameWithoutExtension + "_" + i++ + extension);
} while (files.contains(filePath.toLowerCase()));
File file = null;
if (!exportSettings.singleFile) {
file = item.getExportFile(outdir, exportSettings);
String filePath = file.getPath();
if (files.contains(filePath.toLowerCase())) {
String parentPath = file.getParent();
String fileName = file.getName();
String extension = Path.getExtension(fileName);
String fileNameWithoutExtension = Path.getFileNameWithoutExtension(file);
int i = 2;
do {
filePath = Path.combine(parentPath, fileNameWithoutExtension + "_" + i++ + extension);
} while (files.contains(filePath.toLowerCase()));
file = new File(filePath);
file = new File(filePath);
}
files.add(filePath.toLowerCase());
}
files.add(filePath.toLowerCase());
tasks.add(new ExportPackTask(handler, cnt++, packs.size(), item.getClassPath(), item, file, exportSettings, parallel, evl));
}