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

fix(gui): display Quark stderr output in Jadx log (#1955)(PR #1957)

Browse Source 
* Quark: also display error stream in Jadx log

* use info log level, open log viewer to track progress

---------

Co-authored-by: Skylot <skylot@gmail.com>
This commit is contained in:
Jan S
2023-07-24 19:03:37 +02:00
committed by GitHub
parent 3abdd40498
commit de8c315a7a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkManager.java
+9 -3
View File
@@ -14,8 +14,11 @@ import javax.swing.JOptionPane;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ch.qos.logback.classic.Level;
import jadx.core.utils.exceptions.JadxRuntimeException;
import jadx.gui.jobs.BackgroundExecutor;
import jadx.gui.logs.LogOptions;
import jadx.gui.treemodel.JRoot;
import jadx.gui.ui.MainWindow;
import jadx.gui.utils.SystemInfo;
@@ -200,10 +203,13 @@ public class QuarkManager {
}
private void runCommand(List<String> cmd) throws Exception {
LOG.debug("Running command: {}", String.join(" ", cmd));
Process process = Runtime.getRuntime().exec(cmd.toArray(new String[0]));
UiUtils.uiRun(() -> mainWindow.showLogViewer(LogOptions.forLevel(Level.INFO)));
LOG.info("Running command: {}", String.join(" ", cmd));
ProcessBuilder builder = new ProcessBuilder(cmd);
builder.redirectErrorStream(true);
Process process = builder.start();
try (BufferedReader buf = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
buf.lines().forEach(msg -> LOG.debug("# {}", msg));
buf.lines().forEach(msg -> LOG.info("# {}", msg));
} finally {
process.waitFor();
}