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

🎨 Data sync block flashcard

Browse source
This commit is contained in:
Liang Ding 2023-04-28 15:35:30 +08:00
parent 48e8c9f86f
commit dce8751607
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 9 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
kernel/model/flashcard.go
View file

@ -17,7 +17,6 @@
package model
import (
"errors"
"math"
"os"
"path/filepath"
@ -247,10 +246,7 @@ func ReviewFlashcard(deckID, cardID string, rating riff.Rating, reviewedCardIDs
deckLock.Lock()
defer deckLock.Unlock()
if syncingStorages {
err = errors.New(Conf.Language(81))
return
}
waitForSyncingStorages()
deck := Decks[deckID]
card := deck.GetCard(cardID)
@ -290,10 +286,7 @@ func SkipReviewFlashcard(deckID, cardID string) (err error) {
deckLock.Lock()
defer deckLock.Unlock()
if syncingStorages {
err = errors.New(Conf.Language(81))
return
}
waitForSyncingStorages()
deck := Decks[deckID]
card := deck.GetCard(cardID)
@ -330,10 +323,7 @@ func GetNotebookDueFlashcards(boxID string, reviewedCardIDs []string) (ret []*Fl
deckLock.Lock()
defer deckLock.Unlock()
if syncingStorages {
err = errors.New(Conf.Language(81))
return
}
waitForSyncingStorages()
entries, err := os.ReadDir(filepath.Join(util.DataDir, boxID))
if nil != err {
@ -384,10 +374,7 @@ func GetTreeDueFlashcards(rootID string, reviewedCardIDs []string) (ret []*Flash
deckLock.Lock()
defer deckLock.Unlock()
if syncingStorages {
err = errors.New(Conf.Language(81))
return
}
waitForSyncingStorages()
deck := Decks[builtinDeckID]
if nil == deck {
@ -425,10 +412,7 @@ func GetDueFlashcards(deckID string, reviewedCardIDs []string) (ret []*Flashcard
deckLock.Lock()
defer deckLock.Unlock()
if syncingStorages {
err = errors.New(Conf.Language(81))
return
}
waitForSyncingStorages()
if "" == deckID {
ret, unreviewedCount = getAllDueFlashcards(reviewedCardIDs)
@ -735,10 +719,7 @@ func RenameDeck(deckID, name string) (err error) {
deckLock.Lock()
defer deckLock.Unlock()
if syncingStorages {
err = errors.New(Conf.Language(81))
return
}
waitForSyncingStorages()
deck := Decks[deckID]
deck.Name = name
@ -754,10 +735,7 @@ func RemoveDeck(deckID string) (err error) {
deckLock.Lock()
defer deckLock.Unlock()
if syncingStorages {
err = errors.New(Conf.Language(81))
return
}
waitForSyncingStorages()
riffSavePath := getRiffDir()
deckPath := filepath.Join(riffSavePath, deckID+".deck")
@ -785,10 +763,7 @@ func CreateDeck(name string) (deck *riff.Deck, err error) {
}
func createDeck(name string) (deck *riff.Deck, err error) {
if syncingStorages {
err = errors.New(Conf.Language(81))
return
}
waitForSyncingStorages()
deckID := ast.NewNodeID()
deck, err = createDeck0(name, deckID)

2
kernel/model/repository.go
View file

@ -831,7 +831,7 @@ var syncingFiles = sync.Map{}
var syncingStorages = false
func waitForSyncingStorages() {
for i := 0; i < 30; i++ {
for i := 0; i < 60; i++ {
if syncingStorages {
return
}