Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-13 10:44:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2026-02-11 19:35:06 +08:00
commit 1bf9db30f0
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kernel/model/assets.go
View file

@ -86,8 +86,10 @@ func HandleAssetsRemoveEvent(assetAbsPath string) {
if !filelock.IsExist(assetAbsPath) {
return
}
if ".DS_Store" == filepath.Base(assetAbsPath) {
if gulu.File.IsDir(assetAbsPath) {
return
}
if filelock.IsHidden(assetAbsPath) {
return
}
@ -106,8 +108,10 @@ func HandleAssetsChangeEvent(assetAbsPath string) {
if !filelock.IsExist(assetAbsPath) {
return
}
if ".DS_Store" == filepath.Base(assetAbsPath) {
if gulu.File.IsDir(assetAbsPath) {
return
}
if filelock.IsHidden(assetAbsPath) {
return
}

5
kernel/model/assets_watcher.go
View file

@ -21,7 +21,6 @@ package model
import (
"os"
"path/filepath"
"strings"
"time"
"github.com/88250/gulu"
@ -72,10 +71,6 @@ func watchAssets() {
return
}
if strings.HasSuffix(event.Name, ".tmp") {
continue
}
lastEvent = event
timer.Reset(time.Millisecond * 100)
case err, ok := <-assetsWatcher.Errors: