Add custom replacements: ${extension}, ${date}, ${time}, ${datetime:<*>}

Author: BURG3R5

app/src/main/java/co/adityarajput/fileflow/data/models/Action.kt

@@ -13,8 +13,6 @@ import co.adityarajput.fileflow.utils.*
 import co.adityarajput.fileflow.views.dullStyle
 import kotlinx.serialization.Serializable
 import java.nio.file.FileAlreadyExistsException
-import kotlin.uuid.ExperimentalUuidApi
-import kotlin.uuid.Uuid
 
 @Suppress("ClassName")
 @Serializable
@@ -69,16 +67,15 @@ sealed class Action {
             append(destFileNameTemplate)
         }
 
-        @OptIn(ExperimentalUuidApi::class)
         fun getDestFileName(srcFile: File) =
             srcFile.name!!.replace(
                 Regex(srcFileNamePattern),
-                destFileNameTemplate.replace(
-                    $$"${uuid}",
-                    Uuid.random().toString(),
-                ).replace(
+                destFileNameTemplate.applyCustomReplacements().replace(
                     $$"${folder}",
                     srcFile.parent?.name ?: "",
+                ).replace(
+                    $$"${extension}",
+                    srcFile.extension,
                 ),
             )
 

app/src/main/java/co/adityarajput/fileflow/utils/Files.kt

@@ -122,6 +122,12 @@ sealed class File {
         }
     }
 
+    val extension
+        get() = when (this) {
+            is SAFFile -> documentFile.name?.substringAfterLast('.', "").orEmpty()
+            is FSFile -> ioFile.extension
+        }
+
     val name
         get() = when (this) {
             is SAFFile -> documentFile.name

app/src/main/java/co/adityarajput/fileflow/utils/String.kt

@@ -4,6 +4,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import co.adityarajput.fileflow.R
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 @Composable
 fun Long.toShortHumanReadableTime(): String {
@@ -42,3 +46,24 @@ fun Long.toAccurateHumanReadableTime(): String {
 @Composable
 fun Boolean.getToggleString(): String =
     stringResource(if (this) R.string.disable else R.string.enable)
+
+@OptIn(ExperimentalUuidApi::class)
+fun String.applyCustomReplacements() = this
+    .replace(
+        $$"${uuid}",
+        Uuid.random().toString(),
+    )
+    .replace(
+        $$"${date}",
+        ZonedDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE),
+    )
+    .replace(
+        $$"${time}",
+        ZonedDateTime.now().format(DateTimeFormatter.ISO_LOCAL_TIME),
+    )
+    .replace(
+        Regex("\\$\\{datetime:([^}]+)}"),
+        { result ->
+            ZonedDateTime.now().format(DateTimeFormatter.ofPattern(result.groupValues[1]))
+        },
+    )

app/src/main/java/co/adityarajput/fileflow/utils/Time.kt

@@ -34,7 +34,7 @@ val ZonedDateTime.isToday get() = toLocalDate() == ZonedDateTime.now().toLocalDa
 
 private val cronParser = CronParser(CronDefinitionBuilder.instanceDefinitionFor(CronType.UNIX))
 
-fun String.getExecutionTimes(count: Int = 1): List<ZonedDateTime>? {
+fun String.getExecutionTimes(count: Int): List<ZonedDateTime>? {
     try {
         val schedule = cronParser.parse(this)
         val executionTime = ExecutionTime.forCron(schedule)