Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
c95d6490
J
jadx
项目概览
keyescgm
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c95d6490
编写于
3月 20, 2021
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(cli): add decompilation progress
上级
a5b2b043
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
46 addition
and
20 deletion
+46
-20
jadx-cli/src/main/java/jadx/cli/JadxCLI.java
jadx-cli/src/main/java/jadx/cli/JadxCLI.java
+8
-1
jadx-cli/src/main/java/jadx/cli/LogHelper.java
jadx-cli/src/main/java/jadx/cli/LogHelper.java
+10
-0
jadx-core/src/main/java/jadx/api/JadxDecompiler.java
jadx-core/src/main/java/jadx/api/JadxDecompiler.java
+22
-0
jadx-gui/src/main/java/jadx/gui/JadxWrapper.java
jadx-gui/src/main/java/jadx/gui/JadxWrapper.java
+6
-19
未找到文件。
jadx-cli/src/main/java/jadx/cli/JadxCLI.java
浏览文件 @
c95d6490
...
...
@@ -42,7 +42,14 @@ public class JadxCLI {
jadxArgs
.
setCodeWriterProvider
(
SimpleCodeWriter:
:
new
);
try
(
JadxDecompiler
jadx
=
new
JadxDecompiler
(
jadxArgs
))
{
jadx
.
load
();
jadx
.
save
();
if
(
LogHelper
.
getLogLevel
()
==
LogHelper
.
LogLevelEnum
.
QUIET
)
{
jadx
.
save
();
}
else
{
jadx
.
save
(
500
,
(
done
,
total
)
->
{
int
progress
=
(
int
)
(
done
*
100.0
/
total
);
System
.
out
.
printf
(
"INFO - progress: %d of %d (%d%%)\r"
,
done
,
total
,
progress
);
});
}
int
errorsCount
=
jadx
.
getErrorsCount
();
if
(
errorsCount
!=
0
)
{
jadx
.
printErrorsReport
();
...
...
jadx-cli/src/main/java/jadx/cli/LogHelper.java
浏览文件 @
c95d6490
package
jadx.cli
;
import
org.jetbrains.annotations.Nullable
;
import
org.slf4j.LoggerFactory
;
import
com.beust.jcommander.IStringConverter
;
...
...
@@ -31,6 +32,8 @@ public class LogHelper {
}
}
private
static
LogLevelEnum
logLevelValue
;
public
static
void
setLogLevelFromArgs
(
JadxCLIArgs
args
)
{
if
(
isCustomLogConfig
())
{
return
;
...
...
@@ -46,6 +49,8 @@ public class LogHelper {
}
public
static
void
applyLogLevel
(
LogLevelEnum
logLevel
)
{
logLevelValue
=
logLevel
;
Logger
rootLogger
=
(
Logger
)
LoggerFactory
.
getLogger
(
Logger
.
ROOT_LOGGER_NAME
);
rootLogger
.
setLevel
(
logLevel
.
getLevel
());
...
...
@@ -56,6 +61,11 @@ public class LogHelper {
}
}
@Nullable
public
static
LogLevelEnum
getLogLevel
()
{
return
logLevelValue
;
}
private
static
void
setLevelForClass
(
Class
<?>
cls
,
Level
level
)
{
((
Logger
)
LoggerFactory
.
getLogger
(
cls
)).
setLevel
(
level
);
}
...
...
jadx-core/src/main/java/jadx/api/JadxDecompiler.java
浏览文件 @
c95d6490
...
...
@@ -15,6 +15,7 @@ import java.util.Set;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.ThreadPoolExecutor
;
import
java.util.concurrent.TimeUnit
;
import
java.util.function.Predicate
;
import
java.util.stream.Collectors
;
...
...
@@ -162,6 +163,27 @@ public final class JadxDecompiler implements Closeable {
save
(!
args
.
isSkipSources
(),
!
args
.
isSkipResources
());
}
public
interface
ProgressListener
{
void
progress
(
long
done
,
long
total
);
}
@SuppressWarnings
(
"BusyWait"
)
public
void
save
(
int
intervalInMillis
,
ProgressListener
listener
)
{
ThreadPoolExecutor
ex
=
(
ThreadPoolExecutor
)
getSaveExecutor
();
ex
.
shutdown
();
try
{
long
total
=
ex
.
getTaskCount
();
while
(
ex
.
isTerminating
())
{
long
done
=
ex
.
getCompletedTaskCount
();
listener
.
progress
(
done
,
total
);
Thread
.
sleep
(
intervalInMillis
);
}
}
catch
(
InterruptedException
e
)
{
LOG
.
error
(
"Save interrupted"
,
e
);
Thread
.
currentThread
().
interrupt
();
}
}
public
void
saveSources
()
{
save
(
true
,
false
);
}
...
...
jadx-gui/src/main/java/jadx/gui/JadxWrapper.java
浏览文件 @
c95d6490
...
...
@@ -6,7 +6,6 @@ import java.util.ArrayList;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.concurrent.ThreadPoolExecutor
;
import
java.util.stream.Collectors
;
import
javax.swing.ProgressMonitor
;
...
...
@@ -66,24 +65,12 @@ public class JadxWrapper {
public
void
saveAll
(
File
dir
,
ProgressMonitor
progressMonitor
)
{
Runnable
save
=
()
->
{
try
{
decompiler
.
getArgs
().
setRootDir
(
dir
);
ThreadPoolExecutor
ex
=
(
ThreadPoolExecutor
)
decompiler
.
getSaveExecutor
();
ex
.
shutdown
();
while
(
ex
.
isTerminating
())
{
long
total
=
ex
.
getTaskCount
();
long
done
=
ex
.
getCompletedTaskCount
();
progressMonitor
.
setProgress
((
int
)
(
done
*
100.0
/
total
));
Thread
.
sleep
(
500
);
}
progressMonitor
.
close
();
LOG
.
info
(
"decompilation complete, freeing memory ..."
);
decompiler
.
getClasses
().
forEach
(
JavaClass:
:
unload
);
LOG
.
info
(
"done"
);
}
catch
(
InterruptedException
e
)
{
LOG
.
error
(
"Save interrupted"
,
e
);
Thread
.
currentThread
().
interrupt
();
}
decompiler
.
getArgs
().
setRootDir
(
dir
);
decompiler
.
save
(
500
,
(
done
,
total
)
->
progressMonitor
.
setProgress
((
int
)
(
done
*
100.0
/
total
)));
progressMonitor
.
close
();
LOG
.
info
(
"decompilation complete, freeing memory ..."
);
decompiler
.
getClasses
().
forEach
(
JavaClass:
:
unload
);
LOG
.
info
(
"done"
);
};
new
Thread
(
save
).
start
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录