Skip to content

Commit 10495cb

Browse files
iBotPeachessv99
iBotPeaches
and
sv99
authored
Refactor into common config object. (#3100)
* extract Config * extract Config * style: linting --------- Co-authored-by: Slava Volkov <[email protected]>
1 parent 25509a7 commit 10495cb

32 files changed

+500
-523
lines changed

‎brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java

Lines changed: 65 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import brut.androlib.exceptions.CantFindFrameworkResException;
2222
import brut.androlib.exceptions.InFileNotFoundException;
2323
import brut.androlib.exceptions.OutDirExistsException;
24-
import brut.androlib.options.BuildOptions;
2524
import brut.common.BrutException;
2625
import brut.directory.DirectoryException;
26+
import brut.directory.ExtFile;
2727
import brut.util.AaptManager;
2828
import brut.util.OSDetection;
2929
import org.apache.commons.cli.*;
@@ -74,25 +74,28 @@ public static void main(String[] args) throws BrutException {
7474
setAdvanceMode();
7575
}
7676

77+
Config config = Config.getDefaultConfig();
78+
initConfig(commandLine, config);
79+
7780
boolean cmdFound = false;
7881
for (String opt : commandLine.getArgs()) {
7982
if (opt.equalsIgnoreCase("d") || opt.equalsIgnoreCase("decode")) {
80-
cmdDecode(commandLine);
83+
cmdDecode(commandLine, config);
8184
cmdFound = true;
8285
} else if (opt.equalsIgnoreCase("b") || opt.equalsIgnoreCase("build")) {
83-
cmdBuild(commandLine);
86+
cmdBuild(commandLine, config);
8487
cmdFound = true;
8588
} else if (opt.equalsIgnoreCase("if") || opt.equalsIgnoreCase("install-framework")) {
86-
cmdInstallFramework(commandLine);
89+
cmdInstallFramework(commandLine, config);
8790
cmdFound = true;
8891
} else if (opt.equalsIgnoreCase("empty-framework-dir")) {
89-
cmdEmptyFrameworkDirectory(commandLine);
92+
cmdEmptyFrameworkDirectory(commandLine, config);
9093
cmdFound = true;
9194
} else if (opt.equalsIgnoreCase("list-frameworks")) {
92-
cmdListFrameworks(commandLine);
95+
cmdListFrameworks(commandLine, config);
9396
cmdFound = true;
9497
} else if (opt.equalsIgnoreCase("publicize-resources")) {
95-
cmdPublicizeResources(commandLine);
98+
cmdPublicizeResources(commandLine, config);
9699
cmdFound = true;
97100
}
98101
}
@@ -108,54 +111,55 @@ public static void main(String[] args) throws BrutException {
108111
}
109112
}
110113

