Refactor pull from git process

src/main/java/run/halo/app/controller/admin/api/ThemeController.java

@@ -178,7 +178,7 @@ public ThemeProperty fetchTheme(@RequestParam("uri") String uri) {
         return themeService.fetch(uri);
     }
 
-    @PostMapping("fetchingBranches")
+    @PostMapping(value = {"fetchingBranches", "/fetching/git/branches"})
     @ApiOperation("Fetches all branches")
     public List<ThemeProperty> fetchBranches(@RequestParam("uri") String uri) {
         return themeService.fetchBranches(uri);
@@ -209,7 +209,7 @@ public ThemeProperty fetchLatestRelease(@RequestParam("uri") String uri) {
     }
 
     @PutMapping("fetching/{themeId}")
-    @ApiOperation("Upgrades theme by remote")
+    @ApiOperation("Upgrades theme from remote")
     public ThemeProperty updateThemeByFetching(@PathVariable("themeId") String themeId) {
         return themeService.update(themeId);
     }

src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java

@@ -9,6 +9,7 @@
  * Theme property.
  *
  * @author ryanwang
+ * @author johnniang
  * @date 2019-03-22
  */
 @Data
@@ -39,6 +40,11 @@ public class ThemeProperty {
      */
     private String repo;
 
+    /**
+     * Theme update strategy. Default is branch.
+     */
+    private UpdateStrategy updateStrategy = UpdateStrategy.BRANCH;
+
     /**
      * Theme description.
      */
@@ -116,8 +122,13 @@ public int hashCode() {
         return Objects.hash(id);
     }
 
+    /**
+     * Theme author info.
+     *
+     * @author johnniang
+     */
     @Data
-    private static class Author {
+    public static class Author {
 
         /**
          * Author name.
@@ -134,4 +145,21 @@ private static class Author {
          */
         private String avatar;
     }
+
+    /**
+     * Theme update strategy.
+     *
+     * @author johnniang
+     */
+    public enum UpdateStrategy {
+        /**
+         * Update from specific branch
+         */
+        BRANCH,
+
+        /**
+         * Update from latest release
+         */
+        RELEASE;
+    }
 }

src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java

@@ -683,7 +683,7 @@ public ThemeProperty update(String themeId, MultipartFile file) {
             // Create temp directory
             tempPath = FileUtils.createTempDirectory();
 
-            String basename = FilenameUtils.getBasename(file.getOriginalFilename());
+            String basename = FilenameUtils.getBasename(Objects.requireNonNull(file.getOriginalFilename()));
             Path themeTempPath = tempPath.resolve(basename);
 
             // Check directory traversal
@@ -704,8 +704,9 @@ public ThemeProperty update(String themeId, MultipartFile file) {
             }
 
             // Not support current halo version.
-            if (StringUtils.isNotEmpty(prepareThemeProperty.getRequire()) && !VersionUtil.compareVersion(HaloConst.HALO_VERSION, prepareThemeProperty.getRequire())) {
-                throw new ThemeNotSupportException("新版本主题仅支持 Halo " + prepareThemeProperty.getRequire() + " 以上的版本");
+            if (StringUtils.isNotEmpty(prepareThemeProperty.getRequire())
+                    && !VersionUtil.compareVersion(HaloConst.HALO_VERSION, prepareThemeProperty.getRequire())) {
+                throw new ThemeNotSupportException("新版本主题仅支持 Halo " + prepareThemeProperty.getRequire() + " 及以上的版本，请更新 Halo 后重试。");
             }
 
             // Coping new theme files to old theme folder.
@@ -734,6 +735,7 @@ private void pullFromGit(@NonNull ThemeProperty themeProperty) throws
                 DEFAULT_REMOTE_BRANCH : themeProperty.getBranch();
 
         Git git = null;
+        RevCommit lastCommit = null;
 
         try {
             git = GitUtils.openOrInit(Paths.get(themeProperty.getThemePath()));
@@ -745,15 +747,19 @@ private void pullFromGit(@NonNull ThemeProperty themeProperty) throws
                     .addFilepattern(".")
                     .call();
             // Commit the changes
-            git.commit().setMessage("Commit by halo automatically").call();
+            git.commit()
+                    .setAllowEmpty(true)
+                    .setSign(false)
+                    .setMessage("Commit by halo automatically")
+                    .call();
 
             RevWalk revWalk = new RevWalk(repository);
 
             Ref ref = repository.findRef(Constants.HEAD);
 
             Assert.notNull(ref, Constants.HEAD + " ref was not found!");
 
-            RevCommit lastCommit = revWalk.parseCommit(ref.getObjectId());
+            lastCommit = revWalk.parseCommit(ref.getObjectId());
 
             // Force to set remote name
             git.remoteRemove().setRemoteName(THEME_PROVIDER_REMOTE_NAME).call();
@@ -798,14 +804,19 @@ private void pullFromGit(@NonNull ThemeProperty themeProperty) throws
             ThemeProperty updatedThemeProperty = getProperty(Paths.get(themeProperty.getThemePath()));
 
             // Not support current halo version.
-            if (StringUtils.isNotEmpty(updatedThemeProperty.getRequire()) && !VersionUtil.compareVersion(HaloConst.HALO_VERSION, updatedThemeProperty.getRequire())) {
-                // reset theme version
+            if (StringUtils.isNotEmpty(updatedThemeProperty.getRequire())
+                    && !VersionUtil.compareVersion(HaloConst.HALO_VERSION, updatedThemeProperty.getRequire())) {
+                throw new ThemeNotSupportException("新版本主题仅支持 Halo " + updatedThemeProperty.getRequire() + " 以上的版本");
+            }
+        } catch (Exception e) {
+            if (git != null && lastCommit != null) {
+                log.warn("Rollback theme files to [{}]", lastCommit.getFullMessage());
                 git.reset()
                         .setMode(ResetCommand.ResetType.HARD)
                         .setRef(lastCommit.getName())
                         .call();
-                throw new ThemeNotSupportException("新版本主题仅支持 Halo " + updatedThemeProperty.getRequire() + " 以上的版本");
             }
+            throw e;
         } finally {
             GitUtils.closeQuietly(git);
         }