feat: Time placeholder of upload path (#74)

Fixes #69 ```release-note 文件上传路径支持使用`${year}`,`${month}`,`${day}`占位符 ```
halo-dev · Sep 27, 2023 · 217f1db · 217f1db
1 parent 38f2018
commit 217f1db
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/src/main/java/run/halo/s3os/FilePathUtils.java b/src/main/java/run/halo/s3os/FilePathUtils.java
@@ -0,0 +1,23 @@
+package run.halo.s3os;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.LocalDate;
+
+public class FilePathUtils {
+ private FilePathUtils() {
+
+ }
+
+ public static String getFilePathByPlaceholder(String filename) {
+ LocalDate localDate = LocalDate.now();
+ return StringUtils.replaceEach(filename,
+ new String[] {"${year}","${month}","${day}"},
+ new String[] {
+ String.valueOf(localDate.getYear()),
+ String.valueOf(localDate.getMonthValue()),
+ String.valueOf(localDate.getDayOfMonth())
+ }
+ );
+ }
+}
diff --git a/src/main/java/run/halo/s3os/S3LinkServiceImpl.java b/src/main/java/run/halo/s3os/S3LinkServiceImpl.java
@@ -66,12 +66,13 @@ public Mono<S3ListResult> listObjects(String policyName, String continuationToke
  })
  .flatMap((configMap) -> {
  var properties = handler.getProperties(configMap);
+ var finalLocation = FilePathUtils.getFilePathByPlaceholder(properties.getLocation());
  return Mono.using(() -> handler.buildS3Client(properties),
  (s3Client) -> Mono.fromCallable(
  () -> s3Client.listObjectsV2(ListObjectsV2Request.builder()
  .bucket(properties.getBucket())
- .prefix(StringUtils.isNotEmpty(properties.getLocation())
- ? properties.getLocation() + "/" : null)
+ .prefix(StringUtils.isNotEmpty(finalLocation)
+ ? finalLocation + "/" : null)
  .delimiter("/")
  .maxKeys(pageSize)
  .continuationToken(StringUtils.isNotEmpty(continuationToken)

diff --git a/src/main/java/run/halo/s3os/S3OsProperties.java b/src/main/java/run/halo/s3os/S3OsProperties.java
@@ -3,6 +3,8 @@
 import lombok.Data;
 import org.springframework.util.StringUtils;
 
+import java.time.LocalDate;
+
 @Data
 class S3OsProperties {
 
@@ -39,8 +41,9 @@ class S3OsProperties {
 
  public String getObjectName(String filename) {
  var objectName = filename;
- if (StringUtils.hasText(getLocation())) {
- objectName = getLocation() + "/" + objectName;
+ var finalName = FilePathUtils.getFilePathByPlaceholder(getLocation());
+ if (StringUtils.hasText(finalName)) {
+ objectName = finalName + "/" + objectName;
  }
  return objectName;
  }

diff --git a/src/main/resources/extensions/policy-template-s3os.yaml b/src/main/resources/extensions/policy-template-s3os.yaml
@@ -62,6 +62,7 @@ spec:
  name: location
  label: 上传目录
  placeholder: 如不填写，则默认上传到根目录
+ help: 支持使用 ${year} ${month} ${day} 占位符
  - $formkit: select
  name: randomFilenameMode
  label: 上传时重命名文件方式