111-
private static void cmdDecode(CommandLine cli) throws AndrolibException {
112-
ApkDecoder decoder = new ApkDecoder();
114+
private static void initConfig(CommandLine cli, Config config) {
115+
if (cli.hasOption("p") || cli.hasOption("frame-path")) {
116+
config.frameworkDirectory = cli.getOptionValue("p");
117+
}
118+
if (cli.hasOption("t") || cli.hasOption("tag")) {
119+
config.frameworkTag = cli.getOptionValue("t");
120+
}
121+
if (cli.hasOption("api") || cli.hasOption("api-level")) {
122+
config.apiLevel = Integer.parseInt(cli.getOptionValue("api"));
123+
}
124+
}
113125

114-
int paraCount = cli.getArgList().size();
115-
String apkName = cli.getArgList().get(paraCount - 1);
116-
File outDir;
126+
private static void cmdDecode(CommandLine cli, Config config) throws AndrolibException {
127+
String apkName = getLastArg(cli);
117128

118-
// check for options
129+
// check decode options
119130
if (cli.hasOption("s") || cli.hasOption("no-src")) {
120-
decoder.setDecodeSources(ApkDecoder.DECODE_SOURCES_NONE);
131+
config.setDecodeSources(Config.DECODE_SOURCES_NONE);
121132
}
122133
if (cli.hasOption("only-main-classes")) {
123-
decoder.setDecodeSources(ApkDecoder.DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES);
134+
config.setDecodeSources(Config.DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES);
124135
}
125136
if (cli.hasOption("d") || cli.hasOption("debug")) {
126137
System.err.println("SmaliDebugging has been removed in 2.1.0 onward. Please see: https://github.com/iBotPeaches/Apktool/issues/1061");
127138
System.exit(1);
128139
}
129140
if (cli.hasOption("b") || cli.hasOption("no-debug-info")) {
130-
decoder.setBaksmaliDebugMode(false);
131-
}
132-
if (cli.hasOption("t") || cli.hasOption("frame-tag")) {
133-
decoder.setFrameworkTag(cli.getOptionValue("t"));
141+
config.baksmaliDebugMode = false;
134142
}
135143
if (cli.hasOption("f") || cli.hasOption("force")) {
136-
decoder.setForceDelete(true);
144+
config.forceDelete = true;
137145
}
138146
if (cli.hasOption("r") || cli.hasOption("no-res")) {
139-
decoder.setDecodeResources(ApkDecoder.DECODE_RESOURCES_NONE);
147+
config.setDecodeResources(Config.DECODE_RESOURCES_NONE);
140148
}
141149
if (cli.hasOption("force-manifest")) {
142-
decoder.setForceDecodeManifest(ApkDecoder.FORCE_DECODE_MANIFEST_FULL);
150+
config.setForceDecodeManifest(Config.FORCE_DECODE_MANIFEST_FULL);
143151
}
144152
if (cli.hasOption("no-assets")) {
145-
decoder.setDecodeAssets(ApkDecoder.DECODE_ASSETS_NONE);
153+
config.setDecodeAssets(Config.DECODE_ASSETS_NONE);
146154
}
147155
if (cli.hasOption("k") || cli.hasOption("keep-broken-res")) {
148-
decoder.setKeepBrokenResources(true);
149-
}
150-
if (cli.hasOption("p") || cli.hasOption("frame-path")) {
151-
decoder.setFrameworkDir(cli.getOptionValue("p"));
156+
config.keepBrokenResources = true;
152157
}
153158
if (cli.hasOption("m") || cli.hasOption("match-original")) {
154-
decoder.setAnalysisMode(true);
155-
}
156-
if (cli.hasOption("api") || cli.hasOption("api-level")) {
157-
decoder.setApiLevel(Integer.parseInt(cli.getOptionValue("api")));
159+
config.analysisMode = true;
158160
}
161+
162+
File outDir;
159163
if (cli.hasOption("o") || cli.hasOption("output")) {
160164
outDir = new File(cli.getOptionValue("o"));
161165
} else {
@@ -169,8 +173,8 @@ private static void cmdDecode(CommandLine cli) throws AndrolibException {
169173
outDir = new File(outName);
170174
}
171175

176+
ApkDecoder decoder = new ApkDecoder(config, new ExtFile(apkName));
172177
decoder.setOutDir(outDir);
173-
decoder.setApkFile(new File(apkName));
174178

175179
try {
176180
decoder.decode();
@@ -204,111 +208,88 @@ private static void cmdDecode(CommandLine cli) throws AndrolibException {
204208
}
205209
}
206210

207-
private static void cmdBuild(CommandLine cli) {
211+
private static void cmdBuild(CommandLine cli, Config config) {
208212
String[] args = cli.getArgs();
209213
String appDirName = args.length < 2 ? "." : args[1];
210-
File outFile;
211-
BuildOptions buildOptions = new BuildOptions();
212214

213215
// check for build options
214216
if (cli.hasOption("f") || cli.hasOption("force-all")) {
215-
buildOptions.forceBuildAll = true;
217+
config.forceBuildAll = true;
216218
}
217219
if (cli.hasOption("d") || cli.hasOption("debug")) {
218-
buildOptions.debugMode = true;
220+
config.debugMode = true;
219221
}
220222
if (cli.hasOption("n") || cli.hasOption("net-sec-conf")) {
221-
buildOptions.netSecConf = true;
223+
config.netSecConf = true;
222224
}
223225
if (cli.hasOption("v") || cli.hasOption("verbose")) {
224-
buildOptions.verbose = true;
226+
config.verbose = true;
225227
}
226228
if (cli.hasOption("a") || cli.hasOption("aapt")) {
227-
buildOptions.aaptPath = cli.getOptionValue("a");
229+
config.aaptPath = cli.getOptionValue("a");
228230
}
229231
if (cli.hasOption("c") || cli.hasOption("copy-original")) {
230232
System.err.println("-c/--copy-original has been deprecated. Removal planned for v3.0.0 (#2129)");
231-
buildOptions.copyOriginalFiles = true;
232-
}
233-
if (cli.hasOption("p") || cli.hasOption("frame-path")) {
234-
buildOptions.frameworkFolderLocation = cli.getOptionValue("p");
233+
config.copyOriginalFiles = true;
235234
}
236235
if (cli.hasOption("nc") || cli.hasOption("no-crunch")) {
237-
buildOptions.noCrunch = true;
236+
config.noCrunch = true;
238237
}
239238

240239
// Temporary flag to enable the use of aapt2. This will transform in time to a use-aapt1 flag, which will be
241240
// legacy and eventually removed.
242241
if (cli.hasOption("use-aapt2")) {
243-
buildOptions.useAapt2 = true;
244-
}
245-
if (cli.hasOption("api") || cli.hasOption("api-level")) {
246-
buildOptions.forceApi = Integer.parseInt(cli.getOptionValue("api"));
242+
config.useAapt2 = true;
247243
}
244+
245+
File outFile;
248246
if (cli.hasOption("o") || cli.hasOption("output")) {
249247
outFile = new File(cli.getOptionValue("o"));
250248
} else {
251249
outFile = null;
252250
}
253251

254-
if (buildOptions.netSecConf && !buildOptions.useAapt2) {
252+
if (config.netSecConf && !config.useAapt2) {
255253
System.err.println("-n / --net-sec-conf is only supported with --use-aapt2.");
256254
System.exit(1);
257255
}
258256

259257
// try and build apk
260258
try {
261259
if (cli.hasOption("a") || cli.hasOption("aapt")) {
262-
buildOptions.aaptVersion = AaptManager.getAaptVersion(cli.getOptionValue("a"));
260+
config.aaptVersion = AaptManager.getAaptVersion(cli.getOptionValue("a"));
263261
}
264-
new Androlib(buildOptions).build(new File(appDirName), outFile);
262+
new Androlib(config).build(new File(appDirName), outFile);
265263
} catch (BrutException ex) {
266264
System.err.println(ex.getMessage());
267265
System.exit(1);
268266
}
269267
}
270268

271-
private static void cmdInstallFramework(CommandLine cli) throws AndrolibException {
272-
int paraCount = cli.getArgList().size();
273-
String apkName = cli.getArgList().get(paraCount - 1);
274-
275-
brut.androlib.options.BuildOptions buildOptions = new BuildOptions();
276-
if (cli.hasOption("p") || cli.hasOption("frame-path")) {
277-
buildOptions.frameworkFolderLocation = cli.getOptionValue("p");
278-
}
279-
if (cli.hasOption("t") || cli.hasOption("tag")) {
280-
buildOptions.frameworkTag = cli.getOptionValue("t");
281-
}
282-
new Androlib(buildOptions).installFramework(new File(apkName));
269+
private static void cmdInstallFramework(CommandLine cli, Config config) throws AndrolibException {
270+
String apkName = getLastArg(cli);
271+
new Androlib(config).installFramework(new File(apkName));
283272
}
284273

285-
private static void cmdListFrameworks(CommandLine cli) throws AndrolibException {
286-
brut.androlib.options.BuildOptions buildOptions = new BuildOptions();
287-
if (cli.hasOption("p") || cli.hasOption("frame-path")) {
288-
buildOptions.frameworkFolderLocation = cli.getOptionValue("p");
289-
}
290-
291-
new Androlib(buildOptions).listFrameworks();
274+
private static void cmdListFrameworks(CommandLine cli, Config config) throws AndrolibException {
275+
new Androlib(config).listFrameworks();
292276
}
293277

294-
private static void cmdPublicizeResources(CommandLine cli) throws AndrolibException {
295-
int paraCount = cli.getArgList().size();
296-
String apkName = cli.getArgList().get(paraCount - 1);
297-
298-
new Androlib().publicizeResources(new File(apkName));
278+
private static void cmdPublicizeResources(CommandLine cli, Config config) throws AndrolibException {
279+
String apkName = getLastArg(cli);
280+
new Androlib(config).publicizeResources(new File(apkName));
299281
}
300282

301-
private static void cmdEmptyFrameworkDirectory(CommandLine cli) throws AndrolibException {
302-
brut.androlib.options.BuildOptions buildOptions = new BuildOptions();
303-
283+
private static void cmdEmptyFrameworkDirectory(CommandLine cli, Config config) throws AndrolibException {
304284
if (cli.hasOption("f") || cli.hasOption("force")) {
305-
buildOptions.forceDeleteFramework = true;
306-
}
307-
if (cli.hasOption("p") || cli.hasOption("frame-path")) {
308-
buildOptions.frameworkFolderLocation = cli.getOptionValue("p");
285+
config.forceDeleteFramework = true;
309286
}
287+
new Androlib(config).emptyFrameworkDirectory();
288+
}
310289

311-
new Androlib(buildOptions).emptyFrameworkDirectory();
290+
private static String getLastArg(CommandLine cli) {
291+
int paraCount = cli.getArgList().size();
292+
return cli.getArgList().get(paraCount - 1);
312293
}
313294

314295
private static void _version() {

0 commit comments

Comments
 (0)