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

Commandline: allow to pass argument -nobundle to skip bundles detection by extension in -info command

Browse Source
This commit is contained in:
Jindra Petřík
2021-04-03 16:06:57 +02:00
parent f616fe43a6
commit edeec29fb7
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFSourceInfo.java
View File

@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
* License along with this library.
*/
package com.jpexs.decompiler.flash;
import com.jpexs.decompiler.flash.iggy.conversion.IggySwfBundle;
@@ -35,10 +36,16 @@ public class SWFSourceInfo {
private final String fileTitle;
private final boolean detectBundle;
public SWFSourceInfo(InputStream inputStream, String file, String fileTitle) {
this(inputStream, file, fileTitle, true);
}
public SWFSourceInfo(InputStream inputStream, String file, String fileTitle, boolean detectBundle) {
this.inputStream = inputStream;
this.file = file;
this.fileTitle = fileTitle;
this.detectBundle = detectBundle;
}
public InputStream getInputStream() {
@@ -77,7 +84,7 @@ public class SWFSourceInfo {
return false;
}
String extension = Path.getExtension(fileObj);
String extension = Path.getExtension(fileObj);
return (detectBundle) && (extension == null || !(extension.equals(".swf") || extension.equals(".gfx")));
}
return false;
}

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

@@ -3673,6 +3673,7 @@ public class CommandLineArgumentParser {
File out;
PrintWriter pw = new PrintWriter(System.out);
boolean found = false;
boolean detectBundle = true;
while (!args.isEmpty()) {
String a = args.pop();
switch (a) {
@@ -3688,13 +3689,16 @@ public class CommandLineArgumentParser {
pw = new PrintWriter(out);
}
break;
case "-nobundle":
detectBundle = false;
break;
default:
SWFBundle bundle;
String sfile = a;
File file = new File(sfile);
try {
SWFSourceInfo sourceInfo = new SWFSourceInfo(null, sfile, sfile);
SWFSourceInfo sourceInfo = new SWFSourceInfo(null, sfile, sfile, detectBundle);
bundle = sourceInfo.getBundle(false, SearchMode.ALL);
logger.log(Level.INFO, "Load file: {0}", sourceInfo.getFile());