beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-23 16:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reformat

Browse source
This commit is contained in:
crschnick 2024-10-17 09:41:41 +00:00
parent c084a55d15
commit f0fe0d7a6e
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/io/xpipe/app/prefs/LoggingCategory.java
View file

@ -7,7 +7,6 @@ import io.xpipe.app.fxcomps.Comp;
import io.xpipe.app.issue.ErrorEvent;
import io.xpipe.app.util.DesktopHelper;
import io.xpipe.app.util.LicenseProvider;
import io.xpipe.app.util.LicensedFeature;
import io.xpipe.app.util.OptionsBuilder;
import java.io.IOException;
@ -25,10 +24,7 @@ public class LoggingCategory extends AppPrefsCategory {
var prefs = AppPrefs.get();
var feature = LicenseProvider.get().getFeature("logging");
var supported = feature.isSupported() || feature.isPreviewSupported();
var title = AppI18n.observable("sessionLogging")
.map(s -> s + (supported
? ""
: " (Pro)"));
var title = AppI18n.observable("sessionLogging").map(s -> s + (supported ? "" : " (Pro)"));
return new OptionsBuilder()
.addTitle(title)
.sub(new OptionsBuilder()

29
app/src/main/java/io/xpipe/app/util/TerminalLauncher.java
View file

@ -69,7 +69,9 @@ public class TerminalLauncher {
var log = AppPrefs.get().enableTerminalLogging().get();
var terminalConfig = new TerminalInitScriptConfig(
adjustedTitle,
!log && type.shouldClear() && AppPrefs.get().clearTerminalOnInit().get(),
!log
&& type.shouldClear()
&& AppPrefs.get().clearTerminalOnInit().get(),
cc instanceof ShellControl ? type.additionalInitCommands() : TerminalInitFunction.none());
var request = UUID.randomUUID();
var config = createConfig(request, entry, cleanTitle, adjustedTitle);
@ -97,8 +99,7 @@ public class TerminalLauncher {
var preparationScript = ScriptHelper.createLocalExecScript(launcherScript);
var feature = LicenseProvider.get().getFeature("logging");
var supported = feature
.isSupported();
var supported = feature.isSupported();
if (!supported) {
throw new LicenseRequiredException(feature);
}
@ -134,23 +135,29 @@ public class TerminalLauncher {
entry != null ? color : null, adjustedTitle, cleanTitle, ps, ShellDialects.POWERSHELL);
return config;
} else {
var found = sc.command(sc.getShellDialect().getWhichCommand("script")).executeAndCheck();
var found = sc.command(sc.getShellDialect().getWhichCommand("script"))
.executeAndCheck();
if (!found) {
var suffix = sc.getOsType() == OsType.MACOS ? "This command is available in the util-linux package which can be installed via homebrew." : "This command is available in the util-linux package.";
throw ErrorEvent.expected(new IllegalStateException("Logging requires the script command to be installed. " + suffix));
var suffix = sc.getOsType() == OsType.MACOS
? "This command is available in the util-linux package which can be installed via homebrew."
: "This command is available in the util-linux package.";
throw ErrorEvent.expected(new IllegalStateException(
"Logging requires the script command to be installed. " + suffix));
}
var content = sc.getOsType() == OsType.MACOS || sc.getOsType() == OsType.BSD ?
"""
var content = sc.getOsType() == OsType.MACOS || sc.getOsType() == OsType.BSD
? """
echo "Transcript started, output file is sessions/%s"
script -e -q "%s" "%s"
echo "Transcript stopped, output file is sessions/%s"
""".formatted(logFile.getFileName(), logFile, preparationScript, logFile.getFileName()) :
"""
"""
.formatted(logFile.getFileName(), logFile, preparationScript, logFile.getFileName())
: """
echo "Transcript started, output file is sessions/%s"
script --quiet --command "%s" "%s"
echo "Transcript stopped, output file is sessions/%s"
""".formatted(logFile.getFileName(), preparationScript, logFile, logFile.getFileName());
"""
.formatted(logFile.getFileName(), preparationScript, logFile, logFile.getFileName());
var ps = ScriptHelper.createExecScript(sc.getShellDialect(), sc, content);
var config = new ExternalTerminalType.LaunchConfiguration(
entry != null ? color : null, adjustedTitle, cleanTitle, ps, sc.getShellDialect());