From 1b249de99e1b1feeaa87d3003f9475085c109fe2 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Tue, 9 Apr 2019 19:49:00 +0800
Subject: [PATCH] Complete copy folder from jar file

---
 .../halo/app/listener/StartedListener.java    | 42 +++++++++++-----
 .../run/halo/app/service/ThemeService.java    | 37 ++++++++++++++
 .../app/service/impl/ThemeServiceImpl.java    | 37 --------------
 .../java/run/halo/app/utils/FileUtils.java    | 49 +++++++++++++++++++
 4 files changed, 117 insertions(+), 48 deletions(-)
 create mode 100644 src/main/java/run/halo/app/utils/FileUtils.java

diff --git a/src/main/java/run/halo/app/listener/StartedListener.java b/src/main/java/run/halo/app/listener/StartedListener.java
index 08b4fbfbe..abd233f5d 100644
--- a/src/main/java/run/halo/app/listener/StartedListener.java
+++ b/src/main/java/run/halo/app/listener/StartedListener.java
@@ -1,6 +1,5 @@
 package run.halo.app.listener;
 
-import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import freemarker.template.TemplateModelException;
@@ -20,10 +19,12 @@ import run.halo.app.model.support.HaloConst;
 import run.halo.app.service.OptionService;
 import run.halo.app.service.ThemeService;
 import run.halo.app.service.UserService;
+import run.halo.app.utils.FileUtils;
 import run.halo.app.utils.HaloUtils;
 
-import java.io.File;
 import java.io.IOException;
+import java.net.URI;
+import java.nio.file.*;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -158,21 +159,40 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
     private void initThemes() {
         // Whether the blog has initialized
         Boolean isInstalled = optionService.getByPropertyOrDefault(PrimaryProperties.IS_INSTALLED, Boolean.class, false);
+
+        if (isInstalled) {
+            // Skip
+            return;
+        }
+
         try {
-            if (isInstalled) {
-                // Skip
-                return;
+            String themeClassPath = ResourceUtils.CLASSPATH_URL_PREFIX + ThemeService.THEME_FOLDER;
+
+            URI themeUri = ResourceUtils.getURL(themeClassPath).toURI();
+
+            Path source;
+
+            if (themeUri.getScheme().equalsIgnoreCase("jar")) {
+                // Create new file system for jar
+                FileSystem fileSystem = FileSystems.newFileSystem(themeUri, Collections.emptyMap());
+                source = fileSystem.getPath("/BOOT-INF/classes/" + ThemeService.THEME_FOLDER);
+            } else {
+                source = Paths.get(themeUri);
             }
 
-            File internalThemePath = new File(ResourceUtils.getURL(ResourceUtils.CLASSPATH_URL_PREFIX).getPath(), "templates/themes");
-            File[] internalThemes = internalThemePath.listFiles();
-            if (null != internalThemes) {
-                for (File theme : internalThemes) {
-                    FileUtil.copy(theme, themeService.getThemeBasePath(), true);
-                }
+            // Create theme folder
+            Path themePath = themeService.getBasePath();
+
+            if (Files.notExists(themePath)) {
+                log.info("Copying theme folder from [{}] to [{}]", source, themePath);
+
+                FileUtils.copyFolder(source, themePath);
+            } else {
+                log.info("Skip copying theme folder due to existence of theme folder");
             }
         } catch (Exception e) {
             throw new RuntimeException("Init internal theme to user path error", e);
         }
     }
+
 }
diff --git a/src/main/java/run/halo/app/service/ThemeService.java b/src/main/java/run/halo/app/service/ThemeService.java
index 250d6f153..3841e54e6 100644
--- a/src/main/java/run/halo/app/service/ThemeService.java
+++ b/src/main/java/run/halo/app/service/ThemeService.java
@@ -16,6 +16,43 @@ import java.util.Optional;
  */
 public interface ThemeService {
 
+    /**
+     * Theme property file name.
+     */
+    String THEME_PROPERTY_FILE_NAME = "theme.properties";
+
+
+    /**
+     * Configuration file name.
+     */
+    String[] OPTIONS_NAMES = {"options.yaml", "options.yml"};
+
+    /**
+     * The type of file that can be modified.
+     */
+    String[] CAN_EDIT_SUFFIX = {"ftl", "css", "js"};
+
+    /**
+     * These file names cannot be displayed.
+     */
+    String[] FILTER_FILES = {".git", ".DS_Store", THEME_PROPERTY_FILE_NAME, "options.yaml", "option.yml"};
+
+    /**
+     * Theme folder location.
+     */
+    String THEME_FOLDER = "templates/themes";
+
+
+    /**
+     * Render template.
+     */
+    String RENDER_TEMPLATE = "themes/%s/%s";
+
+    /**
+     * Theme cache key.
+     */
+    String THEMES_CACHE_KEY = "themes";
+
     /**
      * Get theme property by theme id.
      *
diff --git a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
index bdb4c3d27..907d4e65e 100644
--- a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
@@ -47,43 +47,6 @@ import static run.halo.app.model.support.HaloConst.DEFAULT_THEME_NAME;
 @Service
 public class ThemeServiceImpl implements ThemeService {
 
-    /**
-     * Theme property file name.
-     */
-    private final static String THEME_PROPERTY_FILE_NAME = "theme.properties";
-
-
-    /**
-     * Configuration file name.
-     */
-    private final static String[] OPTIONS_NAMES = {"options.yaml", "options.yml"};
-
-    /**
-     * The type of file that can be modified.
-     */
-    private static String[] CAN_EDIT_SUFFIX = {"ftl", "css", "js"};
-
-    /**
-     * These file names cannot be displayed.
-     */
-    private static String[] FILTER_FILES = {".git", ".DS_Store", THEME_PROPERTY_FILE_NAME, "options.yaml", "option.yml"};
-
-    /**
-     * Theme folder location.
-     */
-    private final static String THEME_FOLDER = "templates/themes";
-
-
-    /**
-     * Render template.
-     */
-    private final static String RENDER_TEMPLATE = "themes/%s/%s";
-
-    /**
-     * Theme cache key.
-     */
-    private final static String THEMES_CACHE_KEY = "themes";
-
     /**
      * Theme work directory.
      */
diff --git a/src/main/java/run/halo/app/utils/FileUtils.java b/src/main/java/run/halo/app/utils/FileUtils.java
new file mode 100644
index 000000000..5f2d93800
--- /dev/null
+++ b/src/main/java/run/halo/app/utils/FileUtils.java
@@ -0,0 +1,49 @@
+package run.halo.app.utils;
+
+import org.springframework.lang.NonNull;
+import org.springframework.util.Assert;
+
+import java.io.IOException;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
+
+/**
+ * File utilities.
+ *
+ * @author johnniang
+ * @date 4/9/19
+ */
+public class FileUtils {
+
+    private FileUtils() {
+    }
+
+    /**
+     * Copies folder.
+     *
+     * @param source source path must not be null
+     * @param target target path must not be null
+     */
+    public static void copyFolder(@NonNull Path source, @NonNull Path target) throws IOException {
+        Assert.notNull(source, "Source path must not be null");
+        Assert.notNull(target, "Target path must not be null");
+
+        Files.walkFileTree(source, new SimpleFileVisitor<Path>() {
+
+            private Path current;
+
+            @Override
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+                current = target.resolve(source.relativize(dir).toString());
+                Files.createDirectories(current);
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                Files.copy(file, target.resolve(source.relativize(file).toString()), StandardCopyOption.REPLACE_EXISTING);
+                return FileVisitResult.CONTINUE;
+            }
+        });
+    }
+}