Auto-skip if file name does not match

gaowanliang · Apr 21, 2021 · 7ed62fa · 7ed62fa
1 parent ef6de77
commit 7ed62fa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/api/restore/upload/onedriveRecoverableRestore.go b/api/restore/upload/onedriveRecoverableRestore.go
@@ -22,7 +22,8 @@ func (rs *RestoreService) recoverableUpload(userID string, bearerToken string, c
 	//1. Get recoverable upload session for the current file path 获取当前文件路径的可压缩上载会话
 	uploadSessionData, err := rs.getUploadSession(userID, bearerToken, conflictOption, targetFolder, filePath)
 	if err != nil {
-		log.Panicf(locText("failToStore"), err)
+		sendMsg(fmt.Sprintf(locText("filenameFail"), filePath))
+		return nil
 	}
 
 	//2. Get the upload url returned as a response from the recoverable upload session above. 从上面的可压缩上载会话获取作为响应返回的上载url。

diff --git a/api/restore/upload/onedriveRestore.go b/api/restore/upload/onedriveRestore.go
@@ -99,7 +99,8 @@ func (rs *RestoreService) SimpleUploadToOriginalLoc(userId string, bearerToken s
 		}
 
 		if err != nil {
-			log.Panicf(locText("failToStore"), err)
+			sendMsg(fmt.Sprintf(locText("filenameFail"), filePath))
+			return nil
 		}
 		if resp.Body != nil {
 			defer resp.Body.Close()

diff --git a/i18n/en.toml b/i18n/en.toml
@@ -11,3 +11,4 @@ startToUpload = "`%s` start uploading, size:`%s`"
 startToUpload1 = "start uploading to onedrive"
 telegramSendError = "Telegram Send Error:%s"
 existSkip = "Already exists, auto skip"
+filenameFail="`%s` The file name has illegal characters and cannot be uploaded, please modify it and re-upload, it has been automatically skipped"
diff --git a/i18n/zh-CN.toml b/i18n/zh-CN.toml
@@ -11,3 +11,4 @@ startToUpload = "`%s` 开始上传，大小: `%s`"
 startToUpload1 = "开始上传至OneDrive"
 telegramSendError = "Telegram 发送错误:%s"
 existSkip = "已存在，自动跳过"
+filenameFail="`%s` 文件名有非法字符，无法上传，请修改后重新上传，已自动跳过"