Skip to content

Commit b86d10f

Browse files
authored
fix(drivers/115_open): simplify Move and Copy methods to return error directly (#2505)
1 parent aa534a9 commit b86d10f

1 file changed

Lines changed: 8 additions & 13 deletions

File tree

drivers/115_open/driver.go

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -204,18 +204,15 @@ func (d *Open115) MakeDir(ctx context.Context, parentDir model.Obj, dirName stri
204204
}, nil
205205
}
206206

207-
func (d *Open115) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
207+
func (d *Open115) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
208208
if err := d.WaitLimit(ctx); err != nil {
209-
return nil, err
209+
return err
210210
}
211211
_, err := d.client.Move(ctx, &sdk.MoveReq{
212212
FileIDs: srcObj.GetID(),
213213
ToCid: dstDir.GetID(),
214214
})
215-
if err != nil {
216-
return nil, err
217-
}
218-
return srcObj, nil
215+
return err
219216
}
220217

221218
func (d *Open115) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
@@ -232,23 +229,21 @@ func (d *Open115) Rename(ctx context.Context, srcObj model.Obj, newName string)
232229
obj, ok := srcObj.(*Obj)
233230
if ok {
234231
obj.Fn = newName
232+
return srcObj, nil
235233
}
236-
return srcObj, nil
234+
return nil, nil
237235
}
238236

239-
func (d *Open115) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
237+
func (d *Open115) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
240238
if err := d.WaitLimit(ctx); err != nil {
241-
return nil, err
239+
return err
242240
}
243241
_, err := d.client.Copy(ctx, &sdk.CopyReq{
244242
PID: dstDir.GetID(),
245243
FileID: srcObj.GetID(),
246244
NoDupli: "1",
247245
})
248-
if err != nil {
249-
return nil, err
250-
}
251-
return srcObj, nil
246+
return err
252247
}
253248

254249
func (d *Open115) Remove(ctx context.Context, obj model.Obj) error {

0 commit comments

Comments
 (0)