15308555518/ Cloudreve
1
0
Fork 0
mirror of https://github.com/cloudreve/Cloudreve.git synced 2025-12-26 00:12:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(thumb blob path): separators be wrongly modified (#3062) (#3116) 

* fix(thumb blob path): separators be wrongly modified

* Update common.go
This commit is contained in:
Darren Yu 2025-12-05 15:57:58 +08:00 committed by GitHub
parent a08c796e3f
commit 05c68b4062
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/util/common.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"math/rand" "math/rand"
"path"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strconv" "strconv"
@ -101,7 +102,7 @@ func Replace(table map[string]string, s string) string {
// ReplaceMagicVar 动态替换字符串中的魔法变量 // ReplaceMagicVar 动态替换字符串中的魔法变量
func ReplaceMagicVar(rawString string, fsSeparator string, pathAvailable bool, blobAvailable bool, func ReplaceMagicVar(rawString string, fsSeparator string, pathAvailable bool, blobAvailable bool,
timeConst time.Time, userId int, originName string, originPath string, completeBlobPath string) string { timeConst time.Time, userId int, originName string, originPath string, completeBlobPath string) string {
re := regexp.MustCompile(`\{[^{}]+\}`) re := regexp.MustCompile(`\{[^{}]+\}`)
return re.ReplaceAllStringFunc(rawString, func(match string) string { return re.ReplaceAllStringFunc(rawString, func(match string) string {
switch match { switch match {
@ -164,7 +165,7 @@ func ReplaceMagicVar(rawString string, fsSeparator string, pathAvailable bool, b
return match return match
case "{blob_path}": case "{blob_path}":
if blobAvailable { if blobAvailable {
return filepath.Dir(completeBlobPath) + fsSeparator return path.Dir(completeBlobPath) + fsSeparator
} }
return match return match
default: default: