Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 23:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve removing unused assets

Browse source
This commit is contained in:
Daniel 2024-10-31 00:12:21 +08:00
parent 258d55b41f
commit ba9f41aa35
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/model/assets.go
View file

@ -521,17 +521,19 @@ func RemoveUnusedAssets() (ret []string) {
sql.BatchRemoveAssetsQueue(hashes) sql.BatchRemoveAssetsQueue(hashes)
for _, unusedAsset := range unusedAssets { for _, unusedAsset := range unusedAssets {
if unusedAsset = filepath.Join(util.DataDir, unusedAsset); filelock.IsExist(unusedAsset) { absPath := filepath.Join(util.DataDir, unusedAsset)
info, statErr := os.Stat(unusedAsset) if filelock.IsExist(absPath) {
info, statErr := os.Stat(absPath)
if statErr == nil { if statErr == nil {
size += info.Size() size += info.Size()
} }
if err := filelock.Remove(unusedAsset); err != nil { if err := filelock.Remove(absPath); err != nil {
logging.LogErrorf("remove unused asset [%s] failed: %s", unusedAsset, err) logging.LogErrorf("remove unused asset [%s] failed: %s", absPath, err)
} }
util.RemoveAssetText(unusedAsset)
} }
ret = append(ret, unusedAsset) ret = append(ret, absPath)
} }
if 0 < len(ret) { if 0 < len(ret) {
IncSync() IncSync()
@ -569,6 +571,9 @@ func RemoveUnusedAsset(p string) (ret string) {
logging.LogErrorf("remove unused asset [%s] failed: %s", absPath, err) logging.LogErrorf("remove unused asset [%s] failed: %s", absPath, err)
} }
ret = absPath ret = absPath
util.RemoveAssetText(p)
IncSync() IncSync()
indexHistoryDir(filepath.Base(historyDir), util.NewLute()) indexHistoryDir(filepath.Base(historyDir), util.NewLute())