From 005bba4542fb634945ee1e115056ed7484ca16f0 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sat, 8 Apr 2023 07:14:02 +0000 Subject: [PATCH] Adapt extension loading messages to development environment --- .../io/xpipe/app/core/AppExtensionManager.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java b/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java index a563a787b..e259d0d95 100644 --- a/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java +++ b/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java @@ -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());