解决多线程上传引起的授权失败问题

Author: gaowanliang

.gitignore

@@ -6,4 +6,5 @@ dist
 .idea
 info
 *.json
-*.exe
+*.exe
+od

Readme.md

@@ -4,7 +4,7 @@
 
 
 - 支持 国际版, 个人版(家庭版), ~~中国版(世纪互联)~~.
-- ~~支持上传文件和文件夹到指定目录,并保持上传前的目录结构.~~
+- ~~支持上传文件和文件夹到指定目录,并~~ 保持上传前的目录结构.
 - 支持命令参数使用, 方便外部程序调用.
 - 支持自定义上传分块大小.
 - 支持多线程上传(多文件同时上传).
@@ -36,7 +36,7 @@ OneDriveUploader -a "url" -v 2
 ```
 
 ## 使用
-```bash
+```
 Usage of OneDriveUploader:
   -a string
         // 初始化授权
@@ -78,10 +78,16 @@ Usage of OneDriveUploader:
         // 跳过上传网盘中已存在的同名文件. (默认不跳过)
         Skip exist file on remote.
 
+  -tgbot string
+        //使用Telegram机器人实时监控上传，此处需填写机器人的access token，形如123456789:xxxxxxxxx，输入时需使用双引号包裹
+  -uid string
+        // 使用Telegram机器人实时监控上传，此处需填写接收人的userID，形如123456789
+  -v int
+        // 选择版本，其中0为国际版，1为个人版(家庭版)，默认为0
 ```
 
 ## 配置
