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

Make logs a pro feature

Browse source
This commit is contained in:
crschnick 2024-10-14 05:14:12 +00:00
parent 5346ef2ca5
commit fe7dd6aa71
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import io.xpipe.app.core.AppProperties;
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.OptionsBuilder;
import java.io.IOException;
@ -21,11 +22,19 @@ public class LoggingCategory extends AppPrefsCategory {
@Override
protected Comp<?> create() {
var prefs = AppPrefs.get();
var supported = LicenseProvider.get()
.getFeature("logging")
.isSupported();
var title = AppI18n.observable("sessionLogging")
.map(s -> s + (supported
? ""
: " (Pro)"));
return new OptionsBuilder()
.addTitle("sessionLogging")
.addTitle(title)
.sub(new OptionsBuilder()
.nameAndDescription("enableTerminalLogging")
.addToggle(prefs.enableTerminalLogging)
.disable(!supported)
.nameAndDescription("terminalLoggingDirectory")
.addComp(new ButtonComp(AppI18n.observable("openSessionLogs"), () -> {
var dir = AppProperties.get().getDataDir().resolve("sessions");

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

@ -96,7 +96,10 @@ public class TerminalLauncher {
var launcherScript = d.terminalLauncherScript(request, adjustedTitle);
var preparationScript = ScriptHelper.createLocalExecScript(launcherScript);
if (!AppPrefs.get().enableTerminalLogging().get()) {
var supported = LicenseProvider.get()
.getFeature("logging")
.isSupported();
if (!AppPrefs.get().enableTerminalLogging().get() || !supported) {
var config = new ExternalTerminalType.LaunchConfiguration(
entry != null ? color : null, adjustedTitle, cleanTitle, preparationScript, d);
return config;