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

refactor: make input plugin api similar to pass plugins

Browse Source
This commit is contained in:
Skylot
2022-08-22 17:47:58 +01:00
parent 0c4d46ead5
commit a89dbc1152
38 changed files with 370 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java
+9 -14
View File
@@ -18,7 +18,7 @@ import com.beust.jcommander.ParameterException;
import com.beust.jcommander.Parameterized;
import jadx.api.JadxDecompiler;
import jadx.api.impl.plugins.SimplePluginContext;
import jadx.api.impl.plugins.PluginsContext;
import jadx.api.plugins.JadxPlugin;
import jadx.api.plugins.JadxPluginInfo;
import jadx.api.plugins.options.JadxPluginOptions;
@@ -73,7 +73,7 @@ public class JCommanderWrapper<T> {
}
public void printUsage() {
// print usage in not sorted fields order (by default its sorted by description)
// print usage in not sorted fields order (by default sorted by description)
PrintStream out = System.out;
out.println();
out.println("jadx - dex to java decompiler, version: " + JadxDecompiler.getVersion());
@@ -176,16 +176,11 @@ public class JCommanderWrapper<T> {
int k = 1;
// load and init all options plugins to print all options
try (JadxDecompiler decompiler = new JadxDecompiler(argsObj.toJadxArgs())) {
Map<String, String> pluginOptions = decompiler.getArgs().getPluginOptions();
SimplePluginContext context = new SimplePluginContext(decompiler);
for (JadxPlugin plugin : decompiler.getPluginManager().getAllPlugins()) {
if (plugin instanceof JadxPluginOptions) {
JadxPluginOptions optionsPlugin = (JadxPluginOptions) plugin;
optionsPlugin.setOptions(pluginOptions);
optionsPlugin.init(context);
if (appendPlugin(optionsPlugin, sb, maxNamesLen, k)) {
k++;
}
PluginsContext context = new PluginsContext(decompiler);
decompiler.getPluginManager().initAll(context);
for (Map.Entry<JadxPlugin, JadxPluginOptions> entry : context.getOptionsMap().entrySet()) {
if (appendPlugin(entry.getKey(), entry.getValue(), sb, maxNamesLen, k)) {
k++;
}
}
}
@@ -195,8 +190,8 @@ public class JCommanderWrapper<T> {
return "\nPlugin options (-P<name>=<value>):" + sb;
}
private boolean appendPlugin(JadxPluginOptions plugin, StringBuilder out, int maxNamesLen, int k) {
List<OptionDescription> descs = plugin.getOptionsDescriptions();
private boolean appendPlugin(JadxPlugin plugin, JadxPluginOptions options, StringBuilder out, int maxNamesLen, int k) {
List<OptionDescription> descs = options.getOptionsDescriptions();
if (descs.isEmpty()) {
return false;
}
jadx-cli/src/main/java/jadx/cli/clst/ConvertToClsSet.java
+8 -4
View File
@@ -12,9 +12,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jadx.api.JadxArgs;
import jadx.api.JadxDecompiler;
import jadx.api.impl.plugins.PluginsContext;
import jadx.api.plugins.JadxPluginManager;
import jadx.api.plugins.input.JadxInputPlugin;
import jadx.api.plugins.input.data.ILoadResult;
import jadx.api.plugins.input.ICodeLoader;
import jadx.api.plugins.input.JadxCodeInput;
import jadx.core.clsp.ClsSet;
import jadx.core.dex.nodes.ClassNode;
import jadx.core.dex.nodes.RootNode;
@@ -38,10 +40,12 @@ public class ConvertToClsSet {
List<Path> inputPaths = Stream.of(args).map(Paths::get).collect(Collectors.toList());
Path output = inputPaths.remove(0);
PluginsContext pluginsContext = new PluginsContext(new JadxDecompiler());
JadxPluginManager pluginManager = new JadxPluginManager();
pluginManager.load();
List<ILoadResult> loadedInputs = new ArrayList<>();
for (JadxInputPlugin inputPlugin : pluginManager.getInputPlugins()) {
pluginManager.initResolved(pluginsContext);
List<ICodeLoader> loadedInputs = new ArrayList<>();
for (JadxCodeInput inputPlugin : pluginsContext.getCodeInputs()) {
loadedInputs.add(inputPlugin.loadFiles(inputPaths));
}