ref(FileTreeNode): create dir by path

Author: dengzii

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

@@ -11,6 +11,11 @@ class FileTreeDsl() : FileTreeNode() {
         return this
     }
 
+    operator fun FileTreeNode.invoke(block: FileTreeDsl.() -> Unit): FileTreeNode {
+        block()
+        return this
+    }
+
     constructor(parent: FileTreeDsl?, name: String, isDir: Boolean) : this() {
         this.name = name
         this.parent = parent
@@ -43,6 +48,7 @@ class FileTreeDsl() : FileTreeNode() {
                 .filter {
                     it.isNotBlank()
                 }.toMutableList()
+        println(dirs)
         createDirs(dirs, this)(block)
     }
 
@@ -58,20 +64,4 @@ class FileTreeDsl() : FileTreeNode() {
         fileTemplates!![fileName] = template
     }
 
-    private fun createDirs(dirs: MutableList<String>, parent: FileTreeDsl): FileTreeNode {
-        if (dirs.isEmpty()) {
-            return parent
-        }
-        // the first dir
-        val first = dirs[0]
-        dirs.removeAt(0)
-        val firstDir = FileTreeDsl(parent, first, true)
-        val findChild = getChild(first, true)
-        if (findChild != null) {
-            return createDirs(dirs, findChild)
-        }
-        addChild(firstDir)
-        // create child dir
-        return createDirs(dirs, firstDir)
-    }
 }

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

@@ -224,11 +224,17 @@ open class FileTreeNode() {
         if (dirs.isEmpty()) {
             return parent
         }
-        val current = dirs[0]
+        // the first dir
+        val first = dirs.first()
         dirs.removeAt(0)
-        val dirNode = FileTreeNode(parent, current, true)
-        addChild(dirNode)
-        return createDirs(dirs, dirNode)
+        val newNode = FileTreeNode(parent, first, true)
+        val find = getChild(first, true)
+        if (find != null) {
+            return createDirs(dirs, find)
+        }
+        parent.addChild(newNode)
+        // create child dir
+        return createDirs(dirs, newNode)
     }
 
     /**

src/test/FileTreeDslTest.kt

@@ -6,48 +6,49 @@ import org.junit.Test
 class FileTreeDslTest {
 
     @Test
-    fun createSimpleFileTreeTest(){
+    fun createSimpleFileTreeTest() {
         val tree = FileTreeDsl {
             file("file")
-            dir("dir1"){
+            dir("dir1") {
                 file("file2")
-                dir("dir2"){
-                    dir("dir3"){
+                dir("dir2") {
+                    dir("dir3") {
                         dir("dir4")
                     }
-                    dir("dir5"){
+                    dir("dir5") {
                         dir("dir6")
                         dir("dir9")
                     }
                 }
                 file("file3")
             }
-            dir("dir7"){
+            dir("dir7") {
                 dir("dir8")
             }
         }
         println(tree.getTreeGraph())
     }
 
     @Test
-    fun createPackageDirTest(){
+    fun createPackageDirTest() {
 
         val tree = FileTreeDsl {
             dir("src") {
-                dir("com/example/app"){
+                dir("com/example/app") {
                     file("Main.java")
                 }
-                dir("com/example")
+                dir("com/example/app1")
             }
             file("README.md")
         }
         println(tree.getTreeGraph())
     }
+
     @Test
-    fun fileNamePlaceholderTest(){
+    fun fileNamePlaceholderTest() {
         val tree = FileTreeDsl {
-            placeholder("FILE_1","first_file")
-            placeholder("FILE_2","second_file")
+            placeholder("FILE_1", "first_file")
+            placeholder("FILE_2", "second_file")
             file("\${FILE_1}.java")
             file("\${FILE_2}.java")
             dir("com/exmpale")