feat: 分片时输出提示

shsgear · shsgear · commit d6928a601feb · 2021-01-18T21:29:17.000+08:00
diff --git a/bin/index.js b/bin/index.js
@@ -115,15 +115,17 @@ const upload = async (filePath, parts = []) =>{
 
 
 
- const merge = async () =>
- await _mergeAllChunks(requestUrl,{
+ const merge = async () =>{
+ console.log(chalk.cyan('正在合并分片，请稍等...'))
+ return await _mergeAllChunks(requestUrl,{
 version,
 uploadId,
 fileSize,
 fileTag: md5
 },{
 Authorization
 });
+ }
 
 
 try{
diff --git a/lib/withRetry.js b/lib/withRetry.js
@@ -16,7 +16,7 @@ const withRetry = (fn, retryCount, retryDelay) => new Promise((resolve, reject)
 .catch((err) =>{
 if (retryCount > 0){
 logger.error(err);
- console.log(chalk.cyan('遇到了一个小问题，重试中...'))
+ console.log(chalk.red('合并分片遇到了一个小问题，重试中...'))
 return delay(retryDelay)
 .then(withRetry.bind(null, fn, retryCount - 1, retryDelay))
 .then(resolve)

-Original file line number
+Diff line change
 .catch((err)=>{
 if(retryCount>0){
 logger.error(err);
 -console.log(chalk.cyan('遇到了一个小问题，重试中...'))
 +console.log(chalk.red('合并分片遇到了一个小问题，重试中...'))
 returndelay(retryDelay)
 .then(withRetry.bind(null,fn,retryCount-1,retryDelay))
 .then(resolve)