github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-21 19:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 导入 .sy.zip 后丢失自定义排序 Fix https://github.com/siyuan-note/siyuan/issues/6611

Browse Source
This commit is contained in:
Liang Ding 2022-11-16 20:15:22 +08:00
parent ddee980f24
commit 171f7cf777
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/model/import.go
View File

@ -190,9 +190,9 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
logging.LogErrorf("unmarshal sort conf failed: %s", sortErr) logging.LogErrorf("unmarshal sort conf failed: %s", sortErr)
} }
sortPath = filepath.Join(util.DataDir, boxID, ".siyuan", "sort.json") boxSortPath := filepath.Join(util.DataDir, boxID, ".siyuan", "sort.json")
if gulu.File.IsExist(sortPath) { if gulu.File.IsExist(boxSortPath) {
sortData, sortErr = filelock.ReadFile(sortPath) sortData, sortErr = filelock.ReadFile(boxSortPath)
if nil != sortErr { if nil != sortErr {
logging.LogErrorf("read box sort conf failed: %s", sortErr) logging.LogErrorf("read box sort conf failed: %s", sortErr)
} }
@ -210,11 +210,11 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
sortData, sortErr = gulu.JSON.MarshalJSON(fullSortIDs) sortData, sortErr = gulu.JSON.MarshalJSON(fullSortIDs)
if nil != sortErr { if nil != sortErr {
logging.LogErrorf("marshal box sort conf failed: %s", sortErr) logging.LogErrorf("marshal temp full sort conf failed: %s", sortErr)
} else { } else {
sortErr = filelock.WriteFile(sortPath, sortData) sortErr = filelock.WriteFile(sortPath, sortData)
if nil != sortErr { if nil != sortErr {
logging.LogErrorf("write box sort conf failed: %s", sortErr) logging.LogErrorf("write temp full sort conf failed: %s", sortErr)
} }
} }
} }