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

Rework lxd connections

Browse source
This commit is contained in:
crschnick 2023-07-04 05:42:00 +00:00
parent 75e85f3764
commit a097ae7a41
5 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/xpipe/app/comp/storage/store/StoreIntroComp.java
View file

@ -36,7 +36,7 @@ public class StoreIntroComp extends SimpleComp {
});
var scanButton = new Button(AppI18n.get("detectConnections"), new FontIcon("mdi2m-magnify"));
scanButton.setOnAction(event -> ScanAlert.showAsync(DataStorage.get().getStoreEntry(new LocalStore()), false));
scanButton.setOnAction(event -> ScanAlert.showAsync(DataStorage.get().getStoreEntry(new LocalStore())));
var scanPane = new StackPane(scanButton);
scanPane.setAlignment(Pos.CENTER);

4
app/src/main/java/io/xpipe/app/comp/store/GuiDsStoreCreator.java
View file

@ -123,7 +123,9 @@ public class GuiDsStoreCreator extends MultiStepComp.Step<CompStructure<?>> {
e -> {
try {
DataStorage.get().addStoreEntry(e);
ScanAlert.showAsync(e, true);
if (e.getProvider().shouldHaveSubShells()) {
ScanAlert.showAsync(e);
}
} catch (Exception ex) {
ErrorEvent.fromThrowable(ex).handle();
}

4
app/src/main/java/io/xpipe/app/ext/ScanProvider.java
View file

@ -49,11 +49,11 @@ public abstract class ScanProvider {
return ALL;
}
public ScanOperation create(DataStore store, boolean automatic) {
public ScanOperation create(DataStore store) {
return null;
}
public ScanOperation create(DataStoreEntry entry, ShellControl sc, boolean automatic) throws Exception {
public ScanOperation create(DataStoreEntry entry, ShellControl sc) throws Exception {
return null;
}
}

14
app/src/main/java/io/xpipe/app/util/ScanAlert.java
View file

@ -29,34 +29,34 @@ import java.util.function.Supplier;
public class ScanAlert {
public static void showAsync(DataStoreEntry entry, boolean automatic) {
public static void showAsync(DataStoreEntry entry) {
ThreadHelper.runAsync(() -> {
if (entry.getStore() instanceof ShellStore) {
showForShellStore(entry, automatic);
showForShellStore(entry);
} else {
showForOtherStore(entry, automatic);
showForOtherStore(entry);
}
});
}
private static void showForOtherStore(DataStoreEntry entry, boolean automatic) {
private static void showForOtherStore(DataStoreEntry entry) {
showIfNeeded(() -> {
var providers = ScanProvider.getAll();
var applicable = providers.stream()
.map(scanProvider -> scanProvider.create(entry.getStore(), automatic))
.map(scanProvider -> scanProvider.create(entry.getStore()))
.filter(scanOperation -> scanOperation != null)
.toList();
return applicable;
});
}
private static void showForShellStore(DataStoreEntry entry, boolean automatic) {
private static void showForShellStore(DataStoreEntry entry) {
showIfNeeded(() -> {
try (var sc = ((ShellStore) entry.getStore()).control().start()) {
var providers = ScanProvider.getAll();
var applicable = new ArrayList<ScanProvider.ScanOperation>();
for (ScanProvider scanProvider : providers) {
ScanProvider.ScanOperation operation = scanProvider.create(entry, sc, automatic);
ScanProvider.ScanOperation operation = scanProvider.create(entry, sc);
if (operation != null) {
applicable.add(operation);
}

2
ext/base/src/main/java/io/xpipe/ext/base/action/ScanAction.java
View file

@ -24,7 +24,7 @@ public class ScanAction implements ActionProvider {
@Override
public void execute() {
ScanAlert.showAsync(entry, false);
ScanAlert.showAsync(entry);
}
}