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

🐛 Improve importing .sy.zip https://github.com/siyuan-note/siyuan/issues/12825

Browse source
This commit is contained in:
Daniel 2024-10-18 15:01:28 +08:00
parent ac4b0526a4
commit 5efce9b33e
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kernel/model/import.go
View file

@ -208,6 +208,12 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
})
}
var replacements []string
for oldID, newID := range blockIDs {
replacements = append(replacements, oldID, newID)
}
blockIDReplacer := strings.NewReplacer(replacements...)
// 将关联的数据库文件移动到 data/storage/av/ 下
storage := filepath.Join(unzipRootPath, "storage")
storageAvDir := filepath.Join(storage, "av")
@ -242,9 +248,7 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
for oldAvID, newAvID := range avIDs {
newData = bytes.ReplaceAll(newData, []byte(oldAvID), []byte(newAvID))
}
for oldID, newID := range blockIDs {
newData = bytes.ReplaceAll(newData, []byte(oldID), []byte(newID))
}
newData = []byte(blockIDReplacer.Replace(string(newData)))
if !bytes.Equal(data, newData) {
if writeErr := os.WriteFile(oldPath, newData, 0644); nil != writeErr {
logging.LogErrorf("write av file [%s] failed: %s", oldPath, writeErr)