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

Various bug fixes

Browse source
This commit is contained in:
crschnick 2024-02-26 13:31:55 +00:00
parent dcbcab722c
commit 8d474c2640
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,7 @@ public class AppPrefs {
final BooleanProperty clearTerminalOnInit = final BooleanProperty clearTerminalOnInit =
map(new SimpleBooleanProperty(true), "clearTerminalOnInit", Boolean.class); map(new SimpleBooleanProperty(true), "clearTerminalOnInit", Boolean.class);
public final BooleanProperty disableCertutilUse = public final BooleanProperty disableCertutilUse =
mapVaultSpecific(new SimpleBooleanProperty(false), "disableCertutilUse", Boolean.class); map(new SimpleBooleanProperty(false), "disableCertutilUse", Boolean.class);
public final BooleanProperty useLocalFallbackShell = public final BooleanProperty useLocalFallbackShell =
map(new SimpleBooleanProperty(false), "useLocalFallbackShell", Boolean.class); map(new SimpleBooleanProperty(false), "useLocalFallbackShell", Boolean.class);
public final BooleanProperty disableTerminalRemotePasswordPreparation = public final BooleanProperty disableTerminalRemotePasswordPreparation =

8
app/src/main/java/io/xpipe/app/storage/StandardStorage.java
View file

@ -33,7 +33,6 @@ public class StandardStorage extends DataStorage {
StandardStorage() { StandardStorage() {
this.gitStorageHandler = GitStorageHandler.getInstance(); this.gitStorageHandler = GitStorageHandler.getInstance();
this.gitStorageHandler.init(dir);
} }
@Override @Override
@ -46,6 +45,12 @@ public class StandardStorage extends DataStorage {
return; return;
} }
try {
FileUtils.forceMkdir(dir.toFile());
} catch (Exception e) {
ErrorEvent.fromThrowable(e).terminal(true).build().handle();
}
try { try {
initSystemInfo(); initSystemInfo();
} catch (Exception e) { } catch (Exception e) {
@ -58,6 +63,7 @@ public class StandardStorage extends DataStorage {
ErrorEvent.fromThrowable(e).terminal(true).build().handle(); ErrorEvent.fromThrowable(e).terminal(true).build().handle();
} }
this.gitStorageHandler.init(dir);
this.gitStorageHandler.beforeStorageLoad(); this.gitStorageHandler.beforeStorageLoad();
var storesDir = getStoresDir(); var storesDir = getStoresDir();

4
app/src/main/java/io/xpipe/app/util/FileOpener.java
View file

@ -83,9 +83,7 @@ public class FileOpener {
LocalShell.getShell().executeSimpleCommand(cmd); LocalShell.getShell().executeSimpleCommand(cmd);
} }
case OsType.Linux linux -> { case OsType.Linux linux -> {
LocalShell.getShell() throw new UnsupportedOperationException();
.executeSimpleCommand("mimeopen -a "
+ LocalShell.getShell().getShellDialect().fileArgument(localFile));
} }
case OsType.MacOs macOs -> { case OsType.MacOs macOs -> {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();

2
ext/base/src/main/java/io/xpipe/ext/base/browser/OpenFileWithAction.java
View file

@ -44,7 +44,7 @@ public class OpenFileWithAction implements LeafAction {
@Override @Override
public boolean isApplicable(OpenFileSystemModel model, List<BrowserEntry> entries) { public boolean isApplicable(OpenFileSystemModel model, List<BrowserEntry> entries) {
return !OsType.getLocal().equals(OsType.MACOS) return OsType.getLocal().equals(OsType.WINDOWS)
&& entries.size() == 1 && entries.size() == 1
&& entries.stream().allMatch(entry -> entry.getRawFileEntry().getKind() == FileKind.FILE); && entries.stream().allMatch(entry -> entry.getRawFileEntry().getKind() == FileKind.FILE);
} }