Skip to content

fix(drivers/189pc)!: normalize escaped apostrophes in names #2792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qbisi wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −3
Open

fix(drivers/189pc)!: normalize escaped apostrophes in names #2792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
603e97b
fix(189pc): normalize escaped apostrophes in names
qbisi Jul 15, 2026
8e1aed3
Merge branch 'main' into fix/189cloud-apostrophe-names
PIKACHUIM Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions drivers/189pc/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ type Cloud189File struct {
// StarLabel int64 `json:"starLabel"`
}

func normalizeCloud189Name(name string) string {
return strings.ReplaceAll(name, "\\'", "'")
}

func (c *Cloud189File) CreateTime() time.Time {
return time.Time(c.CreateDate)
}
Expand All @@ -207,6 +211,8 @@ func (c *Cloud189File) GetID() string { return string(c.ID) }
func (c *Cloud189File) GetPath() string { return "" }
func (c *Cloud189File) Thumb() string { return c.Icon.SmallUrl }

func (c *Cloud189File) GetDisplayName() string { return normalizeCloud189Name(c.Name) }

// 文件夹
type Cloud189Folder struct {
ID String `json:"id"`
Expand Down Expand Up @@ -238,6 +244,8 @@ func (c *Cloud189Folder) IsDir() bool { return true }
func (c *Cloud189Folder) GetID() string { return string(c.ID) }
func (c *Cloud189Folder) GetPath() string { return "" }

func (c *Cloud189Folder) GetDisplayName() string { return normalizeCloud189Name(c.Name) }

type Cloud189FilesResp struct {
//ResCode int `json:"res_code"`
//ResMessage string `json:"res_message"`
Expand Down
14 changes: 11 additions & 3 deletions internal/model/obj.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ type ObjUnwrap interface {
Unwrap() Obj
}

type ObjDisplayName interface {
GetDisplayName() string
}

type Obj interface {
GetSize() int64
GetName() string
Expand Down Expand Up @@ -132,13 +136,17 @@ func ExtractFolder(objs []Obj, extractFolder string) {
})
}

func WrapObjName(objs Obj) Obj {
return &ObjWrapName{Name: utils.MappingName(objs.GetName()), Obj: objs}
func WrapObjName(obj Obj) Obj {
name := obj.GetName()
if displayName, ok := obj.(ObjDisplayName); ok {
name = displayName.GetDisplayName()
}
return &ObjWrapName{Name: utils.MappingName(name), Obj: obj}
}

func WrapObjsName(objs []Obj) {
for i := range objs {
objs[i] = &ObjWrapName{Name: utils.MappingName(objs[i].GetName()), Obj: objs[i]}
objs[i] = WrapObjName(objs[i])
}
}

Expand Down