修复无法从包含路径分隔符的文件名创建多个目录

Author: dengzii

src/com/dengzii/plugin/template/model/FileTreeDsl.kt

@@ -11,12 +11,13 @@ class FileTreeDsl() : FileTreeNode() {
         return this
     }
 
-    operator fun FileTreeNode.invoke(block: FileTreeNode.() -> Unit){
+    operator fun FileTreeNode.invoke(block: FileTreeNode.() -> Unit) {
         block(this)
     }
 
     /**
      * create directory nodes from the path
+     * if contains '/' or '.' in path
      *
      * @param path The dir path
      * @param block The child node domain
@@ -26,20 +27,21 @@ class FileTreeDsl() : FileTreeNode() {
             this(block)
             return
         }
+        val realPath = getRealName(path)
         var dirs = when {
-            path.contains(".") -> path.split(".")
-            path.contains("/") -> path.split("/")
+            realPath.contains(".") -> realPath.split(".")
+            realPath.contains("/") -> realPath.split("/")
             else -> {
-                val newNode = FileTreeNode(this, path, true)
+                val newNode = FileTreeNode(this, realPath, true)
                 if (addChild(newNode)) {
                     newNode(block)
                 }
                 return
             }
         }
         dirs = dirs.filter {
-                    it.isNotBlank()
-                }.toMutableList()
+            it.isNotBlank()
+        }.toMutableList()
         val domain = createDirs(dirs, this)
         domain.invoke(block)
     }
@@ -49,6 +51,38 @@ class FileTreeDsl() : FileTreeNode() {
         addChild(FileTreeNode(this, name, false))
     }
 
+    fun FileTreeNode.placeholder(name: String, value: String) {
+        if (this.placeholders == null) {
+            this.placeholders = mutableMapOf()
+        }
+        placeholders!![name] = value
+    }
+
+    /**
+     * merge all children of another node to this.
+     * all placeholders and file templates of target node
+     * will be copied to it's each children
+     */
+    fun FileTreeNode.include(other: FileTreeNode, override: Boolean = false) {
+        if (!isDir) return
+        other.children.forEach {
+            val clone = it.clone()
+            if (other.placeholders != null) {
+                if (clone.placeholders == null) {
+                    clone.placeholders = mutableMapOf()
+                }
+                clone.placeholders?.putAll(other.placeholders!!)
+            }
+            if (other.fileTemplates != null) {
+                if (clone.fileTemplates == null) {
+                    clone.fileTemplates = mutableMapOf()
+                }
+                clone.fileTemplates?.putAll(other.fileTemplates!!)
+            }
+            addChild(clone, override)
+        }
+    }
+
     fun FileTreeNode.fileTemplate(fileName: String, template: String) {
         if (this.fileTemplates == null) {
             this.fileTemplates = mutableMapOf()

src/com/dengzii/plugin/template/model/FileTreeNode.kt

@@ -111,7 +111,12 @@ open class FileTreeNode() {
      * get the real name replace with placeholder
      */
     fun getRealName(): String {
-        return name.replacePlaceholder(getPlaceholderInherit(), !isDir)
+        return getRealName(this.name)
+    }
+
+    fun getRealName(fileName: String = this.name): String {
+
+        return fileName.replacePlaceholder(getPlaceholderInherit(), !isDir)
     }
 
     fun getFileTemplateInherit(): MutableMap<String, String>? {
@@ -130,21 +135,21 @@ open class FileTreeNode() {
         template = name
     }
 
-    fun placeholder(name: String, value: String) {
-        if (this.placeholders == null) {
-            this.placeholders = mutableMapOf()
-        }
-        placeholders!![name] = value
-    }
-
-    fun placeholders(placeholders: Map<String, String>) {
+    fun addPlaceholders(placeholders: Map<String, String>) {
         if (this.placeholders == null) {
             this.placeholders = mutableMapOf()
         }
         this.placeholders!!.putAll(placeholders)
     }
 
-    fun fileTemplates(placeholders: Map<String, String>) {
+//    fun getAllPlaceholderInName(): Map<String, String> {
+//        val result = mutableMapOf<String, String>()
+//        traversal({ fileTreeNode: FileTreeNode, i: Int ->
+//
+//        })
+//    }
+
+    fun addFileTemplates(placeholders: Map<String, String>) {
         if (this.fileTemplates == null) {
             this.fileTemplates = mutableMapOf()
         }
@@ -190,31 +195,6 @@ open class FileTreeNode() {
         }
     }
 
-    /**
-     * merge all children of another node to this.
-     * all placeholders and file templates of target node
-     * will be copied to it's each children
-     */
-    fun include(other: FileTreeNode, override: Boolean = false) {
-        if (!isDir) return
-        other.children.forEach {
-            val clone = it.clone()
-            if (other.placeholders != null) {
-                if (clone.placeholders == null) {
-                    clone.placeholders = mutableMapOf()
-                }
-                clone.placeholders?.putAll(other.placeholders!!)
-            }
-            if (other.fileTemplates != null) {
-                if (clone.fileTemplates == null) {
-                    clone.fileTemplates = mutableMapOf()
-                }
-                clone.fileTemplates?.putAll(other.fileTemplates!!)
-            }
-            addChild(clone, override)
-        }
-    }
-
     /**
      * create directories tree from a list
      * the larger the index, the deeper the directory
@@ -257,6 +237,16 @@ open class FileTreeNode() {
         return this == parent
     }
 
+    fun getAllPlaceholders(): Map<String, String> {
+        val result = mutableMapOf<String, String>()
+        traversal({ fileTreeNode: FileTreeNode, _: Int ->
+            if (fileTreeNode.placeholders != null) {
+                result.putAll(fileTreeNode.placeholders!!)
+            }
+        })
+        return result
+    }
+
     fun getTreeGraph(): String {
         return getNodeGraph().toString()
     }
@@ -335,7 +325,7 @@ open class FileTreeNode() {
         }
     }
 
-    protected fun getLabel(): String {
+    private fun getLabel(): String {
         return "${name}_$isDir"
     }
 

src/com/dengzii/plugin/template/template/AucTemplate.kt

@@ -30,8 +30,8 @@ object AucTemplate {
     }
 
     val APP = FileTreeDsl {
-        fileTemplates(aucFileTemplates())
-        placeholders(aucPlaceholders())
+        addFileTemplates(aucFileTemplates())
+        addPlaceholders(aucPlaceholders())
         placeholder("MODULE_NAME", "app")
 
         dir("app") {
@@ -58,8 +58,8 @@ object AucTemplate {
     }
 
     val PKG = FileTreeDsl {
-        fileTemplates(aucFileTemplates())
-        placeholders(aucPlaceholders())
+        addFileTemplates(aucFileTemplates())
+        addPlaceholders(aucPlaceholders())
         placeholder("MODULE_NAME", "pkg")
         dir("pkg") {
             dir("src") {
@@ -84,8 +84,8 @@ object AucTemplate {
     }
 
     val EXPORT = FileTreeDsl {
-        fileTemplates(aucFileTemplates())
-        placeholders(aucPlaceholders())
+        addFileTemplates(aucFileTemplates())
+        addPlaceholders(aucPlaceholders())
         placeholder("MODULE_NAME", "export")
         dir("export") {
             dir("src") {
@@ -110,8 +110,8 @@ object AucTemplate {
     }
 
     val MODULE = FileTreeDsl {
-        fileTemplates(aucFileTemplates())
-        placeholders(aucPlaceholders())
+        addFileTemplates(aucFileTemplates())
+        addPlaceholders(aucPlaceholders())
         dir("\${FEATURE_NAME}") {
             include(APP)
             include(PKG)

test/AucTemplateTest.kt

@@ -7,6 +7,8 @@ class AucTemplateTest {
 
     @Test
     fun aucAppModuleTest() {
-        println(AucTemplate.APP.getTreeGraph())
+        val app = AucTemplate.APP
+        println(app.getTreeGraph())
+
     }
 }

test/FileTreeDslTest.kt

@@ -1,11 +1,17 @@
 package test
 
 import com.dengzii.plugin.template.model.FileTreeDsl
+import com.dengzii.plugin.template.model.FileTreeNode
+import com.dengzii.plugin.template.template.Template
 import org.junit.Test
-import java.util.regex.Pattern
 
 class FileTreeDslTest {
 
+    @Test
+    fun traversalTest() {
+
+    }
+
     @Test
     fun createSimpleFileTreeTest() {
         val tree = FileTreeDsl {
@@ -45,6 +51,7 @@ class FileTreeDslTest {
         println(tree.getTreeGraph())
     }
 
+
     @Test
     fun fileNamePlaceholderTest() {
         val tree = FileTreeDsl {