From 8b75699649541808f81e5bdfa0787bf2f75b2c61 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sun, 13 Apr 2025 17:07:14 +0000 Subject: [PATCH] Rework [stage] --- app/src/main/java/io/xpipe/app/core/AppArguments.java | 10 +--------- app/src/main/java/io/xpipe/app/core/AppProperties.java | 1 - app/src/main/java/io/xpipe/app/core/AppRestart.java | 6 ++---- .../java/io/xpipe/app/core/mode/OperationMode.java | 8 -------- .../java/io/xpipe/app/test/LocalExtensionTest.java | 2 +- .../java/io/xpipe/core/util/XPipeInstallation.java | 4 ++-- version | 2 +- 7 files changed, 7 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/core/AppArguments.java b/app/src/main/java/io/xpipe/app/core/AppArguments.java index f98ed28b4..239e1b9f9 100644 --- a/app/src/main/java/io/xpipe/app/core/AppArguments.java +++ b/app/src/main/java/io/xpipe/app/core/AppArguments.java @@ -19,7 +19,6 @@ public class AppArguments { List rawArgs; List resolvedArgs; - XPipeDaemonMode modeArg; List openArgs; private static final Pattern PROPERTY_PATTERN = Pattern.compile("^-[DP](.+)=(.+)$"); @@ -28,7 +27,7 @@ public class AppArguments { var rawArgs = Arrays.asList(args); var resolvedArgs = Arrays.asList(parseProperties(args)); var command = LauncherCommand.resolveLauncher(resolvedArgs.toArray(String[]::new)); - return new AppArguments(rawArgs, resolvedArgs, command.mode, command.inputs); + return new AppArguments(rawArgs, resolvedArgs, command.inputs); } private static String[] parseProperties(String[] args) { @@ -60,13 +59,6 @@ public class AppArguments { @CommandLine.Parameters(paramLabel = "") final List inputs = List.of(); - @CommandLine.Option( - names = {"--mode"}, - description = "The mode to launch the daemon in or switch too", - paramLabel = "", - converter = ModeConverter.class) - XPipeDaemonMode mode; - public static LauncherCommand resolveLauncher(String[] args) { var cmd = new CommandLine(new LauncherCommand()); cmd.setExecutionExceptionHandler((ex, commandLine, parseResult) -> { diff --git a/app/src/main/java/io/xpipe/app/core/AppProperties.java b/app/src/main/java/io/xpipe/app/core/AppProperties.java index 6eb5c67f0..6bf5a0a8e 100644 --- a/app/src/main/java/io/xpipe/app/core/AppProperties.java +++ b/app/src/main/java/io/xpipe/app/core/AppProperties.java @@ -194,7 +194,6 @@ public class AppProperties { .tag("raw", arguments.getRawArgs()) .tag("resolved", arguments.getResolvedArgs()) .tag("resolvedCommand", arguments.getOpenArgs()) - .tag("resolvedMode", arguments.getModeArg()) .handle(); for (var e : System.getProperties().entrySet()) { diff --git a/app/src/main/java/io/xpipe/app/core/AppRestart.java b/app/src/main/java/io/xpipe/app/core/AppRestart.java index 89ab4664d..cc3b56c7c 100644 --- a/app/src/main/java/io/xpipe/app/core/AppRestart.java +++ b/app/src/main/java/io/xpipe/app/core/AppRestart.java @@ -63,8 +63,7 @@ public class AppRestart { var dataDir = AppProperties.get().getDataDir(); var exec = createBackgroundLaunchCommand( List.of( - "--mode", - "gui", + "-Dio.xpipe.app.mode=gui", "-Dio.xpipe.app.acceptEula=true", "-Dio.xpipe.app.dataDir=\"" + dataDir + "\"", "-Dio.xpipe.app.restarted=true"), @@ -80,8 +79,7 @@ public class AppRestart { var dataDir = AppProperties.get().getDataDir(); var exec = createTerminalLaunchCommand( List.of( - "--mode", - "gui", + "-Dio.xpipe.app.mode=gui", "-Dio.xpipe.app.acceptEula=true", "-Dio.xpipe.app.dataDir=\"" + dataDir + "\"", "-Dio.xpipe.app.restarted=true"), diff --git a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java index 7dd46ac19..c08a86360 100644 --- a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java +++ b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java @@ -136,14 +136,6 @@ public abstract class OperationMode { return XPipeDaemonMode.GUI; } - var arg = AppProperties.get().getArguments().getModeArg(); - if (arg != null) { - event.tag("mode", arg.getDisplayName()) - .tag("reason", "modeArgPassed") - .handle(); - return arg; - } - var prop = AppProperties.get().getExplicitMode(); if (prop != null) { event.tag("mode", prop.getDisplayName()) diff --git a/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java b/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java index 87c65d1bd..1706444e0 100644 --- a/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java +++ b/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java @@ -16,6 +16,6 @@ public class LocalExtensionTest extends ExtensionTest { } var mode = OsType.getLocal().equals(OsType.WINDOWS) ? "tray" : "background"; - OperationMode.init(new String[] {"--mode", mode}); + OperationMode.init(new String[] {"-Dio.xpipe.app.mode=" + mode}); } } diff --git a/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java b/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java index 86f3d1122..b532a92f0 100644 --- a/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java +++ b/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java @@ -33,7 +33,7 @@ public class XPipeInstallation { public static String createExternalAsyncLaunchCommand( String installationBase, XPipeDaemonMode mode, String arguments, boolean restart) { var suffix = (arguments != null ? " " + arguments : ""); - var modeOption = mode != null ? " --mode " + mode.getDisplayName() : ""; + var modeOption = mode != null ? " -Dio.xpipe.app.mode=" + mode.getDisplayName() : ""; if (OsType.getLocal().equals(OsType.LINUX)) { return "nohup \"" + installationBase + "/bin/xpiped\"" + modeOption + suffix + "/dev/null 2>&1 & disown"; } else if (OsType.getLocal().equals(OsType.MACOS)) { @@ -51,7 +51,7 @@ public class XPipeInstallation { public static String createExternalLaunchCommand(String command, String arguments, XPipeDaemonMode mode) { var suffix = (arguments != null ? " " + arguments : ""); - var modeOption = mode != null ? " --mode " + mode.getDisplayName() : null; + var modeOption = mode != null ? " -Dio.xpipe.app.mode=" + mode.getDisplayName() : ""; return "\"" + command + "\"" + modeOption + suffix; } diff --git a/version b/version index 43761ef76..bc7b1280b 100644 --- a/version +++ b/version @@ -1 +1 @@ -16.0-38 +16.0-39