diff --git a/drivers/115_open/driver.go b/drivers/115_open/driver.go index 278ae0f7f..4d8061738 100644 --- a/drivers/115_open/driver.go +++ b/drivers/115_open/driver.go @@ -199,18 +199,15 @@ func (d *Open115) MakeDir(ctx context.Context, parentDir model.Obj, dirName stri }, nil } -func (d *Open115) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) { +func (d *Open115) Move(ctx context.Context, srcObj, dstDir model.Obj) error { if err := d.WaitLimit(ctx); err != nil { - return nil, err + return err } _, err := d.client.Move(ctx, &sdk.MoveReq{ FileIDs: srcObj.GetID(), ToCid: dstDir.GetID(), }) - if err != nil { - return nil, err - } - return srcObj, nil + return err } func (d *Open115) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) { @@ -218,7 +215,7 @@ func (d *Open115) Rename(ctx context.Context, srcObj model.Obj, newName string) return nil, err } _, err := d.client.UpdateFile(ctx, &sdk.UpdateFileReq{ - FileID: srcObj.GetID(), + FileID: srcObj.GetID(), FileName: newName, }) if err != nil { @@ -227,23 +224,21 @@ func (d *Open115) Rename(ctx context.Context, srcObj model.Obj, newName string) obj, ok := srcObj.(*Obj) if ok { obj.Fn = newName + return srcObj, nil } - return srcObj, nil + return nil, nil } -func (d *Open115) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) { +func (d *Open115) Copy(ctx context.Context, srcObj, dstDir model.Obj) error { if err := d.WaitLimit(ctx); err != nil { - return nil, err + return err } _, err := d.client.Copy(ctx, &sdk.CopyReq{ PID: dstDir.GetID(), FileID: srcObj.GetID(), NoDupli: "1", }) - if err != nil { - return nil, err - } - return srcObj, nil + return err } func (d *Open115) Remove(ctx context.Context, obj model.Obj) error { diff --git a/drivers/115_open/types.go b/drivers/115_open/types.go index 0bd95bfd1..493772a58 100644 --- a/drivers/115_open/types.go +++ b/drivers/115_open/types.go @@ -3,9 +3,9 @@ package _115_open import ( "time" + sdk "github.com/OpenListTeam/115-sdk-go" "github.com/OpenListTeam/OpenList/v4/internal/model" "github.com/OpenListTeam/OpenList/v4/pkg/utils" - sdk "github.com/OpenListTeam/115-sdk-go" ) type Obj sdk.GetFilesResp_File