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

Reformat

Browse source
This commit is contained in:
crschnick 2024-11-20 09:22:20 +00:00
parent 9b20fe7e8e
commit ecdf5119b0
17 changed files with 64 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java
View file

@ -36,9 +36,10 @@ public class BrowserFullSessionModel extends BrowserAbstractSessionModel<Browser
static {
DEFAULT.getSessionEntries().add(new BrowserHistoryTabModel(DEFAULT));
if (AppPrefs.get().pinLocalMachineOnStartup().get()) {
var tab = new BrowserFileSystemTabModel(DEFAULT, DataStorage.get().local().ref(), BrowserFileSystemTabModel.SelectionMode.ALL);
var tab = new BrowserFileSystemTabModel(
DEFAULT, DataStorage.get().local().ref(), BrowserFileSystemTabModel.SelectionMode.ALL);
ThreadHelper.runFailableAsync(() -> {
DEFAULT.openSync(tab,null);
DEFAULT.openSync(tab, null);
DEFAULT.pinTab(tab);
});
}
@ -134,7 +135,9 @@ public class BrowserFullSessionModel extends BrowserAbstractSessionModel<Browser
globalPinnedTab.setValue(tab);
var previousOthers = previousTabs.stream().filter(browserSessionTab -> browserSessionTab != tab).toList();
var previousOthers = previousTabs.stream()
.filter(browserSessionTab -> browserSessionTab != tab)
.toList();
if (previousOthers.size() > 0) {
var prev = previousOthers.getLast();
getSelectedEntry().setValue(prev);

18
app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabComp.java
View file

@ -9,8 +9,8 @@ import io.xpipe.app.comp.augment.ContextMenuAugment;
import io.xpipe.app.comp.base.*;
import io.xpipe.app.core.AppFont;
import io.xpipe.app.util.InputHelper;
import io.xpipe.app.util.PlatformThread;
import javafx.beans.binding.Bindings;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
@ -99,13 +99,17 @@ public class BrowserFileSystemTabComp extends SimpleComp {
if (model.getBrowserModel() instanceof BrowserFullSessionModel fullSessionModel) {
var pinButton = new Button();
pinButton.graphicProperty().bind(PlatformThread.sync(Bindings.createObjectBinding(() -> {
if (fullSessionModel.getGlobalPinnedTab().getValue() != model) {
return new FontIcon("mdi2p-pin");
}
pinButton
.graphicProperty()
.bind(PlatformThread.sync(Bindings.createObjectBinding(
() -> {
if (fullSessionModel.getGlobalPinnedTab().getValue() != model) {
return new FontIcon("mdi2p-pin");
}
return new FontIcon("mdi2p-pin-off");
}, fullSessionModel.getGlobalPinnedTab())));
return new FontIcon("mdi2p-pin-off");
},
fullSessionModel.getGlobalPinnedTab())));
pinButton.setOnAction(e -> {
if (fullSessionModel.getGlobalPinnedTab().getValue() != model) {
fullSessionModel.pinTab(model);

3
app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
View file

@ -114,7 +114,8 @@ public final class BrowserFileSystemTabModel extends BrowserStoreSessionTab<File
var current = getCurrentDirectory();
// We might close this after storage shutdown
if (DataStorage.get() != null && DataStorage.get().getStoreEntries().contains(getEntry().get())
if (DataStorage.get() != null
&& DataStorage.get().getStoreEntries().contains(getEntry().get())
&& savedState != null
&& current != null) {
savedState.cd(current.getPath(), false);

6
app/src/main/java/io/xpipe/app/browser/file/BrowserTerminalDockTabModel.java
View file

@ -11,9 +11,9 @@ import io.xpipe.app.storage.DataColor;
import io.xpipe.app.terminal.TerminalDockComp;
import io.xpipe.app.terminal.TerminalDockModel;
import io.xpipe.app.terminal.TerminalView;
import io.xpipe.app.terminal.WindowsTerminalType;
import io.xpipe.app.util.ThreadHelper;
import javafx.application.Platform;
import javafx.beans.binding.Bindings;
import javafx.beans.value.ObservableBooleanValue;
@ -90,7 +90,9 @@ public final class BrowserTerminalDockTabModel extends BrowserSessionTab {
// Ugly fix for Windows Terminal instances not closing properly if multiple windows exist
if (AppPrefs.get().terminalType().getValue() instanceof WindowsTerminalType) {
var sessions = TerminalView.get().getSessions();
var others = sessions.stream().filter(shellSession -> shellSession.getTerminal().equals(session.getTerminal())).count();
var others = sessions.stream()
.filter(shellSession -> shellSession.getTerminal().equals(session.getTerminal()))
.count();
if (others == 0) {
session.getTerminal().controllable().ifPresent(controllableTerminalSession -> {
controllableTerminalSession.close();

11
app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java
View file

@ -38,14 +38,21 @@ public class SideMenuBarComp extends Comp<CompStructure<VBox>> {
var selectedBorder = Bindings.createObjectBinding(
() -> {
var c = Platform.getPreferences().getAccentColor().desaturate().desaturate();
var c = Platform.getPreferences()
.getAccentColor()
.desaturate()
.desaturate();
return new Background(new BackgroundFill(c, new CornerRadii(8), new Insets(14, 1, 14, 2)));
},
Platform.getPreferences().accentColorProperty());
var hoverBorder = Bindings.createObjectBinding(
() -> {
var c = Platform.getPreferences().getAccentColor().darker().desaturate().desaturate();
var c = Platform.getPreferences()
.getAccentColor()
.darker()
.desaturate()
.desaturate();
return new Background(new BackgroundFill(c, new CornerRadii(8), new Insets(14, 1, 14, 2)));
},
Platform.getPreferences().accentColorProperty());

5
app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java
View file

@ -100,7 +100,10 @@ public class StandardStoreEntryComp extends StoreEntryComp {
information.setGraphicTextGap(7);
if (getWrapper().getEntry().getProvider() != null) {
try {
information.textProperty().bind(PlatformThread.sync(getWrapper().getEntry().getProvider().informationString(section)));
information
.textProperty()
.bind(PlatformThread.sync(
getWrapper().getEntry().getProvider().informationString(section)));
} catch (Exception e) {
ErrorEvent.fromThrowable(e).handle();
}

3
app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
View file

@ -14,7 +14,6 @@ import io.xpipe.app.core.AppActionLinkDetector;
import io.xpipe.app.core.AppFont;
import io.xpipe.app.core.AppI18n;
import io.xpipe.app.ext.ActionProvider;
import io.xpipe.app.issue.ErrorEvent;
import io.xpipe.app.prefs.AppPrefs;
import io.xpipe.app.resources.AppResources;
import io.xpipe.app.storage.DataColor;
@ -24,9 +23,7 @@ import io.xpipe.app.update.XPipeDistributionType;
import io.xpipe.app.util.*;
import javafx.beans.binding.Bindings;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.value.ObservableDoubleValue;
import javafx.beans.value.ObservableValue;
import javafx.css.PseudoClass;
import javafx.geometry.Insets;
import javafx.geometry.Pos;

3
app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java
View file

@ -157,7 +157,8 @@ public class StoreEntryWrapper {
busy.setValue(entry.getBusyCounter().get() != 0);
deletable.setValue(entry.getConfiguration().isDeletable()
|| (AppPrefs.get().developerMode().getValue() && AppPrefs.get().developerDisableGuiRestrictions().getValue()));
|| (AppPrefs.get().developerMode().getValue()
&& AppPrefs.get().developerDisableGuiRestrictions().getValue()));
sessionActive.setValue(entry.getStore() instanceof SingletonSessionStore<?> ss
&& entry.getStore() instanceof ShellStore
&& ss.isSessionRunning());

7
app/src/main/java/io/xpipe/app/core/check/AppHomebrewCoreutilsCheck.java
View file

@ -29,9 +29,10 @@ public class AppHomebrewCoreutilsCheck {
var loc = checkCoreutils();
if (loc.isPresent()) {
ErrorEvent.fromMessage("You have the homebrew coreutils package installed and added to your PATH at " + loc.get() + "." +
" The coreutils commands overwrite and are incompatible to the native macOS commands, which XPipe expects." +
" Please remove the coreutils commands from your PATH prior to launching XPipe.")
ErrorEvent.fromMessage("You have the homebrew coreutils package installed and added to your PATH at "
+ loc.get() + "."
+ " The coreutils commands overwrite and are incompatible to the native macOS commands, which XPipe expects."
+ " Please remove the coreutils commands from your PATH prior to launching XPipe.")
.term()
.handle();
}

1
app/src/main/java/io/xpipe/app/core/check/AppUserDirectoryCheck.java
View file

@ -1,6 +1,5 @@
package io.xpipe.app.core.check;
import io.xpipe.app.core.AppProperties;
import io.xpipe.app.issue.ErrorEvent;
import org.apache.commons.io.FileUtils;

1
app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
View file

@ -4,7 +4,6 @@ import io.xpipe.app.beacon.AppBeaconServer;
import io.xpipe.app.core.*;
import io.xpipe.app.core.check.AppDebugModeCheck;
import io.xpipe.app.core.check.AppTempCheck;
import io.xpipe.app.core.check.AppUserDirectoryCheck;
import io.xpipe.app.core.launcher.LauncherCommand;
import io.xpipe.app.core.window.ModifiedStage;
import io.xpipe.app.issue.*;

14
app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
View file

@ -15,7 +15,6 @@ import io.xpipe.core.process.OsType;
import io.xpipe.core.util.InPlaceSecretValue;
import io.xpipe.core.util.ModuleHelper;
import javafx.beans.binding.Bindings;
import javafx.beans.property.*;
import javafx.beans.value.ObservableBooleanValue;
import javafx.beans.value.ObservableDoubleValue;
@ -43,13 +42,12 @@ public class AppPrefs {
@Getter
private final BooleanProperty requiresRestart = new SimpleBooleanProperty(false);
final BooleanProperty pinLocalMachineOnStartup =
map(Mapping.builder()
.property(new SimpleBooleanProperty(false))
.key("pinLocalMachineOnStartup")
.valueClass(Boolean.class)
.requiresRestart(true)
.build());
final BooleanProperty pinLocalMachineOnStartup = map(Mapping.builder()
.property(new SimpleBooleanProperty(false))
.key("pinLocalMachineOnStartup")
.valueClass(Boolean.class)
.requiresRestart(true)
.build());
final BooleanProperty dontAllowTerminalRestart =
mapVaultShared(new SimpleBooleanProperty(false), "dontAllowTerminalRestart", Boolean.class, false);
final BooleanProperty enableHttpApi =

3
app/src/main/java/io/xpipe/app/prefs/FileBrowserCategory.java
View file

@ -23,8 +23,7 @@ public class FileBrowserCategory extends AppPrefsCategory {
.pref(prefs.downloadsDirectory)
.addString(prefs.downloadsDirectory)
.pref(prefs.pinLocalMachineOnStartup)
.addToggle(prefs.pinLocalMachineOnStartup)
)
.addToggle(prefs.pinLocalMachineOnStartup))
.buildComp();
}
}

3
app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java
View file

@ -19,8 +19,7 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
ExternalTerminalType WINDOWS_TERMINAL_CANARY = new Canary();
private static CommandBuilder toCommand(TerminalLaunchConfiguration configuration) throws Exception {
var cmd = CommandBuilder.of()
.addIf(configuration.isPreferTabs(), "-w", "1", "nt");
var cmd = CommandBuilder.of().addIf(configuration.isPreferTabs(), "-w", "1", "nt");
if (configuration.getColor() != null) {
cmd.add("--tabColor").addQuoted(configuration.getColor().toHexString());

17
app/src/main/java/io/xpipe/app/update/AppInstaller.java
View file

@ -94,12 +94,16 @@ public class AppInstaller {
: getPowershellCommand(file.toString(), logFile, exec, systemWide);
String toRun;
if (ProcessControlProvider.get().getEffectiveLocalDialect() == ShellDialects.CMD) {
toRun = systemWide ? "powershell -Command Start-Process -Verb runAs -WindowStyle Minimized -FilePath cmd -ArgumentList \"/c\", '\""
+ ScriptHelper.createLocalExecScript(command) + "\"'" :
"start \"XPipe Updater\" /min cmd /c \"" + ScriptHelper.createLocalExecScript(command) + "\"";
toRun = systemWide
? "powershell -Command Start-Process -Verb runAs -WindowStyle Minimized -FilePath cmd -ArgumentList \"/c\", '\""
+ ScriptHelper.createLocalExecScript(command) + "\"'"
: "start \"XPipe Updater\" /min cmd /c \"" + ScriptHelper.createLocalExecScript(command)
+ "\"";
} else {
toRun = "Start-Process -WindowStyle Minimized -FilePath powershell -ArgumentList \"-ExecutionPolicy\", \"Bypass\", \"-File\", \"`\""
+ ScriptHelper.createLocalExecScript(command) + "`\"\"" + (systemWide ? " -Verb runAs" : "");
toRun =
"Start-Process -WindowStyle Minimized -FilePath powershell -ArgumentList \"-ExecutionPolicy\", \"Bypass\", \"-File\", \"`\""
+ ScriptHelper.createLocalExecScript(command) + "`\"\""
+ (systemWide ? " -Verb runAs" : "");
}
runAndClose(() -> {
LocalShell.getShell().executeSimpleCommand(toRun);
@ -112,7 +116,8 @@ public class AppInstaller {
}
private boolean isSystemWide() {
return Files.exists(XPipeInstallation.getCurrentInstallationBasePath().resolve("system"));
return Files.exists(
XPipeInstallation.getCurrentInstallationBasePath().resolve("system"));
}
private String getCmdCommand(String file, String logFile, String exec, boolean systemWide) {

2
core/src/main/java/io/xpipe/core/util/XPipeInstallation.java
View file

@ -260,7 +260,7 @@ public class XPipeInstallation {
String path;
if (OsType.getLocal().equals(OsType.WINDOWS)) {
var pg = System.getenv("ProgramFiles");
var systemPath = Path.of(pg,stage ? "XPipe PTB" : "XPipe");
var systemPath = Path.of(pg, stage ? "XPipe PTB" : "XPipe");
if (Files.exists(systemPath)) {
return systemPath.toString();
}

5
ext/base/src/main/java/io/xpipe/ext/base/browser/DownloadAction.java
View file

@ -5,16 +5,15 @@ import io.xpipe.app.browser.action.BrowserLeafAction;
import io.xpipe.app.browser.file.BrowserEntry;
import io.xpipe.app.browser.file.BrowserFileSystemTabModel;
import io.xpipe.app.core.AppI18n;
import io.xpipe.app.prefs.AppPrefs;
import io.xpipe.core.store.FileKind;
import javafx.beans.value.ObservableValue;
import javafx.scene.Node;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyCombination;
import org.kordamp.ikonli.javafx.FontIcon;
import java.util.Collections;
import java.util.List;
public class DownloadAction implements BrowserLeafAction {