From 5f364acbbc0ad5b7ed9d41376e253f8a7cdead4b Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Sun, 15 Jan 2023 11:39:50 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D/=E7=A7=BB=E5=8A=A8=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/box.go | 43 ++++++++++++-------------------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/kernel/model/box.go b/kernel/model/box.go
index bd29ac1d1..f63dc0d71 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -391,47 +391,28 @@ func isSkipFile(filename string) bool {
 	return strings.HasPrefix(filename, ".") || "node_modules" == filename || "dist" == filename || "target" == filename
 }
 
-func (box *Box) renameSubTrees(tree *parse.Tree) {
-	subFiles := box.ListFiles(tree.Path)
-	totals := len(subFiles) + 3
-	showProgress := 64 < totals
-	for i, subFile := range subFiles {
-		if !strings.HasSuffix(subFile.path, ".sy") {
-			continue
-		}
-
-		subTree, err := LoadTree(box.ID, subFile.path) // LoadTree 会重新构造 HPath
-		if nil != err {
-			continue
-		}
-
-		sql.UpsertTreeQueue(subTree)
-		if showProgress {
-			msg := fmt.Sprintf(Conf.Language(107), subTree.HPath)
-			util.PushProgress(util.PushProgressCodeProgressed, i, totals, msg)
-		}
-	}
-
-	if showProgress {
-		util.ClearPushProgress(totals)
-	}
-}
-
 func moveTree(tree *parse.Tree) {
 	treenode.SetBlockTreePath(tree)
 	sql.UpsertTreeQueue(tree)
 
 	box := Conf.Box(tree.Box)
-	subFiles := box.ListFiles(tree.Path)
-	totals := len(subFiles) + 5
-	showProgress := 64 < totals
+	box.renameSubTrees(tree)
+}
 
-	for i, subFile := range subFiles {
+func (box *Box) renameSubTrees(tree *parse.Tree) {
+	subFiles := box.ListFiles(tree.Path)
+	box.moveTrees0(subFiles)
+}
+
+func (box *Box) moveTrees0(files []*FileInfo) {
+	totals := len(files) + 5
+	showProgress := 64 < totals
+	for i, subFile := range files {
 		if !strings.HasSuffix(subFile.path, ".sy") {
 			continue
 		}
 
-		subTree, err := LoadTree(box.ID, subFile.path)
+		subTree, err := LoadTree(box.ID, subFile.path) // LoadTree 会重新构造 HPath
 		if nil != err {
 			continue
 		}