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

Merge remote-tracking branch 'origin/v1' into v1

pull/146/head
ruibaby 2019-04-19 00:48:21 +08:00
parent 4a2ac0bf29 5ebf5653f3
commit 8b688e784a
15 changed files with 126 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/run/halo/app/handler/theme/ThemeConfigResolver.java → src/main/java/run/halo/app/handler/theme/config/ThemeConfigResolver.java
View File

@ -1,7 +1,7 @@
package run.halo.app.handler.theme;
package run.halo.app.handler.theme.config;
import org.springframework.lang.NonNull;
import run.halo.app.handler.theme.support.Group;
import run.halo.app.handler.theme.config.support.Group;
import java.io.IOException;
import java.util.List;

6
src/main/java/run/halo/app/handler/theme/ThemeConfigResolvers.java → src/main/java/run/halo/app/handler/theme/config/ThemeConfigResolvers.java
View File

@ -1,10 +1,10 @@
package run.halo.app.handler.theme;
package run.halo.app.handler.theme.config;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
import run.halo.app.handler.theme.impl.YamlThemeConfigResolverImpl;
import run.halo.app.handler.theme.support.Group;
import run.halo.app.handler.theme.config.impl.YamlThemeConfigResolverImpl;
import run.halo.app.handler.theme.config.support.Group;
import java.io.IOException;
import java.util.List;

4
src/main/java/run/halo/app/handler/theme/ThemePropertyResolver.java → src/main/java/run/halo/app/handler/theme/config/ThemePropertyResolver.java
View File

@ -1,7 +1,7 @@
package run.halo.app.handler.theme;
package run.halo.app.handler.theme.config;
import org.springframework.lang.NonNull;
import run.halo.app.handler.theme.support.ThemeProperty;
import run.halo.app.handler.theme.config.support.ThemeProperty;
import java.io.IOException;

10
src/main/java/run/halo/app/handler/theme/impl/YamlThemeConfigResolverImpl.java → src/main/java/run/halo/app/handler/theme/config/impl/YamlThemeConfigResolverImpl.java
View File

@ -1,13 +1,13 @@
package run.halo.app.handler.theme.impl;
package run.halo.app.handler.theme.config.impl;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
import run.halo.app.handler.theme.ThemeConfigResolver;
import run.halo.app.handler.theme.support.Group;
import run.halo.app.handler.theme.support.Item;
import run.halo.app.handler.theme.support.Option;
import run.halo.app.handler.theme.config.ThemeConfigResolver;
import run.halo.app.handler.theme.config.support.Group;
import run.halo.app.handler.theme.config.support.Item;
import run.halo.app.handler.theme.config.support.Option;
import run.halo.app.model.enums.DataType;
import run.halo.app.model.enums.InputType;

6
src/main/java/run/halo/app/handler/theme/impl/YamlThemePropertyResolver.java → src/main/java/run/halo/app/handler/theme/config/impl/YamlThemePropertyResolver.java
View File

@ -1,11 +1,11 @@
package run.halo.app.handler.theme.impl;
package run.halo.app.handler.theme.config.impl;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import run.halo.app.handler.theme.ThemePropertyResolver;
import run.halo.app.handler.theme.support.ThemeProperty;
import run.halo.app.handler.theme.config.ThemePropertyResolver;
import run.halo.app.handler.theme.config.support.ThemeProperty;
import java.io.IOException;

4
src/test/java/run/halo/app/handler/theme/impl/YamlThemePropertyResolverTest.java → src/main/java/run/halo/app/handler/theme/config/impl/YamlThemePropertyResolverTest.java
View File

@ -1,9 +1,9 @@
package run.halo.app.handler.theme.impl;
package run.halo.app.handler.theme.config.impl;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import org.junit.Test;
import run.halo.app.handler.theme.support.ThemeProperty;
import run.halo.app.handler.theme.config.support.ThemeProperty;
import java.io.IOException;

2
src/main/java/run/halo/app/handler/theme/support/Group.java → src/main/java/run/halo/app/handler/theme/config/support/Group.java
View File

@ -1,4 +1,4 @@
package run.halo.app.handler.theme.support;
package run.halo.app.handler.theme.config.support;
import lombok.Data;

2
src/main/java/run/halo/app/handler/theme/support/Item.java → src/main/java/run/halo/app/handler/theme/config/support/Item.java
View File

@ -1,4 +1,4 @@
package run.halo.app.handler.theme.support;
package run.halo.app.handler.theme.config.support;
import lombok.Data;
import run.halo.app.model.enums.DataType;

2
src/main/java/run/halo/app/handler/theme/support/Option.java → src/main/java/run/halo/app/handler/theme/config/support/Option.java
View File

@ -1,4 +1,4 @@
package run.halo.app.handler.theme.support;
package run.halo.app.handler.theme.config.support;
import lombok.Data;

