From 9801bc7a20ffe95665f2d16690ac1f50e160e9a3 Mon Sep 17 00:00:00 2001
From: guqing <38999863+guqing@users.noreply.github.com>
Date: Fri, 3 Dec 2021 10:21:55 +0800
Subject: [PATCH] Fixed the problem that copying the default theme at halo
 startup did not use themeId as the theme folder name (#1549)

* fix: 1547

* refactor: replace the string magic value using a static constant
---
 src/main/java/run/halo/app/listener/StartedListener.java | 4 ++--
 src/main/java/run/halo/app/model/support/HaloConst.java  | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/run/halo/app/listener/StartedListener.java b/src/main/java/run/halo/app/listener/StartedListener.java
index 058c0c471..7dc31f82f 100644
--- a/src/main/java/run/halo/app/listener/StartedListener.java
+++ b/src/main/java/run/halo/app/listener/StartedListener.java
@@ -165,10 +165,10 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
             }
 
             // Create theme folder
-            Path themePath = themeService.getBasePath();
+            Path themePath = themeService.getBasePath().resolve(HaloConst.DEFAULT_THEME_ID);
 
             if (themeService.fetchThemePropertyBy(HaloConst.DEFAULT_THEME_ID).isEmpty()) {
-                FileUtils.copyFolder(source, themePath);
+                FileUtils.copyFolder(source.resolve(HaloConst.DEFAULT_THEME_DIR_NAME), themePath);
                 log.info("Copied theme folder from [{}] to [{}]", source, themePath);
             }
         } catch (Exception e) {
diff --git a/src/main/java/run/halo/app/model/support/HaloConst.java b/src/main/java/run/halo/app/model/support/HaloConst.java
index be55ad7e0..c6724281e 100644
--- a/src/main/java/run/halo/app/model/support/HaloConst.java
+++ b/src/main/java/run/halo/app/model/support/HaloConst.java
@@ -48,6 +48,11 @@ public class HaloConst {
      */
     public static final String DEFAULT_THEME_ID = "caicai_anatole";
 
+    /**
+     * Default theme directory name.
+     */
+    public static final String DEFAULT_THEME_DIR_NAME = "anatole";
+
     /**
      * Default error path.
      */