github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: attachment month path. (#636)

pull/638/head
Ryan Wang 2020-03-12 15:04:35 +08:00 committed by GitHub
parent 437e59d8a2
commit 153f8ebbef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/run/halo/app/handler/file/LocalFileHandler.java
View File

@ -97,8 +97,10 @@ public class LocalFileHandler implements FileHandler {
int year = current.get(Calendar.YEAR); int year = current.get(Calendar.YEAR);
int month = current.get(Calendar.MONTH) + 1; int month = current.get(Calendar.MONTH) + 1;
String monthString = month < 10 ? "0" + month : String.valueOf(month);
// Build directory // Build directory
String subDir = UPLOAD_SUB_DIR + year + FILE_SEPARATOR + month + FILE_SEPARATOR; String subDir = UPLOAD_SUB_DIR + year + FILE_SEPARATOR + monthString + FILE_SEPARATOR;
String originalBasename = FilenameUtils.getBasename(Objects.requireNonNull(file.getOriginalFilename())); String originalBasename = FilenameUtils.getBasename(Objects.requireNonNull(file.getOriginalFilename()));
@ -137,7 +139,7 @@ public class LocalFileHandler implements FileHandler {
uploadResult.setSize(file.getSize()); uploadResult.setSize(file.getSize());
// TODO refactor this: if image is svg ext. extension // TODO refactor this: if image is svg ext. extension
boolean isSvg = "svg".equals(extension); boolean isSvg = "svg" .equals(extension);
// Check file type // Check file type
if (FileHandler.isImageType(uploadResult.getMediaType()) && !isSvg) { if (FileHandler.isImageType(uploadResult.getMediaType()) && !isSvg) {