lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

在 Linux 平台使用 dbus-send 检测深色模式设置 (#5317)

Browse Source
This commit is contained in:
Glavo
2026-02-01 16:05:19 +08:00
committed by GitHub
parent 5a518cec03
commit 17be25c036
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/SystemUtils.java
View File

@@ -29,6 +29,7 @@ import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
@@ -75,12 +76,21 @@ public final class SystemUtils {
return managedProcess.getProcess().waitFor();
}
private static final Duration DEFAULT_MAX_WAIT_TIME = Duration.ofSeconds(15);
public static String run(String... command) throws Exception {
return run(Arrays.asList(command),
inputStream -> IOUtils.readFullyAsString(inputStream, OperatingSystem.NATIVE_CHARSET));
return run(List.of(command), DEFAULT_MAX_WAIT_TIME);
}
public static String run(List<String> command, Duration maxWaitTime) throws Exception {
return run(command, inputStream -> IOUtils.readFullyAsString(inputStream, OperatingSystem.NATIVE_CHARSET), maxWaitTime);
}
public static <T> T run(List<String> command, ExceptionalFunction<InputStream, T, ?> convert) throws Exception {
return run(command, convert, DEFAULT_MAX_WAIT_TIME);
}
public static <T> T run(List<String> command, ExceptionalFunction<InputStream, T, ?> convert, Duration maxWaitTime) throws Exception {
Process process = new ProcessBuilder(command)
.redirectError(ProcessBuilder.Redirect.DISCARD)
.start();
@@ -90,7 +100,7 @@ public final class SystemUtils {
Lang.wrap(() -> convert.apply(inputStream)),
Schedulers.io());
if (!process.waitFor(15, TimeUnit.SECONDS))
if (!process.waitFor(maxWaitTime.toMillis(), TimeUnit.MILLISECONDS))
throw new TimeoutException();
if (process.exitValue() != 0)