From 22d0ba90f15f3eee03b732f125955f0983cc1df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8A=E6=B5=B7=E6=98=8E=E9=A6=A8=E7=A7=91=E6=8A=80?=
 =?UTF-8?q?=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8?= <admin@mxin.ltd>
Date: Fri, 18 Sep 2020 02:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0sharepoint=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加sharepoint支持
---
 pkg/filesystem/driver/onedrive/api.go | 36 +++++++++++++++++++--------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/pkg/filesystem/driver/onedrive/api.go b/pkg/filesystem/driver/onedrive/api.go
index 51d69a1..ad71a2f 100644
--- a/pkg/filesystem/driver/onedrive/api.go
+++ b/pkg/filesystem/driver/onedrive/api.go
@@ -51,9 +51,17 @@ func (info *FileInfo) GetSourcePath() string {
 func (err RespError) Error() string {
 	return err.APIError.Message
 }
-
+//删除修复
 func (client *Client) getRequestURL(api string) string {
 	base, _ := url.Parse(client.Endpoints.EndpointURL)
+	if strings.Contains(api, "$batch") {
+		urls := client.Endpoints.EndpointURL
+		comma := strings.Index(urls, "v1.0")
+		rurls := []rune(urls)
+		urls = string(rurls[0 : comma+4])
+		base, _ = url.Parse(urls)
+	}
+
 	if base == nil {
 		return ""
 	}
@@ -66,9 +74,9 @@ func (client *Client) ListChildren(ctx context.Context, path string) ([]FileInfo
 	var requestURL string
 	dst := strings.TrimPrefix(path, "/")
 	if dst == "" {
-		requestURL = client.getRequestURL("me/drive/root/children")
+		requestURL = client.getRequestURL("root/children")
 	} else {
-		requestURL = client.getRequestURL("me/drive/root:/" + dst + ":/children")
+		requestURL = client.getRequestURL("root:/" + dst + ":/children")
 	}
 
 	res, err := client.requestWithStr(ctx, "GET", requestURL+"?$top=999999999", "", 200)
@@ -102,10 +110,10 @@ func (client *Client) ListChildren(ctx context.Context, path string) ([]FileInfo
 func (client *Client) Meta(ctx context.Context, id string, path string) (*FileInfo, error) {
 	var requestURL string
 	if id != "" {
-		requestURL = client.getRequestURL("/me/drive/items/" + id)
+		requestURL = client.getRequestURL("items/" + id)
 	} else {
 		dst := strings.TrimPrefix(path, "/")
-		requestURL = client.getRequestURL("me/drive/root:/" + dst)
+		requestURL = client.getRequestURL("root:/" + dst)
 	}
 
 	res, err := client.requestWithStr(ctx, "GET", requestURL+"?expand=thumbnails", "", 200)
@@ -135,7 +143,7 @@ func (client *Client) CreateUploadSession(ctx context.Context, dst string, opts
 	}
 
 	dst = strings.TrimPrefix(dst, "/")
-	requestURL := client.getRequestURL("me/drive/root:/" + dst + ":/createUploadSession")
+	requestURL := client.getRequestURL("root:/" + dst + ":/createUploadSession")
 	body := map[string]map[string]interface{}{
 		"item": {
 			"@microsoft.graph.conflictBehavior": options.conflictBehavior,
@@ -254,7 +262,7 @@ func (client *Client) Upload(ctx context.Context, dst string, size int, file io.
 
 			// 因为后面需要错误重试，这里要把分片内容读到内存中
 			chunkContent := chunkData[:chunkSize]
-			_, err := io.ReadFull(file, chunkContent)
+			io.ReadFull(file, chunkContent)
 
 			chunk := Chunk{
 				Offset:    offset,
@@ -288,7 +296,7 @@ func (client *Client) DeleteUploadSession(ctx context.Context, uploadURL string)
 // SimpleUpload 上传小文件到dst
 func (client *Client) SimpleUpload(ctx context.Context, dst string, body io.Reader, size int64) (*UploadResult, error) {
 	dst = strings.TrimPrefix(dst, "/")
-	requestURL := client.getRequestURL("me/drive/root:/" + dst + ":/content")
+	requestURL := client.getRequestURL("root:/" + dst + ":/content")
 
 	res, err := client.request(ctx, "PUT", requestURL, body, request.WithContentLength(int64(size)),
 		request.WithTimeout(time.Duration(150)*time.Second),
@@ -383,7 +391,13 @@ func (client *Client) makeBatchDeleteRequestsBody(files []string) string {
 	}
 	for i, v := range files {
 		v = strings.TrimPrefix(v, "/")
-		filePath, _ := url.Parse("/me/drive/root:/")
+
+		urls := client.Endpoints.EndpointURL
+		comma := strings.Index(urls, "v1.0")
+		rurls := []rune(urls)
+		urls = string(rurls[comma+4:])
+
+		filePath, _ := url.Parse(urls + "root:/")
 		filePath.Path = path.Join(filePath.Path, v)
 		req.Requests[i] = BatchRequest{
 			ID:     v,
@@ -405,10 +419,10 @@ func (client *Client) GetThumbURL(ctx context.Context, dst string, w, h uint) (s
 	)
 	if client.Endpoints.isInChina {
 		cropOption = "large"
-		requestURL = client.getRequestURL("me/drive/root:/"+dst+":/thumbnails/0") + "/" + cropOption
+		requestURL = client.getRequestURL("root:/"+dst+":/thumbnails/0") + "/" + cropOption
 	} else {
 		cropOption = fmt.Sprintf("c%dx%d_Crop", w, h)
-		requestURL = client.getRequestURL("me/drive/root:/"+dst+":/thumbnails") + "?select=" + cropOption
+		requestURL = client.getRequestURL("root:/"+dst+":/thumbnails") + "?select=" + cropOption
 	}
 
 	res, err := client.requestWithStr(ctx, "GET", requestURL, "", 200)