style: use `utils.SliceConvert` uniformly

pull/1604/head
Noah Hsu 2022-09-05 00:26:04 +08:00
parent 25ae1b8397
commit 3416861cab
8 changed files with 21 additions and 33 deletions

View File

@ -81,11 +81,9 @@ func (d *AliDrive) List(ctx context.Context, dir model.Obj, args model.ListArgs)
if err != nil {
return nil, err
}
objs := make([]model.Obj, len(files))
for i := 0; i < len(files); i++ {
objs[i] = fileToObj(files[i])
}
return objs, nil
return utils.SliceConvert(files, func(src File) (model.Obj, error) {
return fileToObj(src), nil
})
}
//func (d *AliDrive) Get(ctx context.Context, path string) (model.Obj, error) {

View File

@ -54,11 +54,9 @@ func (d *BaiduNetdisk) List(ctx context.Context, dir model.Obj, args model.ListA
if err != nil {
return nil, err
}
objs := make([]model.Obj, len(files))
for i := 0; i < len(files); i++ {
objs[i] = fileToObj(files[i])
}
return objs, nil
return utils.SliceConvert(files, func(src File) (model.Obj, error) {
return fileToObj(src), nil
})
}
//func (d *BaiduNetdisk) Get(ctx context.Context, path string) (model.Obj, error) {

View File

@ -45,11 +45,9 @@ func (d *GoogleDrive) List(ctx context.Context, dir model.Obj, args model.ListAr
if err != nil {
return nil, err
}
objs := make([]model.Obj, len(files))
for i := 0; i < len(files); i++ {
objs[i] = fileToObj(files[i])
}
return objs, nil
return utils.SliceConvert(files, func(src File) (model.Obj, error) {
return fileToObj(src), nil
})
}
//func (d *GoogleDrive) Get(ctx context.Context, path string) (model.Obj, error) {

View File

@ -42,15 +42,13 @@ func (d *Onedrive) Drop(ctx context.Context) error {
}
func (d *Onedrive) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
files, err := d.GetFiles(dir.GetPath())
files, err := d.getFiles(dir.GetPath())
if err != nil {
return nil, err
}
objs := make([]model.Obj, len(files))
for i := 0; i < len(files); i++ {
objs[i] = fileToObj(files[i])
}
return objs, nil
return utils.SliceConvert(files, func(src File) (model.Obj, error) {
return fileToObj(src), nil
})
}
func (d *Onedrive) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {

View File

@ -124,7 +124,7 @@ func (d *Onedrive) Request(url string, method string, callback base.ReqCallback,
return res.Body(), nil
}
func (d *Onedrive) GetFiles(path string) ([]File, error) {
func (d *Onedrive) getFiles(path string) ([]File, error) {
var res []File
nextLink := d.GetMetaUrl(false, path) + "/children?$expand=thumbnails"
for nextLink != "" {

View File

@ -58,11 +58,9 @@ func (d *PikPak) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
if err != nil {
return nil, err
}
objs := make([]model.Obj, len(files))
for i := 0; i < len(files); i++ {
objs[i] = fileToObj(files[i])
}
return objs, nil
return utils.SliceConvert(files, func(src File) (model.Obj, error) {
return fileToObj(src), nil
})
}
func (d *PikPak) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {

View File

@ -51,11 +51,9 @@ func (d *Quark) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
if err != nil {
return nil, err
}
objs := make([]model.Obj, len(files))
for i := 0; i < len(files); i++ {
objs[i] = fileToObj(files[i])
}
return objs, nil
return utils.SliceConvert(files, func(src File) (model.Obj, error) {
return fileToObj(src), nil
})
}
//func (d *Quark) Get(ctx context.Context, path string) (model.Obj, error) {

View File

@ -45,7 +45,7 @@ func (d *Teambition) List(ctx context.Context, dir model.Obj, args model.ListArg
}
//func (d *Teambition) Get(ctx context.Context, path string) (model.Obj, error) {
// // TODO this is optional
// // this is optional
// return nil, errs.NotImplement
//}