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

🎨 Fix https://github.com/siyuan-note/siyuan/issues/16576

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-12-14 11:36:02 +08:00
parent 1acbb7d06d
commit ea925aff32
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
kernel/model/upload.go
View file

@ -84,14 +84,26 @@ func InsertLocalAssets(id string, assetAbsPaths []string, isUpload bool) (succMa
err = openErr
return
}
hash, hashErr := util.GetEtagByHandle(f, fi.Size())
if nil != hashErr {
f.Close()
return
}
if existAssetPath := GetAssetPathByHash(hash); "" != existAssetPath {
// 已经存在同样数据的资源文件的话不重复保存
if 1 > fi.Size() {
hash = "random_1_" + gulu.Rand.String(12)
}
existAssetPath := GetAssetPathByHash(hash)
if "" != existAssetPath {
originalName := util.RemoveID(filepath.Base(existAssetPath))
if fName != originalName {
hash = "random_2_" + gulu.Rand.String(12)
}
}
if "" != existAssetPath && !strings.HasPrefix(hash, "random_") {
succMap[baseName] = existAssetPath
} else {
fName = util.AssetName(fName, ast.NewNodeID())
@ -200,8 +212,19 @@ func Upload(c *gin.Context) {
break
}
if existAssetPath := GetAssetPathByHash(hash); "" != existAssetPath {
// 已经存在同样数据的资源文件的话不重复保存
if 1 > file.Size {
hash = "empty_" + gulu.Rand.String(12)
}
existAssetPath := GetAssetPathByHash(hash)
if "" != existAssetPath {
originalName := util.RemoveID(filepath.Base(existAssetPath))
if fName != originalName {
hash = "random_2_" + gulu.Rand.String(12)
}
}
if "" != existAssetPath && !strings.HasPrefix(hash, "random_") {
succMap[baseName] = existAssetPath
} else {
if skipIfDuplicated {