Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 00:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Show count in spaced repetition tree filter floating window https://github.com/siyuan-note/siyuan/issues/8202

Browse source
This commit is contained in:
Liang Ding 2023-05-08 21:54:51 +08:00
parent 520d7496f2
commit c2dba92f4d
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
5 changed files with 86 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

41
kernel/model/flashcard.go
View file

@ -42,34 +42,58 @@ func GetFlashcardNotebooks() (ret []*Box) {
if nil == deck {
return
}
deckBlockIDs := deck.GetBlockIDs()
boxes := Conf.GetOpenedBoxes()
for _, box := range boxes {
if isBoxContainFlashcard(box.ID, deckBlockIDs) {
newFlashcardCount, dueFlashcardCount, containFlashcard := countBoxFlashcard(box.ID)
if containFlashcard {
box.NewFlashcardCount = newFlashcardCount
box.DueFlashcardCount = dueFlashcardCount
ret = append(ret, box)
}
}
return
}
func isTreeContainFlashcard(rootID string, deckBlockIDs []string) (ret bool) {
func countTreeFlashcard(rootID string) (newFlashcardCount, dueFlashcardCount int, containFlashcard bool) {
deck := Decks[builtinDeckID]
if nil == deck {
return
}
deckBlockIDs := deck.GetBlockIDs()
blockIDs := getTreeSubTreeChildBlocks(rootID)
containFlashcard = false
for _, blockID := range deckBlockIDs {
if gulu.Str.Contains(blockID, blockIDs) {
return true
containFlashcard = true
break
}
}
if !containFlashcard {
return
}
newFlashCards := deck.GetNewCardsByBlockIDs(blockIDs)
newFlashcardCount = len(newFlashCards)
newDueFlashcards := deck.GetDueCardsByBlockIDs(blockIDs)
dueFlashcardCount = len(newDueFlashcards)
return
}
func isBoxContainFlashcard(boxID string, deckBlockIDs []string) (ret bool) {
func countBoxFlashcard(boxID string) (newFlashcardCount, dueFlashcardCount int, containFlashcard bool) {
deck := Decks[builtinDeckID]
if nil == deck {
return
}
entries, err := os.ReadDir(filepath.Join(util.DataDir, boxID))
if nil != err {
logging.LogErrorf("read dir failed: %s", err)
return
}
containFlashcard = false
for _, entry := range entries {
if entry.IsDir() {
continue
@ -80,8 +104,11 @@ func isBoxContainFlashcard(boxID string, deckBlockIDs []string) (ret bool) {
}
rootID := strings.TrimSuffix(entry.Name(), ".sy")
if isTreeContainFlashcard(rootID, deckBlockIDs) {
return true
treeNewFlashcardCount, treeDueFlashcardCount, treeContainFlashcard := countTreeFlashcard(rootID)
if treeContainFlashcard {
containFlashcard = true
newFlashcardCount += treeNewFlashcardCount
dueFlashcardCount += treeDueFlashcardCount
}
}
return