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

Rework file browser open and it improve ssh config support

Browse source
This commit is contained in:
crschnick 2023-12-30 09:02:28 +00:00
parent 815787c8a9
commit ca84b90dbd
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/io/xpipe/app/browser/BrowserModel.java
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();
}

2
app/src/main/java/io/xpipe/app/launcher/LauncherInput.java
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

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

@ -16,7 +16,7 @@ public class OpenDirectoryInNewTabAction implements LeafAction {
model.getBrowserModel()
.openFileSystemAsync(
model.getEntry(),
entries.get(0).getRawFileEntry().getPath(),
m -> entries.get(0).getRawFileEntry().getPath(),
null);
}