From cf136fe7dfb17bd67731bd4b9f64199b1473ea9e Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@gmail.com>
Date: Thu, 2 Feb 2023 21:30:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9B=B4=E5=A4=9A=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=20(#1970)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* close #1883: export vm crash log

* fix #2047: export fml-client-latest.log
---
 .../org/jackhuang/hmcl/game/LogExporter.java  | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LogExporter.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LogExporter.java
index 17f94ba23..2daa48c53 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LogExporter.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LogExporter.java
@@ -19,17 +19,25 @@ package org.jackhuang.hmcl.game;
 
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.Zipper;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.lang.management.ManagementFactory;
+import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.Logging.LOG;
 
 public final class LogExporter {
     private LogExporter() {
@@ -57,16 +65,37 @@ public final class LogExporter {
 
         return CompletableFuture.runAsync(() -> {
             try (Zipper zipper = new Zipper(zipFile)) {
-                if (Files.exists(runDirectory.resolve("logs").resolve("debug.log"))) {
-                    zipper.putFile(runDirectory.resolve("logs").resolve("debug.log"), "debug.log");
+                Path logsDir = runDirectory.resolve("logs");
+                if (Files.exists(logsDir.resolve("debug.log"))) {
+                    zipper.putFile(logsDir.resolve("debug.log"), "debug.log");
                 }
-                if (Files.exists(runDirectory.resolve("logs").resolve("latest.log"))) {
-                    zipper.putFile(runDirectory.resolve("logs").resolve("latest.log"), "latest.log");
+                if (Files.exists(logsDir.resolve("latest.log"))) {
+                    zipper.putFile(logsDir.resolve("latest.log"), "latest.log");
                 }
+                if (Files.exists(logsDir.resolve("fml-client-latest.log"))) {
+                    zipper.putFile(logsDir.resolve("fml-client-latest.log"), "fml-client-latest.log");
+                }
+
                 zipper.putTextFile(Logging.getLogs(), "hmcl.log");
                 zipper.putTextFile(logs, "minecraft.log");
                 zipper.putTextFile(Logging.filterForbiddenToken(launchScript), OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "launch.bat" : "launch.sh");
 
+                try (DirectoryStream<Path> stream = Files.newDirectoryStream(runDirectory, "hs_err_*.log")) {
+                    long processStartTime = ManagementFactory.getRuntimeMXBean().getStartTime();
+
+                    for (Path file : stream) {
+                        if (Files.isRegularFile(file)) {
+                            FileTime time = Files.readAttributes(file, BasicFileAttributes.class).creationTime();
+                            if (time.toMillis() >= processStartTime) {
+                                String crashLog = Logging.filterForbiddenToken(FileUtils.readText(file));
+                                zipper.putTextFile(crashLog, file.getFileName().toString());
+                            }
+                        }
+                    }
+                } catch (Throwable e) {
+                    LOG.log(Level.WARNING, "Failed to find vm crash log", e);
+                }
+
                 for (String id : versions) {
                     Path versionJson = baseDirectory.resolve("versions").resolve(id).resolve(id + ".json");
                     if (Files.exists(versionJson)) {