add extension dir methods

lucee · Jul 19, 2024 · a413f9b · a413f9b
1 parent 85ad80a
commit a413f9b
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 16 deletions.
diff --git a/core/src/main/java/lucee/runtime/config/ConfigImpl.java b/core/src/main/java/lucee/runtime/config/ConfigImpl.java
@@ -2689,15 +2689,6 @@ public Resource getVideoDirectory() {
 		return dir;
 	}
 
-	@Override
-	public Resource getExtensionDirectory() {
-		// TODO take from tag <extensions>
-		Resource dir = getConfigDir().getRealResource("extensions/installed");
-		if (!dir.exists()) dir.mkdirs();
-
-		return dir;
-	}
-
 	@Override
 	public ExtensionProvider[] getExtensionProviders() {
 		throw new RuntimeException("no longer supported, use getRHExtensionProviders() instead.");
@@ -3902,6 +3893,9 @@ boolean isEmpty(ClassDefinition cd) {
 
 	private boolean fullNullSupport = false;
 
+	private Resource extInstalled;
+	private Resource extAvailable;
+
 	protected final void setFullNullSupport(boolean fullNullSupport) {
 		this.fullNullSupport = fullNullSupport;
 	}
@@ -3990,4 +3984,35 @@ public int getReturnFormat() {
 	protected void setReturnFormat(int returnFormat) {
 		this.returnFormat = returnFormat;
 	}
+
+	@Override
+	public Resource getExtensionDirectory() {
+		return getExtensionInstalledDir();
+	}
+
+	@Override
+	public Resource getExtensionInstalledDir() {
+		if (extInstalled == null) {
+			synchronized (SystemUtil.createToken("extensions", "installed")) {
+				if (extInstalled == null) {
+					extInstalled = getConfigDir().getRealResource("extensions/installed");
+					if (!extInstalled.exists()) extInstalled.mkdirs();
+				}
+			}
+		}
+		return extInstalled;
+	}
+
+	@Override
+	public Resource getExtensionAvailableDir() {
+		if (extAvailable == null) {
+			synchronized (SystemUtil.createToken("extensions", "available")) {
+				if (extAvailable == null) {
+					extAvailable = getConfigDir().getRealResource("extensions/available");
+					if (!extAvailable.exists()) extAvailable.mkdirs();
+				}
+			}
+		}
+		return extAvailable;
+	}
 }
diff --git a/core/src/main/java/lucee/runtime/config/ConfigPro.java b/core/src/main/java/lucee/runtime/config/ConfigPro.java
@@ -388,4 +388,9 @@ public Resource[] getResources(PageContext pc, Mapping[] mappings, String realPa
 	public boolean getShowMetric();
 
 	public boolean getShowTest();
+
+	public Resource getExtensionInstalledDir();
+
+	public Resource getExtensionAvailableDir();
+
 }
diff --git a/core/src/main/java/lucee/runtime/config/ConfigServerImpl.java b/core/src/main/java/lucee/runtime/config/ConfigServerImpl.java
@@ -759,9 +759,7 @@ protected String getLibHash() {
 
 	@Override
 	public Resource getLocalExtensionProviderDirectory() {
-		Resource dir = getConfigDir().getRealResource("extensions/available");
-		if (!dir.exists()) dir.mkdirs();
-		return dir;
+		return getExtensionAvailableDir();
 	}
 
 	protected void setAMFEngine(ClassDefinition<AMFEngine> cd, Map<String, String> args) {
@@ -873,4 +871,5 @@ public void setAdminMode(short adminMode) {
 	public short getAdminMode() {
 		return adminMode;
 	}
+
 }
diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebImpl.java b/core/src/main/java/lucee/runtime/config/ConfigWebImpl.java
@@ -1921,4 +1921,14 @@ public boolean getFormUrlAsStruct() {
 	public int getReturnFormat() {
 		return instance.getReturnFormat();
 	}
+
+	@Override
+	public Resource getExtensionInstalledDir() {
+		return instance.getExtensionInstalledDir();
+	}
+
+	@Override
+	public Resource getExtensionAvailableDir() {
+		return instance.getExtensionAvailableDir();
+	}
 }
diff --git a/core/src/main/java/lucee/runtime/config/SingleContextConfigWeb.java b/core/src/main/java/lucee/runtime/config/SingleContextConfigWeb.java
@@ -2101,4 +2101,13 @@ public int getReturnFormat() {
 		return cs.getReturnFormat();
 	}
 
+	@Override
+	public Resource getExtensionInstalledDir() {
+		return cs.getExtensionInstalledDir();
+	}
+
+	@Override
+	public Resource getExtensionAvailableDir() {
+		return cs.getExtensionAvailableDir();
+	}
 }
diff --git a/core/src/main/java/lucee/runtime/extension/RHExtension.java b/core/src/main/java/lucee/runtime/extension/RHExtension.java
@@ -875,7 +875,8 @@ public static String toHash(String id, String version, String ext) {
 	}
 
 	public static Resource getExtensionInstalledDir(Config config) {
-		return config.getConfigDir().getRealResource("extensions/installed");
+
+		return ((ConfigPro) config).getExtensionInstalledDir();
 	}
 
 	private static int getPhysicalExtensionCount(Config config) {
@@ -894,7 +895,7 @@ public static void correctExtensions(Config config) throws PageException, IOExce
 		// reduce the amount of extension stored in available
 		{
 			int max = 5;
-			Resource dir = config.getConfigDir().getRealResource("extensions/available");
+			Resource dir = ((ConfigPro) config).getExtensionAvailableDir();
 			Resource[] resources = dir.listResources(LEX_FILTER);
 			Map<String, List<Pair<RHExtension, Resource>>> map = new HashMap<>();
 			RHExtension ext;

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.1.1.49-SNAPSHOT"/>
+  <property name="version" value="6.1.1.50-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.1.49-SNAPSHOT</version>
+  <version>6.1.1.50-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>