From 3416861cab6f6828b24979a926fede91b5b1ba57 Mon Sep 17 00:00:00 2001
From: Noah Hsu <i@nn.ci>
Date: Mon, 5 Sep 2022 00:26:04 +0800
Subject: [PATCH] style: use `utils.SliceConvert` uniformly

---
 drivers/aliyundrive/driver.go   |  8 +++-----
 drivers/baidu_netdisk/driver.go |  8 +++-----
 drivers/google_drive/driver.go  |  8 +++-----
 drivers/onedrive/driver.go      | 10 ++++------
 drivers/onedrive/util.go        |  2 +-
 drivers/pikpak/driver.go        |  8 +++-----
 drivers/quark/driver.go         |  8 +++-----
 drivers/teambition/driver.go    |  2 +-
 8 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/drivers/aliyundrive/driver.go b/drivers/aliyundrive/driver.go
index 9fde212a..f0572792 100644
--- a/drivers/aliyundrive/driver.go
+++ b/drivers/aliyundrive/driver.go
@@ -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) {
diff --git a/drivers/baidu_netdisk/driver.go b/drivers/baidu_netdisk/driver.go
index 29e06992..3779c771 100644
--- a/drivers/baidu_netdisk/driver.go
+++ b/drivers/baidu_netdisk/driver.go
@@ -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) {
diff --git a/drivers/google_drive/driver.go b/drivers/google_drive/driver.go
index 1601b83c..59f99fe3 100644
--- a/drivers/google_drive/driver.go
+++ b/drivers/google_drive/driver.go
@@ -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) {
diff --git a/drivers/onedrive/driver.go b/drivers/onedrive/driver.go
index 91bec49f..0b464ce7 100644
--- a/drivers/onedrive/driver.go
+++ b/drivers/onedrive/driver.go
@@ -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) {
diff --git a/drivers/onedrive/util.go b/drivers/onedrive/util.go
index 058eeafd..8d5b6c96 100644
--- a/drivers/onedrive/util.go
+++ b/drivers/onedrive/util.go
@@ -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 != "" {
diff --git a/drivers/pikpak/driver.go b/drivers/pikpak/driver.go
index 5aff3e7c..f0ef12a9 100644
--- a/drivers/pikpak/driver.go
+++ b/drivers/pikpak/driver.go
@@ -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) {
diff --git a/drivers/quark/driver.go b/drivers/quark/driver.go
index 12fc797c..08723791 100644
--- a/drivers/quark/driver.go
+++ b/drivers/quark/driver.go
@@ -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) {
diff --git a/drivers/teambition/driver.go b/drivers/teambition/driver.go
index 37de3dc0..f7c48927 100644
--- a/drivers/teambition/driver.go
+++ b/drivers/teambition/driver.go
@@ -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
 //}