lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-09-26 02:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Exception detail fixes

Browse Source
This commit is contained in:
crschnick
2025-11-07 09:16:52 +00:00
parent 266aa95399
commit ddae3a1f89
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/issue/ErrorHandlerDialog.java
+4
View File
@@ -7,6 +7,7 @@ import io.xpipe.app.core.AppFontSizes;
import io.xpipe.app.core.mode.AppOperationMode;
import io.xpipe.app.core.window.AppDialog;
import io.xpipe.app.platform.LabelGraphic;
import io.xpipe.app.process.ProcessOutputException;
import io.xpipe.app.util.Deobfuscator;
import javafx.application.Platform;
@@ -88,6 +89,9 @@ public class ErrorHandlerDialog {
private static Region createStrackTraceContent(ErrorEvent event) {
if (event.getThrowable() != null) {
String stackTrace = Deobfuscator.deobfuscateToString(event.getThrowable());
if (event.getThrowable() instanceof ProcessOutputException pex) {
stackTrace = stackTrace.replace(event.getThrowable().getMessage(), pex.getDetailedMessage());
}
stackTrace = stackTrace.replace("\t", "");
var tf = new TextArea(stackTrace);
AppFontSizes.xs(tf);
app/src/main/java/io/xpipe/app/process/ProcessOutputException.java
+22 -12
View File
@@ -52,24 +52,34 @@ public class ProcessOutputException extends Exception {
return of(null, exitCode, messages);
}
private static String formatMessage(String command, long exitCode, boolean includeCommand) {
var start = command != null && includeCommand ? "Command\n" + command + "\n" : "Process ";
var center = command != null && includeCommand ? "command\n" + command + "\n" : "process ";
var message =
switch ((int) exitCode) {
case CommandControl.START_FAILED_EXIT_CODE ->
start + "did not start up properly and had to be killed";
case CommandControl.EXIT_TIMEOUT_EXIT_CODE -> "Wait for exit of " + center + "timed out";
case CommandControl.UNASSIGNED_EXIT_CODE ->
start + "exited with unknown state. Did an external process interfere?";
case CommandControl.INTERNAL_ERROR_EXIT_CODE -> start + "execution failed";
case CommandControl.ELEVATION_FAILED_EXIT_CODE -> start + "elevation failed";
default -> start + "failed with exit code " + exitCode;
};
return message;
}
public String getDetailedMessage() {
return formatMessage(command, exitCode, true);
}
public static ProcessOutputException of(String command, long exitCode, String... messages) {
var combinedError = Arrays.stream(messages)
.filter(s -> s != null && !s.isBlank())
.map(s -> s.strip())
.collect(Collectors.joining("\n\n"))
.replaceAll("\r\n", "\n");
var base = command != null ? "Command [" + command + "]" : "Process";
var message =
switch ((int) exitCode) {
case CommandControl.START_FAILED_EXIT_CODE ->
base + " did not start up properly and had to be killed";
case CommandControl.EXIT_TIMEOUT_EXIT_CODE -> "Wait for " + base + " exit timed out";
case CommandControl.UNASSIGNED_EXIT_CODE ->
base + " exited with unknown state. Did an external process interfere?";
case CommandControl.INTERNAL_ERROR_EXIT_CODE -> base + " execution failed";
case CommandControl.ELEVATION_FAILED_EXIT_CODE -> base + " elevation failed";
default -> base + " failed with exit code " + exitCode;
};
var message = formatMessage(command, exitCode, false);
return new ProcessOutputException(command, exitCode, combinedError, message, null, null);
}