github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(blob path): diable `{path}` magic var for blob path

pull/2507/merge 4.4.1
Aaron Liu 2025-08-07 11:35:28 +08:00
parent b0375f5a24
commit 4c976b8627
2 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 09480ffa21d859a1d2f9bb2421e6f78f113494c4 Subproject commit 3a23464a0f4330e4583e99c1815b84c5240ffc9d

9
pkg/filemanager/fs/dbfs/dbfs.go
View File

@ -770,7 +770,7 @@ func generateSavePath(policy *ent.StoragePolicy, req *fs.UploadRequest, user *en
currentTime := time.Now() currentTime := time.Now()
originName := req.Props.Uri.Name() originName := req.Props.Uri.Name()
dynamicReplace := func(regPattern string, rule string) string { dynamicReplace := func(regPattern string, rule string, pathAvailable bool) string {
re := regexp.MustCompile(regPattern) re := regexp.MustCompile(regPattern)
return re.ReplaceAllStringFunc(rule, func(match string) string { return re.ReplaceAllStringFunc(rule, func(match string) string {
switch match { switch match {
@ -811,7 +811,10 @@ func generateSavePath(policy *ent.StoragePolicy, req *fs.UploadRequest, user *en
case "{uuid}": case "{uuid}":
return uuid.Must(uuid.NewV4()).String() return uuid.Must(uuid.NewV4()).String()
case "{path}": case "{path}":
if pathAvailable {
return req.Props.Uri.Dir() + fs.Separator return req.Props.Uri.Dir() + fs.Separator
}
return match
case "{originname}": case "{originname}":
return originName return originName
case "{ext}": case "{ext}":
@ -826,10 +829,10 @@ func generateSavePath(policy *ent.StoragePolicy, req *fs.UploadRequest, user *en
dirRule := policy.DirNameRule dirRule := policy.DirNameRule
dirRule = filepath.ToSlash(dirRule) dirRule = filepath.ToSlash(dirRule)
dirRule = dynamicReplace(`\{[^{}]+\}`, dirRule) dirRule = dynamicReplace(`\{[^{}]+\}`, dirRule, true)
nameRule := policy.FileNameRule nameRule := policy.FileNameRule
nameRule = dynamicReplace(`\{[^{}]+\}`, nameRule) nameRule = dynamicReplace(`\{[^{}]+\}`, nameRule, false)
return path.Join(path.Clean(dirRule), nameRule) return path.Join(path.Clean(dirRule), nameRule)
} }