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

🐛 After uninstalling the widget, data synchronization does not clear the widget folder https://github.com/siyuan-note/siyuan/issues/11279

Browse source
This commit is contained in:
Daniel 2024-05-06 23:07:55 +08:00
parent 1a99bafe9f
commit 6a451cf1da
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kernel/model/repository.go
View file

@ -41,6 +41,7 @@ import (
"github.com/88250/lute/html"
"github.com/88250/lute/parse"
"github.com/88250/lute/render"
"github.com/emirpasic/gods/sets/hashset"
"github.com/siyuan-note/dejavu"
"github.com/siyuan-note/dejavu/cloud"
"github.com/siyuan-note/dejavu/entity"
@ -1427,6 +1428,8 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
upsertTrees++
}
}
clearWidgetsDir := hashset.New()
for _, file := range mergeResult.Removes {
removes = append(removes, file.Path)
if strings.HasPrefix(file.Path, "/storage/riff/") {
@ -1444,6 +1447,12 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
if strings.HasPrefix(file.Path, "/storage/petal/") {
needReloadPlugin = true
}
if strings.HasPrefix(file.Path, "/widgets/") {
if parts := strings.Split(file.Path, "/"); 2 < len(parts) {
clearWidgetsDir.Add(parts[2])
}
}
}
if needReloadFlashcard {
@ -1458,6 +1467,11 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
pushReloadPlugin()
}
for _, widgetDir := range clearWidgetsDir.Values() {
widgetDirPath := filepath.Join(util.DataDir, "widgets", widgetDir.(string))
gulu.File.RemoveEmptyDirs(widgetDirPath)
}
syncingFiles = sync.Map{}
syncingStorages.Store(false)