lee/xpipe
1
0 Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-10-06 15:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework file browser open and it improve ssh config support

Browse Source
This commit is contained in:
crschnick committed 2023-12-30 09:02:28 +00:00
1 parent 815787c8a9
commit ca84b90dbd
3 files changed
+8 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/io/xpipe/app/browser/BrowserModel.java
+6 -4
View File
@@ -4,8 +4,9 @@ import io.xpipe.app.fxcomps.util.BindingsHelper;
import io.xpipe.app.storage.DataStorage;
import io.xpipe.app.storage.DataStoreEntryRef;
import io.xpipe.app.util.BooleanScope;
import io.xpipe.app.util.ThreadHelper;
import io.xpipe.app.util.FileReference;
import io.xpipe.app.util.ThreadHelper;
import io.xpipe.core.store.FileNames;
import io.xpipe.core.store.FileSystemStore;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.Property;
@@ -19,6 +20,7 @@ import lombok.Setter;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;
@Getter
public class BrowserModel {
@@ -54,7 +56,7 @@ public class BrowserModel {
public void restoreState(BrowserSavedState.Entry e, BooleanProperty busy) {
var storageEntry = DataStorage.get().getStoreEntryIfPresent(e.getUuid());
storageEntry.ifPresent(entry -> {
openFileSystemAsync(entry.ref(), e.getPath(), busy);
openFileSystemAsync(entry.ref(), model -> e.getPath(), busy);
});
}
@@ -113,7 +115,7 @@ public class BrowserModel {
});
}
public void openFileSystemAsync(DataStoreEntryRef<? extends FileSystemStore> store, String path, BooleanProperty externalBusy) {
public void openFileSystemAsync(DataStoreEntryRef<? extends FileSystemStore> store, Function<OpenFileSystemModel, String> path, BooleanProperty externalBusy) {
if (store == null) {
return;
}
@@ -133,7 +135,7 @@ public class BrowserModel {
}
}
if (path != null) {
model.initWithGivenDirectory(path);
model.initWithGivenDirectory(FileNames.toDirectory(path.apply(model)));
} else {
model.initWithDefaultDirectory();
}
app/src/main/java/io/xpipe/app/launcher/LauncherInput.java
+1 -1
View File
@@ -116,7 +116,7 @@ public abstract class LauncherInput {
var dir = Files.isDirectory(file) ? file : file.getParent();
AppLayoutModel.get().selectBrowser();
BrowserModel.DEFAULT.openFileSystemAsync( DataStorage.get().local().ref(), dir.toString(), null);
BrowserModel.DEFAULT.openFileSystemAsync( DataStorage.get().local().ref(), model -> dir.toString(), null);
}
@Override