Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/dev' into dev

Vanessa 2 gadi atpakaļ
vecāks
revīzija
c50400428b
2 mainītis faili ar 9 papildinājumiem un 2 dzēšanām
  1. 2 0
      kernel/model/transaction.go
  2. 7 2
      kernel/treenode/blocktree.go

+ 2 - 0
kernel/model/transaction.go

@@ -1316,6 +1316,8 @@ func autoFixIndex() {
 		sql.RemoveTreeQueue(root.Box, rootID)
 		reindexTree(rootID, i, size)
 	}
+
+	util.PushStatusBar("")
 }
 
 func reindexTreeByPath(box, p string, i, size int) {

+ 7 - 2
kernel/treenode/blocktree.go

@@ -148,13 +148,18 @@ func GetNotExistPaths(boxID string, paths []string) (ret []string) {
 	}
 
 	tmp := blockTrees
+	btPathsMap := map[string]bool{}
 	for _, blockTree := range tmp {
 		if blockTree.BoxID != boxID {
 			continue
 		}
 
-		if !pathsMap[blockTree.Path] {
-			ret = append(ret, blockTree.Path)
+		btPathsMap[blockTree.Path] = true
+	}
+
+	for p, _ := range pathsMap {
+		if !btPathsMap[p] {
+			ret = append(ret, p)
 		}
 	}
 	ret = gulu.Str.RemoveDuplicatedElem(ret)