Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
极致猎手
jadx
提交
5099e02c
J
jadx
项目概览
极致猎手
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
5099e02c
编写于
5月 23, 2022
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(gui): correct merge for plugin options from command line (#1490)
上级
f364b39b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
55 addition
and
2 deletion
+55
-2
jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java
jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java
+16
-2
jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java
jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java
+39
-0
未找到文件。
jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java
浏览文件 @
5099e02c
...
...
@@ -8,6 +8,7 @@ import java.util.LinkedHashMap;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Map
;
import
java.util.function.Supplier
;
import
org.jetbrains.annotations.Nullable
;
...
...
@@ -22,6 +23,7 @@ import jadx.api.plugins.JadxPluginInfo;
import
jadx.api.plugins.JadxPluginManager
;
import
jadx.api.plugins.options.JadxPluginOptions
;
import
jadx.api.plugins.options.OptionDescription
;
import
jadx.core.utils.Utils
;
public
class
JCommanderWrapper
<
T
>
{
private
final
JCommander
jc
;
...
...
@@ -50,12 +52,24 @@ public class JCommanderWrapper<T> {
if
(
parameter
.
isAssigned
())
{
// copy assigned field value to obj
Parameterized
parameterized
=
parameter
.
getParameterized
();
Object
val
=
parameterized
.
get
(
parameter
.
getObject
());
parameterized
.
set
(
obj
,
val
);
Object
providedValue
=
parameterized
.
get
(
parameter
.
getObject
());
Object
newValue
=
mergeValues
(
parameterized
.
getType
(),
providedValue
,
()
->
parameterized
.
get
(
obj
));
parameterized
.
set
(
obj
,
newValue
);
}
}
}
@SuppressWarnings
({
"rawtypes"
,
"unchecked"
})
private
static
Object
mergeValues
(
Class
<?>
type
,
Object
value
,
Supplier
<
Object
>
prevValueProvider
)
{
if
(
type
.
isAssignableFrom
(
Map
.
class
))
{
// merge maps instead replacing whole map
Map
prevMap
=
(
Map
)
prevValueProvider
.
get
();
return
Utils
.
mergeMaps
(
prevMap
,
(
Map
)
value
);
// value map will override keys in prevMap
}
// simple override
return
value
;
}
public
void
printUsage
()
{
// print usage in not sorted fields order (by default its sorted by description)
PrintStream
out
=
System
.
out
;
...
...
jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java
浏览文件 @
5099e02c
package
jadx.cli
;
import
java.util.Collections
;
import
java.util.Map
;
import
org.hamcrest.Matchers
;
import
org.junit.jupiter.api.Test
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
static
jadx
.
core
.
utils
.
Utils
.
newConstStringMap
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
is
;
...
...
@@ -47,6 +52,40 @@ public class JadxCLIArgsTest {
assertThat
(
override
(
args
,
""
).
isUseImports
(),
is
(
false
));
}
@Test
public
void
testPluginOptionsOverride
()
{
// add key to empty base map
checkPluginOptionsMerge
(
Collections
.
emptyMap
(),
"-Poption=otherValue"
,
newConstStringMap
(
"option"
,
"otherValue"
));
// override one key
checkPluginOptionsMerge
(
newConstStringMap
(
"option"
,
"value"
),
"-Poption=otherValue"
,
newConstStringMap
(
"option"
,
"otherValue"
));
// merge different keys
checkPluginOptionsMerge
(
Collections
.
singletonMap
(
"option1"
,
"value1"
),
"-Poption2=otherValue2"
,
newConstStringMap
(
"option1"
,
"value1"
,
"option2"
,
"otherValue2"
));
// merge and override
checkPluginOptionsMerge
(
newConstStringMap
(
"option1"
,
"value1"
,
"option2"
,
"value2"
),
"-Poption2=otherValue2"
,
newConstStringMap
(
"option1"
,
"value1"
,
"option2"
,
"otherValue2"
));
}
private
void
checkPluginOptionsMerge
(
Map
<
String
,
String
>
baseMap
,
String
providedArgs
,
Map
<
String
,
String
>
expectedMap
)
{
JadxCLIArgs
args
=
new
JadxCLIArgs
();
args
.
pluginOptions
=
baseMap
;
Map
<
String
,
String
>
resultMap
=
override
(
args
,
providedArgs
).
getPluginOptions
();
assertThat
(
resultMap
,
Matchers
.
equalTo
(
expectedMap
));
}
private
JadxCLIArgs
parse
(
String
...
args
)
{
return
parse
(
new
JadxCLIArgs
(),
args
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录