jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

cli: move specific code from common jadx args

Browse Source
This commit is contained in:
Skylot
2013-08-10 22:52:06 +04:00
parent 7985466213
commit ab8fa23fc3
4 changed files with 95 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-cli/src/main/java/jadx/cli/JadxCLI.java
+40 -4
View File
@@ -1,13 +1,49 @@
package jadx.cli;
import jadx.api.Decompiler;
import jadx.core.utils.exceptions.JadxException;
import java.io.File;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class JadxCLI {
private static final Logger LOG = LoggerFactory.getLogger(JadxCLI.class);
public static void main(String[] args) {
JadxArgs jadxArgs = new JadxArgs(args, true);
Decompiler jadx = new Decompiler(jadxArgs);
jadx.processAndSaveAll();
System.exit(jadx.getErrorsCount());
try {
JadxCLIArgs jadxArgs = new JadxCLIArgs(args);
checkArgs(jadxArgs);
Decompiler jadx = new Decompiler(jadxArgs);
jadx.processAndSaveAll();
System.exit(jadx.getErrorsCount());
} catch (Throwable e) {
LOG.error(e.getMessage());
System.exit(1);
}
}
private static void checkArgs(JadxCLIArgs jadxArgs) throws JadxException {
if (jadxArgs.getInput().isEmpty())
throw new JadxException("Please specify input file");
File outputDir = jadxArgs.getOutDir();
if (outputDir == null) {
String outDirName;
File file = jadxArgs.getInput().get(0);
String name = file.getName();
int pos = name.lastIndexOf('.');
if (pos != -1)
outDirName = name.substring(0, pos);
else
outDirName = name + "-jadx-out";
LOG.info("output directory: " + outDirName);
outputDir = new File(outDirName);
jadxArgs.setOutputDir(outputDir);
}
if (outputDir.exists() && !outputDir.isDirectory())
throw new JadxException("Output directory exists as file " + outputDir);
}
}
jadx-cli/src/main/java/jadx/cli/JadxArgs.java → jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
+40 -69
View File
@@ -1,7 +1,7 @@
package jadx.cli;
import jadx.core.Consts;
import jadx.api.IJadxArgs;
import jadx.core.Consts;
import jadx.core.utils.exceptions.JadxException;
import java.io.File;
@@ -18,10 +18,9 @@ import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterDescription;
import com.beust.jcommander.ParameterException;
public class JadxArgs implements IJadxArgs {
private static final Logger LOG = LoggerFactory.getLogger(JadxArgs.class);
public final class JadxCLIArgs implements IJadxArgs {
@Parameter(description = "<input files> (.dex, .apk, .jar or .class)")
@Parameter(description = "<input file> (.dex, .apk, .jar or .class)")
protected List<String> files;
@Parameter(names = {"-d", "--output-dir"}, description = "output directory")
@@ -45,88 +44,59 @@ public class JadxArgs implements IJadxArgs {
@Parameter(names = {"-h", "--help"}, description = "print this help", help = true)
protected boolean printHelp = false;
private final List<File> input = new ArrayList<File>();
private final List<File> input = new ArrayList<File>(1);
private File outputDir;
private final boolean inputRequired;
public JadxArgs(String[] args, boolean inputRequired) {
this.inputRequired = inputRequired;
public JadxCLIArgs(String[] args) {
parse(args);
checkArguments();
processArgs();
}
private void parse(String[] args) {
try {
new JCommander(this, args);
} catch (ParameterException e) {
System.out.println("Arguments parse error: " + e.getMessage());
System.out.println();
printHelp = true;
}
}
private void checkArguments() {
if (isPrintHelp()) {
printUsage();
System.exit(0);
}
if (isVerbose()) {
ch.qos.logback.classic.Logger rootLogger =
(ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
rootLogger.setLevel(ch.qos.logback.classic.Level.DEBUG);
}
try {
processArgs();
} catch (JadxException e) {
LOG.error(e.getMessage());
System.err.println("Arguments parse error: " + e.getMessage());
printUsage();
System.exit(1);
}
}
public void processArgs() throws JadxException {
if (printHelp)
return;
public void processArgs() {
if (isPrintHelp()) {
printUsage();
System.exit(0);
}
try {
if (threadsCount <= 0)
throw new JadxException("Threads count must be positive");
if (threadsCount <= 0)
throw new JadxException("Threads count must be positive");
if (files != null) {
for (String fileName : files) {
File file = new File(fileName);
if (file.exists())
input.add(file);
else
throw new JadxException("File not found: " + file);
if (files != null) {
for (String fileName : files) {
File file = new File(fileName);
if (file.exists())
input.add(file);
else
throw new JadxException("File not found: " + file);
}
}
}
if (input.isEmpty()) {
if (inputRequired)
throw new JadxException("Please specify input file");
else
return;
}
if (input.size() > 1) {
throw new JadxException("Only one input file is supported");
}
if (input.size() > 1)
throw new JadxException("Only one input file is supported");
if (outDirName == null) {
File file = new File(files.get(0));
String name = file.getName();
int pos = name.lastIndexOf('.');
if (pos != -1)
outDirName = name.substring(0, pos);
else
outDirName = name + "-jadx-out";
if (outDirName != null)
outputDir = new File(outDirName);
LOG.info("output directory: " + outDirName);
if (isVerbose()) {
ch.qos.logback.classic.Logger rootLogger =
(ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
rootLogger.setLevel(ch.qos.logback.classic.Level.DEBUG);
}
} catch (JadxException e) {
System.err.println("ERROR: " + e.getMessage());
printUsage();
System.exit(1);
}
outputDir = new File(outDirName);
if (outputDir.exists() && !outputDir.isDirectory())
throw new JadxException("Output directory exists as file " + outputDir);
}
public void printUsage() {
@@ -157,9 +127,6 @@ public class JadxArgs implements IJadxArgs {
opt.append(' ').append(p.getNames());
addSpaces(opt, maxNamesLen - opt.length() + 2);
opt.append("- ").append(p.getDescription());
if (inputRequired && name.equals("files")) {
opt.append(" [required]");
}
out.println(opt.toString());
break;
}
@@ -179,6 +146,10 @@ public class JadxArgs implements IJadxArgs {
return outputDir;
}
public void setOutputDir(File outputDir) {
this.outputDir = outputDir;
}
@Override
public int getThreadsCount() {
return threadsCount;
jadx-gui/src/main/java/jadx/gui/JadxGUI.java
+13 -14
View File
@@ -1,6 +1,6 @@
package jadx.gui;
import jadx.cli.JadxArgs;
import jadx.cli.JadxCLIArgs;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
@@ -12,25 +12,24 @@ public class JadxGUI {
private static final Logger LOG = LoggerFactory.getLogger(JadxGUI.class);
public static void main(String[] args) {
final JadxArgs jadxArgs = new JadxArgs(args, false);
try {
final JadxCLIArgs jadxArgs = new JadxCLIArgs(args);
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
SwingUtilities.invokeLater(new Runnable() {
public void run() {
JadxWrapper wrapper = new JadxWrapper(jadxArgs);
MainWindow mainWindow = new MainWindow(wrapper);
mainWindow.setVisible(true);
if (!jadxArgs.getInput().isEmpty()) {
mainWindow.openFile(jadxArgs.getInput().get(0));
}
}
});
} catch (Throwable e) {
LOG.error("Error: " + e.getMessage());
System.exit(1);
}
SwingUtilities.invokeLater(new Runnable() {
public void run() {
MainWindow mainWindow = new MainWindow(jadxArgs);
mainWindow.setVisible(true);
if (!jadxArgs.getInput().isEmpty()) {
mainWindow.openFile(jadxArgs.getInput().get(0));
}
}
});
}
}
jadx-gui/src/main/java/jadx/gui/MainWindow.java
+2 -3
View File
@@ -1,6 +1,5 @@
package jadx.gui;
import jadx.cli.JadxArgs;
import jadx.gui.treemodel.JClass;
import jadx.gui.treemodel.JNode;
import jadx.gui.treemodel.JRoot;
@@ -66,8 +65,8 @@ public class MainWindow extends JFrame {
private JToolBar searchToolBar;
private SearchBar searchBar;
public MainWindow(JadxArgs jadxArgs) {
this.wrapper = new JadxWrapper(jadxArgs);
public MainWindow(JadxWrapper wrapper) {
this.wrapper = wrapper;
initUI();
initMenuAndToolbar();