Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@
import org.jackhuang.hmcl.util.Log4jLevel;
import org.jackhuang.hmcl.util.Pair;
import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.io.IOUtils;
import org.jackhuang.hmcl.util.logging.Logger;
import org.jackhuang.hmcl.util.platform.*;

import java.io.BufferedReader;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.nio.file.Files;
Expand Down Expand Up @@ -123,6 +124,7 @@ public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType e
analyzeCrashReport();
}

/// Analyzes captured output and the complete latest log without blocking the JavaFX thread.
@SuppressWarnings("unchecked")
private void analyzeCrashReport() {
loading.set(true);
Expand All @@ -147,15 +149,15 @@ private void analyzeCrashReport() {
return pair(new HashSet<CrashReportAnalyzer.Result>(), new HashSet<String>());
}

String log;
try {
log = FileUtils.readTextMaybeNativeEncoding(latestLog);
CrashReportAnalyzer.Analysis analysis;
try (BufferedReader reader = IOUtils.newBufferedReaderMaybeNativeEncoding(latestLog)) {
analysis = CrashReportAnalyzer.analyze(reader);
} catch (IOException e) {
LOG.warning("Failed to read logs/latest.log", e);
return pair(new HashSet<CrashReportAnalyzer.Result>(), new HashSet<String>());
}

return pair(CrashReportAnalyzer.analyze(log), CrashReportAnalyzer.findKeywordsFromCrashReport(log));
return pair(analysis.results(), analysis.keywords());
})).whenComplete(Schedulers.javafx(), (taskResult, exception) -> {
loading.set(false);

Expand Down Expand Up @@ -211,7 +213,7 @@ private void analyzeCrashReport() {
break;
default:
message = i18n("game.crash.reason." + result.rule().name().toLowerCase(Locale.ROOT),
Arrays.stream(result.rule().getGroupNames()).map(groupName -> result.matcher().group(groupName))
result.rule().getGroupNames().stream().map(groupName -> result.matcher().group(groupName))
.toArray());
break;
}
Expand Down
Loading