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

Adapt extension loading messages to development environment

Browse source
This commit is contained in:
crschnick 2023-04-08 07:14:02 +00:00
parent 157f16ff9e
commit 005bba4542
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/io/xpipe/app/core/AppExtensionManager.java
View file

@ -58,14 +58,18 @@ public class AppExtensionManager {
private void determineExtensionDirectories() {
if (!AppProperties.get().isImage()) {
extensionBaseDirectories.add(Path.of(System.getProperty("user.dir")).resolve("app").resolve("build").resolve("ext_dev"));
extensionBaseDirectories.add(Path.of(System.getProperty("user.dir"))
.resolve("app")
.resolve("build")
.resolve("ext_dev"));
}
if (!AppProperties.get().isFullVersion()) {
var localInstallation = XPipeInstallation.getLocalDefaultInstallationBasePath(true);
Path p = Path.of(localInstallation);
if (!Files.exists(p)) {
throw new IllegalStateException("Required local X-Pipe installation was not found but is required for development");
throw new IllegalStateException(
"Required local X-Pipe installation was not found but is required for development");
}
var extensions = XPipeInstallation.getLocalExtensionsDirectory(p);
@ -218,7 +222,10 @@ public class AppExtensionManager {
var ext = getExtensionFromDir(layer, dir);
if (ext.isEmpty()) {
throw new ExtensionException("Unable to load extension from directory " + dir + ". Is the installation corrupted?");
if (AppProperties.get().isFullVersion()) {
throw new ExtensionException(
"Unable to load extension from directory " + dir + ". Is the installation corrupted?");
}
} else {
if (loadedExtensions.stream()
.anyMatch(extension -> extension.getName().equals(ext.get().name))) {
@ -258,7 +265,7 @@ public class AppExtensionManager {
}
var name = props.get("name").toString();
var deps = l.modules().size() - 1;
ext.set(new Extension(dir, dir.getFileName().toString(),name, m, deps));
ext.set(new Extension(dir, dir.getFileName().toString(), name, m, deps));
}
});
return Optional.ofNullable(ext.get());