0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 闪卡复习评分支持撤销 https://github.com/siyuan-note/siyuan/issues/7455

Browse source
This commit is contained in:
Liang Ding 2023-02-24 14:45:28 +08:00
parent 43c5938082
commit 67b90f7384
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
kernel/model/flashcard.go
View file

@ -155,6 +155,9 @@ func GetFlashcards(deckID string, page int) (blocks []*Block, total, pageCount i
return
}
// 每次调用复习时都先缓存一下卡片，以便在复习时支持撤销。
var reviewCardCache = map[string]riff.Card{}
func ReviewFlashcard(deckID string, blockID string, rating riff.Rating) (err error) {
deckLock.Lock()
defer deckLock.Unlock()
@ -165,17 +168,33 @@ func ReviewFlashcard(deckID string, blockID string, rating riff.Rating) (err err
}
deck := Decks[deckID]
card := deck.GetCard(blockID)
if nil == card {
logging.LogErrorf("card not found [%s]", blockID)
return
}
// 缓存卡片以便撤销
reviewCardCache[card.ID()] = card
deck.Review(blockID, rating)
err = deck.Save()
if nil != err {
logging.LogErrorf("save deck [%s] failed: %s", deckID, err)
return
}
dueCards := getDueFlashcards(deckID)
if 1 > len(dueCards) {
// 这个卡包中没有待复习的卡片了，说明最后一张卡片已经复习完了，清空撤销缓存
reviewCardCache = map[string]riff.Card{}
}
return
}
type Flashcard struct {
DeckID string `json:"deckID"`
CardID string `json:"cardID"`
BlockID string `json:"blockID"`
NextDues map[riff.Rating]string `json:"nextDues"`
}
@ -211,6 +230,7 @@ func GetTreeDueFlashcards(rootID string) (ret []*Flashcard, err error) {
ret = append(ret, &Flashcard{
DeckID: builtinDeckID,
CardID: card.ID(),
BlockID: blockID,
NextDues: nextDues,
})
@ -269,10 +289,21 @@ func GetDueFlashcards(deckID string) (ret []*Flashcard, err error) {
}
if "" == deckID {
return getAllDueFlashcards()
ret = getAllDueFlashcards()
return
}
ret = getDueFlashcards(deckID)
return
}
func getDueFlashcards(deckID string) (ret []*Flashcard) {
deck := Decks[deckID]
if nil == deck {
logging.LogWarnf("deck not found [%s]", deckID)
return
}
cards := deck.Dues()
now := time.Now()
for _, card := range cards {
@ -289,6 +320,7 @@ func GetDueFlashcards(deckID string) (ret []*Flashcard, err error) {
ret = append(ret, &Flashcard{
DeckID: deckID,
CardID: card.ID(),
BlockID: blockID,
NextDues: nextDues,
})
@ -299,7 +331,7 @@ func GetDueFlashcards(deckID string) (ret []*Flashcard, err error) {
return
}
func getAllDueFlashcards() (ret []*Flashcard, err error) {
func getAllDueFlashcards() (ret []*Flashcard) {
blockIDs := map[string]bool{}
now := time.Now()
for _, deck := range Decks {
@ -321,6 +353,7 @@ func getAllDueFlashcards() (ret []*Flashcard, err error) {
ret = append(ret, &Flashcard{
DeckID: deck.ID,
CardID: card.ID(),
BlockID: blockID,
NextDues: nextDues,
})