2
src/main/java/run/halo/app/handler/theme/support/ThemeProperty.java → src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java
View File

@ -1,4 +1,4 @@
package run.halo.app.handler.theme.support;
package run.halo.app.handler.theme.config.support;
import lombok.Data;

15
src/main/java/run/halo/app/service/ThemeService.java
View File

@ -2,11 +2,12 @@ package run.halo.app.service;
import org.springframework.lang.NonNull;
import org.springframework.web.multipart.MultipartFile;
import run.halo.app.handler.theme.support.Group;
import run.halo.app.handler.theme.support.ThemeProperty;
import run.halo.app.handler.theme.config.support.Group;
import run.halo.app.handler.theme.config.support.ThemeProperty;
import run.halo.app.model.support.ThemeFile;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.List;
import java.util.Optional;
@ -204,9 +205,19 @@ public interface ThemeService {
/**
* Upload theme.
*
* @param file multipart file must not be null
* @return theme info
*/
@NonNull
ThemeProperty upload(@NonNull MultipartFile file);
/**
* Adds a new theme.
*
* @param themeTmpPath theme temporary path must not be null
* @return theme property
*/
@NonNull
ThemeProperty add(@NonNull Path themeTmpPath) throws IOException;
}

112
src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
View File

@ -10,7 +10,6 @@ import freemarker.template.Configuration;
import freemarker.template.TemplateModelException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.MediaType;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
@ -20,22 +19,19 @@ import org.springframework.web.multipart.MultipartFile;
import run.halo.app.cache.StringCacheStore;
import run.halo.app.config.properties.HaloProperties;
import run.halo.app.exception.*;
import run.halo.app.handler.file.FileHandler;
import run.halo.app.handler.theme.ThemeConfigResolver;
import run.halo.app.handler.theme.ThemePropertyResolver;
import run.halo.app.handler.theme.support.Group;
import run.halo.app.handler.theme.support.ThemeProperty;
import run.halo.app.handler.theme.config.ThemeConfigResolver;
import run.halo.app.handler.theme.config.ThemePropertyResolver;
import run.halo.app.handler.theme.config.support.Group;
import run.halo.app.handler.theme.config.support.ThemeProperty;
import run.halo.app.model.properties.PrimaryProperties;
import run.halo.app.model.support.HaloConst;
import run.halo.app.model.support.ThemeFile;
import run.halo.app.model.support.UploadResult;
import run.halo.app.service.OptionService;
import run.halo.app.service.ThemeService;
import run.halo.app.utils.FileUtils;
import run.halo.app.utils.FilenameUtils;
import run.halo.app.utils.JsonUtils;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
@ -287,15 +283,6 @@ public class ThemeServiceImpl implements ThemeService {
return activatedThemeId;
}
/**
* Set activated theme id.
*
* @param themeId theme id
*/
private void setActivatedThemeId(@Nullable String themeId) {
this.activatedThemeId = themeId;
}
@Override
public ThemeProperty activeTheme(String themeId) {
// Check existence of the theme
@ -322,12 +309,6 @@ public class ThemeServiceImpl implements ThemeService {
return themeProperty;
}
/**
* Upload theme.
*
* @param file multipart file must not be null
* @return theme info
*/
@Override
public ThemeProperty upload(MultipartFile file) {
Assert.notNull(file, "Multipart file must not be null");
@ -346,7 +327,7 @@ public class ThemeServiceImpl implements ThemeService {
file.transferTo(uploadPath);
// Unzip theme package
ZipUtil.unzip(uploadPath.toFile(),uploadPath.getParent().toFile());
ZipUtil.unzip(uploadPath.toFile(), uploadPath.getParent().toFile());
// Delete theme package
FileUtil.del(uploadPath.toFile());
@ -360,6 +341,36 @@ public class ThemeServiceImpl implements ThemeService {
}
}
@Override
public ThemeProperty add(Path themeTmpPath) throws IOException {
Assert.notNull(themeTmpPath, "Theme temporary path must not be null");
Assert.isTrue(Files.isDirectory(themeTmpPath), "Theme temporary path must be a directory");
// Check property config
Path configPath = getThemePropertyPathOfNullable(themeTmpPath).orElseThrow(() -> new ThemePropertyMissingException("Theme property file is dismiss").setErrorData(themeTmpPath));
ThemeProperty tmpThemeProperty = getProperty(configPath);
// Copy the temporary path to current theme folder
Path targetThemePath = workDir.resolve(tmpThemeProperty.getId());
FileUtils.copyFolder(themeTmpPath, targetThemePath);
// Delete temp theme folder
FileUtils.deleteFolder(themeTmpPath);
// Get property again
return getProperty(targetThemePath);
}
/**
* Set activated theme id.
*
* @param themeId theme id
*/
private void setActivatedThemeId(@Nullable String themeId) {
this.activatedThemeId = themeId;
}
/**
* Lists theme files as tree view.
*
@ -446,8 +457,14 @@ public class ThemeServiceImpl implements ThemeService {
}
}
@Nullable
private Path getPropertyPath(@NonNull Path themePath) {
/**
* Gets property path of nullable.
*
* @param themePath theme path.
* @return an optional property path
*/
@NonNull
private Optional<Path> getThemePropertyPathOfNullable(@NonNull Path themePath) {
Assert.notNull(themePath, "Theme path must not be null");
for (String propertyPathName : THEME_PROPERTY_FILE_NAMES) {
@ -456,28 +473,28 @@ public class ThemeServiceImpl implements ThemeService {
log.debug("Attempting to find property file: [{}]", propertyPath);
if (Files.exists(propertyPath) && Files.isReadable(propertyPath)) {
log.debug("Found property file: [{}]", propertyPath);
return propertyPath;
return Optional.of(propertyPath);
}
}
return null;
return Optional.empty();
}
/**
* Gets theme property.
* Gets property path of non null.
*
* @param themePath must not be null
* @return theme property
* @param themePath theme path.
* @return property path won't be null
*/
@NonNull
private ThemeProperty getProperty(@NonNull Path themePath) {
private Path getThemePropertyPath(@NonNull Path themePath) {
return getThemePropertyPathOfNullable(themePath).orElseThrow(() -> new ThemePropertyMissingException(themePath + " dose not exist any theme property file").setErrorData(themePath));
}
private Optional<ThemeProperty> getPropertyOfNullable(Path themePath) {
Assert.notNull(themePath, "Theme path must not be null");
Path propertyPath = getPropertyPath(themePath);
if (propertyPath == null) {
throw new ThemePropertyMissingException(themePath + " dose not exist any theme property file").setErrorData(themePath);
}
Path propertyPath = getThemePropertyPath(themePath);
try {
// Get property content
@ -504,10 +521,24 @@ public class ThemeServiceImpl implements ThemeService {
themeProperty.setActivated(true);
}
return themeProperty;
return Optional.of(themeProperty);
} catch (IOException e) {
throw new ThemePropertyMissingException("Cannot resolve theme property", e).setErrorData(propertyPath.toString());
log.error("Failed to load theme property file", e);
}
return Optional.empty();
}
/**
* Gets theme property.
*
* @param themePath must not be null
* @return theme property
*/
@NonNull
private ThemeProperty getProperty(@NonNull Path themePath) {
return getPropertyOfNullable(themePath).orElseThrow(() -> new ThemePropertyMissingException("Cannot resolve theme property").setErrorData(themePath));
}
/**
@ -517,6 +548,7 @@ public class ThemeServiceImpl implements ThemeService {
* @return screenshots file name or null if the given theme path has not screenshots
* @throws IOException throws when listing files
*/
@NonNull
private Optional<String> getScreenshotsFileName(@NonNull Path themePath) throws IOException {
Assert.notNull(themePath, "Theme path must not be null");

16
src/main/java/run/halo/app/utils/FileUtils.java
View File

@ -3,9 +3,11 @@ package run.halo.app.utils;
import org.springframework.lang.NonNull;
import org.springframework.util.Assert;
import java.io.File;
import java.io.IOException;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Comparator;
/**
* File utilities.
@ -46,4 +48,18 @@ public class FileUtils {
}
});
}
/**
* Deletes folder recursively.
*
* @param deletingPath deleting path must not be null
*/
public static void deleteFolder(Path deletingPath) throws IOException {
Assert.notNull(deletingPath, "Deleting path must not be null");
Files.walk(deletingPath)
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
}
}

4
src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java
View File

@ -3,10 +3,10 @@ package run.halo.app.web.controller.admin.api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import run.halo.app.handler.theme.support.Group;
import run.halo.app.handler.theme.config.support.Group;
import run.halo.app.model.support.BaseResponse;
import run.halo.app.model.support.ThemeFile;
import run.halo.app.handler.theme.support.ThemeProperty;
import run.halo.app.handler.theme.config.support.ThemeProperty;
import run.halo.app.service.ThemeService;
import run.halo.app.service.ThemeSettingService;

4
src/test/java/run/halo/app/utils/YamlTest.java
View File

@ -1,8 +1,8 @@
package run.halo.app.utils;
import org.junit.Test;
import run.halo.app.handler.theme.support.Group;
import run.halo.app.handler.theme.impl.YamlThemeConfigResolverImpl;
import run.halo.app.handler.theme.config.support.Group;
import run.halo.app.handler.theme.config.impl.YamlThemeConfigResolverImpl;
import java.io.IOException;
import java.util.List;