LDEV-5269 getTempDirectory, add unique option

core/src/main/java/lucee/runtime/functions/system/GetTempDirectory.java

@@ -21,15 +21,59 @@
  */
 package lucee.runtime.functions.system;
 
+import java.io.IOException;
+
 import lucee.runtime.PageContext;
+import lucee.runtime.exp.ExpressionException;
+import lucee.runtime.exp.PageException;
 import lucee.runtime.ext.function.Function;
+import lucee.runtime.functions.other.CreateUniqueId;
+import lucee.runtime.op.Decision;
+import lucee.runtime.op.Caster;
+import lucee.commons.io.res.Resource;
+import lucee.commons.lang.StringUtil;
+import lucee.commons.io.SystemUtil;
 
 public final class GetTempDirectory implements Function {
+
+	private static final long serialVersionUID = -166719664831864953L;
+	private static final int MAX_RETRY_TEMP = 3;
+
 	public static String call(PageContext pc) {
 		String fs = System.getProperty("file.separator");
 		String path = pc.getConfig().getTempDirectory().getAbsolutePath();
 
 		if (path.lastIndexOf(fs) != path.length() - 1) path += fs;
 		return path;
 	}
+
+	public static String call(PageContext pc, String unique) throws PageException{
+		boolean isUnique = Decision.isCastableToBoolean(unique);
+		if (isUnique && !Caster.toBoolean(unique, false)) return call(pc);
+
+		if (isUnique) unique = "";
+		else if (!StringUtil.isEmpty(unique)) unique = unique.trim() + "_";
+		else unique = "";
+
+		String fs = System.getProperty("file.separator");
+		Resource path = pc.getConfig().getTempDirectory();
+
+		int max = MAX_RETRY_TEMP;
+		while (max-- > 0) {
+			Resource dir = path.getRealResource(fs + unique + Long.toString(System.currentTimeMillis(), Character.MAX_RADIX) + "_" + CreateUniqueId.invoke() );
+			synchronized (SystemUtil.createToken("", dir.getAbsolutePath())) {
+				try {
+					if (dir.exists()) continue;
+					dir.createDirectory(false);
+					String uniqueDir = dir.getCanonicalPath();
+					if (uniqueDir.lastIndexOf(fs) != uniqueDir.length() - 1) uniqueDir += fs;
+					return uniqueDir;
+				}
+				catch (IOException e) {
+				}
+			}
+		}
+		throw new ExpressionException("Unable to create unique temporary directory");
+	}
+
 }

core/src/main/java/resource/fld/core-base.fld

@@ -6938,7 +6938,15 @@ if this attribute is not provided all types are returned.</description>
 	<function>
 		<name>getTempDirectory</name>
 		<class>lucee.runtime.functions.system.GetTempDirectory</class>
-		<description>Returns the full path to the currently assigned temporary directory</description>
+		<description>Returns the full path to the currently assigned temporary directory, optionally creating a unique temp directory</description>
+		<argument>
+			<name>unique</name>
+			<alias>prefix</alias>
+			<type>string</type>
+			<default>false</default>
+			<required>no</required>
+			<description>If true or not empty, creates and returns a unique temp directory, optionally prefixed</description>
+		</argument>
 		<return>
 			<type>string</type>
 		</return>

test/functions/GetTempDirectory.cfc

@@ -0,0 +1,70 @@
+<cfscript>
+component extends="org.lucee.cfml.test.LuceeTestCase"  {
+
+	function run( testResults , testBox ) {
+		describe( "test case for getTempDirectory()", function() {
+
+			it (title = "getTempDirectory()", body = function( currentSpec ) {
+				var tmp = getTempDirectory();
+				var tmp2 = getTempDirectory();
+
+				expect( tmp ).toBe( tmp2 );
+				expect( DirectoryExists( tmp ) ).toBeTrue();
+				expect( right( tmp, 1 ) ).toBe( server.separator.file );
+			});
+
+			it (title = "getTempDirectory(false)", body = function( currentSpec ) {
+				var tmp = getTempDirectory( false );
+				var tmp2 = getTempDirectory( "false" );
+
+				expect( tmp ).toBe( tmp2 );
+				expect( DirectoryExists( tmp ) ).toBeTrue();
+			});
+
+			it (title = "getTempDirectory(unique=true)", body = function( currentSpec ) {
+				var tmp = getTempDirectory();
+				var tmp2 = getTempDirectory(unique=true);
+				var tmp3 = getTempDirectory(unique=true);
+
+				expect( tmp ).notToBe( tmp2 );
+				expect( tmp2 ).notToBe( tmp3 );
+
+				expect( DirectoryExists( tmp2 ) ).toBeTrue();
+				expect( DirectoryExists( tmp3 ) ).toBeTrue();
+			});
+
+			it (title = "getTempDirectory(true)", body = function( currentSpec ) {
+				var tmp = getTempDirectory( false );
+				var tmp2 = getTempDirectory( true );
+				var tmp3 = getTempDirectory( "true" );
+
+				expect( tmp ).notToBe( tmp2 );
+				expect( tmp2 ).notToBe( tmp3 );
+				expect( DirectoryExists( tmp2 ) ).toBeTrue();
+				expect( DirectoryExists( tmp3 ) ).toBeTrue();
+			});
+
+			it (title = "getTempDirectory('ldev')", body = function( currentSpec ) {
+				var prefix = "ldev";
+				var tmp = getTempDirectory( false );
+				var tmp2 = getTempDirectory( prefix );
+				var tmp3 = getTempDirectory( prefix );
+
+				expect( tmp ).notToBe( tmp2 );
+				expect( tmp2 ).notToBe( tmp3 );
+
+				expect( DirectoryExists( tmp2 ) ).toBeTrue();
+				expect( DirectoryExists( tmp3 ) ).toBeTrue();
+
+				expect( tmp2 ).toInclude( tmp & prefix );
+				expect( tmp3 ).toInclude( tmp & prefix );
+
+				expect( right( tmp2, 1 ) ).toBe( server.separator.file );
+				expect( right( tmp3, 1 ) ).toBe( server.separator.file );
+			});
+
+		});
+	}
+
+}
+</cfscript>