Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-01 06:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

♻️ Improve copy file stability https://github.com/siyuan-note/siyuan/issues/7837

Browse source
This commit is contained in:
Liang Ding 2023-03-31 10:34:30 +08:00
parent e2a3aa0ef8
commit 849476b88c
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
5 changed files with 24 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/model/assets.go
View file

@ -110,7 +110,7 @@ func NetImg2LocalAssets(rootID, originalURL string) (err error) {
name = "net-img-" + name
name = util.AssetName(name)
writePath := filepath.Join(assetsDirPath, name)
if err = gulu.File.Copy(u, writePath); nil != err {
if err = filelock.Copy(u, writePath); nil != err {
logging.LogErrorf("copy [%s] to [%s] failed: %s", u, writePath, err)
return ast.WalkSkipChildren
}
@ -412,7 +412,7 @@ func RemoveUnusedAssets() (ret []string) {
for _, p := range unusedAssets {
historyPath := filepath.Join(historyDir, p)
if p = filepath.Join(util.DataDir, p); gulu.File.IsExist(p) {
if err = gulu.File.Copy(p, historyPath); nil != err {
if err = filelock.Copy(p, historyPath); nil != err {
return
}
@ -455,7 +455,7 @@ func RemoveUnusedAsset(p string) (ret string) {
newP := strings.TrimPrefix(absPath, util.DataDir)
historyPath := filepath.Join(historyDir, newP)
if gulu.File.IsExist(absPath) {
if err = gulu.File.Copy(absPath, historyPath); nil != err {
if err = filelock.Copy(absPath, historyPath); nil != err {
return
}