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

Issue #427: User friendly error message when file not found (during command line compress, decompress and rename identifiers)

Browse Source
This commit is contained in:
Honfika
2013-11-23 23:46:18 +01:00
parent 3d54eb9627
commit 01bccf5e16
2 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
trunk/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -115,7 +115,6 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -476,8 +475,6 @@ public final class SWF {
fis.close();
fos.close();
} catch (FileNotFoundException ex) {
return false;
} catch (IOException ex) {
return false;
}
@@ -540,8 +537,6 @@ public final class SWF {
default:
return false;
}
} catch (FileNotFoundException ex) {
return false;
} catch (IOException ex) {
return false;
}
@@ -557,8 +552,6 @@ public final class SWF {
swf.saveTo(fos);
} catch (InterruptedException ex) {
return false;
} catch (FileNotFoundException ex) {
return false;
} catch (IOException ex) {
return false;
}

74
trunk/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
View File

@@ -33,6 +33,8 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.Queue;
@@ -535,33 +537,46 @@ public class CommandLineArgumentParser {
}
}
private static void parseCompress(Queue<String> args) throws FileNotFoundException {
private static void parseCompress(Queue<String> args) {
if (args.size() < 2) {
badArguments();
}
try {
InputStream fis = new FileInputStream(args.remove());
OutputStream fos = new FileOutputStream(args.remove());
if (SWF.fws2cws(fis, fos)) {
System.out.println("OK");
} else {
System.err.println("FAIL");
}
} catch (FileNotFoundException ex) {
System.err.println("File not found.");
}
System.exit(0);
}
private static void parseDecompress(Queue<String> args) {
if (args.size() < 2) {
badArguments();
}
if (SWF.fws2cws(new FileInputStream(args.remove()), new FileOutputStream(args.remove()))) {
System.out.println("OK");
} else {
System.err.println("FAIL");
try {
InputStream fis = new FileInputStream(args.remove());
OutputStream fos = new FileOutputStream(args.remove());
if (SWF.decompress(fis, fos)) {
System.out.println("OK");
System.exit(0);
} else {
System.err.println("FAIL");
System.exit(1);
}
} catch (FileNotFoundException ex) {
System.err.println("File not found.");
}
System.exit(0);
}
private static void parseDecompress(Queue<String> args) throws FileNotFoundException {
if (args.size() < 2) {
badArguments();
}
if (SWF.decompress(new FileInputStream(args.remove()), new FileOutputStream(args.remove()))) {
System.out.println("OK");
System.exit(0);
} else {
System.err.println("FAIL");
System.exit(1);
}
}
private static void parseRenameInvalidIdentifiers(Queue<String> args) throws FileNotFoundException {
private static void parseRenameInvalidIdentifiers(Queue<String> args) {
if (args.size() < 3) {
badArguments();
}
@@ -580,13 +595,20 @@ public class CommandLineArgumentParser {
badArguments();
return;
}
if (SWF.renameInvalidIdentifiers(renameType, new FileInputStream(args.remove()), new FileOutputStream(args.remove()))) {
System.out.println("OK");
System.exit(0);
} else {
System.err.println("FAIL");
System.exit(1);
try {
InputStream fis = new FileInputStream(args.remove());
OutputStream fos = new FileOutputStream(args.remove());
if (SWF.renameInvalidIdentifiers(renameType, fis, fos)) {
System.out.println("OK");
System.exit(0);
} else {
System.err.println("FAIL");
System.exit(1);
}
} catch (FileNotFoundException ex) {
System.err.println("File not found.");
}
System.exit(0);
}
private static void parseDumpSwf(Queue<String> args) {