-```json
+```jsonc
 {
     // 授权令牌
     "RefreshToken": "1234564567890ABCDEF",
@@ -118,7 +124,7 @@ OneDriveUploader -c xxx.json -s "Download" -r "Test"
 OneDriveUploader -c xxx.json -t 10 -s "Download" 
 
 # 将同目录下的 Download 文件夹上传到 OneDrive 网盘根目录中, 使用 10 线程，同时使用 Telegram Bot 实时监控上传进度
-OneDriveUploader -c xxx.json -t 10 -s "Download" -tgbot "bot123456:xxxxxxxx" -uid 123456789
+OneDriveUploader -c xxx.json -t 10 -s "Download" -tgbot "123456:xxxxxxxx" -uid 123456789
 
 # 将同目录下的 Download 文件夹上传到 OneDrive 网盘根目录中, 使用 15 线程, 并设置分块大小为 20M
 OneDriveUploader -c xxx.json -t 15 -b 20 -s "Download" 

api/restore/upload/onedriveRecoverableRestore.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
-	"net/http"
 	"main/fileutil"
+	"net/http"
 	"runtime/debug"
 	"strconv"
 	"time"
@@ -16,11 +16,11 @@ const (
 	uploadURLKey      = "uploadUrl"
 )
 
-func (rs *RestoreService) recoverableUpload(userID string, bearerToken string, conflictOption string, filePath string, fileInfo fileutil.FileInfo, sendMsg func(text string), locText func(text string) string, username string) ([]map[string]interface{}, error) {
+func (rs *RestoreService) recoverableUpload(userID string, bearerToken string, conflictOption string, filePath string, fileInfo fileutil.FileInfo, sendMsg func(text string), locText func(text string) string, username string) []map[string]interface{} {
 	//1. Get recoverable upload session for the current file path 获取当前文件路径的可压缩上载会话
 	uploadSessionData, err := rs.getUploadSession(userID, bearerToken, conflictOption, filePath)
 	if err != nil {
-		return nil, err
+		log.Panicf("Failed to Restore :%v", err)
 	}
 
 	//2. Get the upload url returned as a response from the recoverable upload session above. 从上面的可压缩上载会话获取作为响应返回的上载url。
@@ -29,7 +29,7 @@ func (rs *RestoreService) recoverableUpload(userID string, bearerToken string, c
 	//3. Get the startOffset list for the file 获取文件的startOffset列表
 	startOffsetLst, err := fileutil.GetFileOffsetStash(filePath)
 	if err != nil {
-		return nil, err
+		log.Panicf("Failed to Restore :%v", err)
 	}
 
 	//4. Loop over the file start offset list to read files in chunk and upload in onedrive 在文件开始偏移量列表上循环以读取块中的文件并在onedrive中上载
@@ -52,20 +52,20 @@ func (rs *RestoreService) recoverableUpload(userID string, bearerToken string, c
 		//4a. Get the bytes for the file based on the offset 根据偏移量获取文件的字节数
 		err := fileutil.GetFilePartInBytes(filePartInBytes, filePath, sOffset)
 		if err != nil {
-			return nil, err
+			log.Panicf("Failed to Restore :%v", err)
 		}
 		if i != 0 {
-			sendMsg(fmt.Sprintf("正在向OneDrive账户 `%s` 上传 `%s` *『%d/%d』*  速度:`%s/s` 已耗时: `%d s`", username, filePath, i, len(startOffsetLst), byte2Readable(float64(fileutil.GetDefaultChunkSize())/float64(time.Now().UnixNano()-timeUnix)*float64(1000000000)), time.Now().Unix()-startTime))
+			sendMsg(fmt.Sprintf("正在向OneDrive账户 `%s` 上传 `%s` *『%d/%d』*  \n速度:`%s/s` \n已耗时: `%d s`", username, filePath, i, len(startOffsetLst), byte2Readable(float64(fileutil.GetDefaultChunkSize())/float64(time.Now().UnixNano()-timeUnix)*float64(1000000000)), time.Now().Unix()-startTime))
 		} else {
-			sendMsg(fmt.Sprintf("正在向OneDrive账户 `%s` 上传 `%s` *『%d/%d』*  速度:`----` 已耗时: `%d s`", username, filePath, i, len(startOffsetLst), time.Now().Unix()-startTime))
+			sendMsg(fmt.Sprintf("正在向OneDrive账户 `%s` 上传 `%s` *『%d/%d』*  \n速度:`----` \n已耗时: `%d s`", username, filePath, i, len(startOffsetLst), time.Now().Unix()-startTime))
 		}
 
 		timeUnix = time.Now().UnixNano()
 		//3b. make a call to the upload url with the file part based on the offset. 使用基于偏移量的文件部分调用上载url。
 		resp, err := rs.uploadFilePart(uploadURL, filePath, bearerToken, *filePartInBytes, sOffset, isLastChunk)
 
 		if err != nil {
-			return nil, err
+			log.Panicf("Failed to Restore :%v", err)
 		}
 		respMap := make(map[string]interface{})
 		err = json.NewDecoder(resp.Body).Decode(&respMap)
@@ -80,7 +80,7 @@ func (rs *RestoreService) recoverableUpload(userID string, bearerToken string, c
 		debug.FreeOSMemory()
 	}
 	sendMsg("close")
-	return uploadResp, nil
+	return uploadResp
 }
 
 //Returns the restore session url for part file upload

api/restore/upload/onedriveRestore.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
-	"net/http"
-	"net/url"
 	"main/fileutil"
 	httpLocal "main/graph/net/http"
+	"net/http"
+	"net/url"
 )
 
 const (
@@ -35,21 +35,20 @@ type RestoreService struct {
 //@bearerToken will be extracted as sent from the restore input xml
 //@filePath will be extracted from the file hierarchy the needs to be restored
 //@fileInfo it is the file info struct that contains the actual file reference and the size_type
-func (rs *RestoreService) SimpleUploadToOriginalLoc(userId string, bearerToken string, conflictOption string, filePath string, fileInfo fileutil.FileInfo, sendMsg func(text string), locText func(text string) string, username string) (interface{}, error) {
+func (rs *RestoreService) SimpleUploadToOriginalLoc(userId string, bearerToken string, conflictOption string, filePath string, fileInfo fileutil.FileInfo, sendMsg func(text string), locText func(text string) string, username string) interface{} {
 	if fileInfo.SizeType == fileutil.SizeTypeLarge {
 		//For Large file type use resemble onedrive upload API
 		//log.Printf("Processing Large File: %s", filePath)
 		sendMsg(fmt.Sprintf("文件: `%s` 开始上传至OneDrive\n账户:`%s`\n文件超过4MB，进入大文件通道", filePath, username))
 		return rs.recoverableUpload(userId, bearerToken, conflictOption, filePath, fileInfo, sendMsg, locText, username)
 	} else {
 		//log.Printf("Processing Small File: %s", filePath)
-		sendMsg(fmt.Sprintf("文件: `%s` 开始上传至OneDrive\n账户:`%s`\n文件小于4MB，进入小文件通道，上传中......", filePath, username))
+		sendMsg(fmt.Sprintf("文件: `%s` 开始上传至OneDrive\n账户:`%s`\n文件小于4MB，进入小文件通道，上传中", filePath, username))
 		uploadPath := fmt.Sprintf(simpleUploadPath, userId, filePath)
 		req, err := rs.NewRequest("PUT", uploadPath, getSimpleUploadHeader(bearerToken), fileInfo.FileData)
 		if err != nil {
-			return nil, err
+			log.Panicf("Failed to Restore :%v", err)
 		}
-
 		//Handle query parameter for conflict resolution
 		//The different values for @microsoft.graph.conflictBehavior= rename|replace|fail
 		q := url.Values{}
@@ -59,8 +58,7 @@ func (rs *RestoreService) SimpleUploadToOriginalLoc(userId string, bearerToken s
 		//Execute the request
 		resp, err := rs.Do(req)
 		if err != nil {
-			//Need to return a generic object from onedrive upload instead of response directly
-			return nil, err
+			log.Panicf("Failed to Restore :%v", err)
 		}
 		if resp.Body != nil {
 			defer resp.Body.Close()
@@ -69,10 +67,10 @@ func (rs *RestoreService) SimpleUploadToOriginalLoc(userId string, bearerToken s
 		respMap := make(map[string]interface{})
 		err = json.NewDecoder(resp.Body).Decode(&respMap)
 		if err != nil {
-			return nil, err
+			log.Panicf("Failed to Restore :%v", err)
 		}
 		sendMsg("close")
-		return respMap, nil
+		return respMap
 	}
 
 }
@@ -83,7 +81,7 @@ func (rs *RestoreService) SimpleUploadToOriginalLoc(userId string, bearerToken s
 //@userId will be extracted as sent from the restore input xml
 //@filePath will be extracted from the file hierarchy the needs to be restored
 //@fileInfo it is the file info struct that contains the actual file reference and the size_type
-func (rs *RestoreService) SimpleUploadToAlternateLoc(altUserId string, bearerToken string, conflictOption string, filePath string, fileInfo fileutil.FileInfo, sendMsg func(text string), locText func(text string) string, username string) (interface{}, error) {
+func (rs *RestoreService) SimpleUploadToAlternateLoc(altUserId string, bearerToken string, conflictOption string, filePath string, fileInfo fileutil.FileInfo, sendMsg func(text string), locText func(text string) string, username string) interface{} {
 	if fileInfo.SizeType == fileutil.SizeTypeLarge {
 		//For Large file type use resemble onedrive upload API
 		return rs.recoverableUpload(altUserId, bearerToken, conflictOption, filePath, fileInfo, sendMsg, locText, username)
@@ -92,9 +90,8 @@ func (rs *RestoreService) SimpleUploadToAlternateLoc(altUserId string, bearerTok
 		uploadPath := fmt.Sprintf(simpleUploadPath, altUserId, filePath)
 		req, err := rs.NewRequest("PUT", uploadPath, getSimpleUploadHeader(bearerToken), fileInfo.FileData)
 		if err != nil {
-			return nil, err
+			log.Panicf("Failed to Restore :%v", err)
 		}
-
 		//Handle query parameter for conflict resolution
 		//The different values for @microsoft.graph.conflictBehavior= rename|replace|fail
 		q := url.Values{}
@@ -104,8 +101,7 @@ func (rs *RestoreService) SimpleUploadToAlternateLoc(altUserId string, bearerTok
 		//Execute the request
 		resp, err := rs.Do(req)
 		if err != nil {
-			//Need to return a generic object from onedrive upload instead of response directly
-			return nil, err
+			log.Panicf("Failed to Restore :%v", err)
 		}
 		if resp.Body != nil {
 			defer resp.Body.Close()
@@ -114,9 +110,9 @@ func (rs *RestoreService) SimpleUploadToAlternateLoc(altUserId string, bearerTok
 		respMap := make(map[string]interface{})
 		err = json.NewDecoder(resp.Body).Decode(&respMap)
 		if err != nil {
-			return nil, err
+			log.Panicf("Failed to Restore :%v", err)
 		}
-		return respMap, nil
+		return respMap
 	}
 }