tips optimization

Author: chhpt

lib/commands/storage.js

@@ -33,15 +33,16 @@ commander_1.default
         throw new error_1.CloudBaseError('文件未找到！');
     }
     const isDir = fs_1.default.statSync(resolveLocalPath).isDirectory();
-    let cancelLoading = utils_1.loading('上传文件中');
+    const fileText = isDir ? '文件夹' : '文件';
+    let cancelLoading = utils_1.loading(`上传${fileText}中`);
     if (isDir) {
         await storageService.uploadDirectory(resolveLocalPath, cloudPath);
     }
     else {
         await storageService.uploadFile(resolveLocalPath, cloudPath);
     }
     cancelLoading();
-    logger_1.successLog('上传文件成功！');
+    logger_1.successLog(`上传${fileText}成功！`);
 });
 commander_1.default
     .command('storage:download <cloudPath> <localPath> [envId]')
@@ -53,18 +54,19 @@ commander_1.default
     const storageService = await getStorageService(assignEnvId);
     const resolveLocalPath = path_1.default.resolve(localPath);
     const { dir } = options;
+    const fileText = dir ? '文件夹' : '文件';
     if (dir && !fs_1.default.existsSync(resolveLocalPath)) {
         throw new error_1.CloudBaseError('存储文件夹不存在！');
     }
-    let cancelLoading = utils_1.loading('下载文件中');
+    const cancelLoading = utils_1.loading(`下载${fileText}中`);
     if (dir) {
         await storageService.downloadDirectory(cloudPath, resolveLocalPath);
     }
     else {
         await storageService.downloadFile(cloudPath, resolveLocalPath);
     }
     cancelLoading();
-    logger_1.successLog('下载文件成功！');
+    logger_1.successLog(`下载${fileText}成功！`);
 });
 commander_1.default
     .command('storage:delete <cloudPath> [envId]')
@@ -75,13 +77,16 @@ commander_1.default
     const assignEnvId = await utils_1.getEnvId(envId, configFile);
     const storageService = await getStorageService(assignEnvId);
     const { dir } = options;
+    const fileText = dir ? '文件夹' : '文件';
+    const cancelLoading = utils_1.loading(`删除${fileText}中`);
     if (dir) {
         await storageService.deleteDirectory(cloudPath);
     }
     else {
         await storageService.deleteFile([cloudPath]);
     }
-    logger_1.successLog('删除文件成功！');
+    cancelLoading();
+    logger_1.successLog(`删除${fileText}成功！`);
 });
 commander_1.default
     .command('storage:list <cloudPath> [envId]')
@@ -138,7 +143,7 @@ commander_1.default
     const assignEnvId = await utils_1.getEnvId(envId, configFile);
     const storageService = await getStorageService(assignEnvId);
     const acl = await storageService.getStorageAcl();
-    console.log(acl);
+    console.log(`权限类型：${acl}`);
 });
 commander_1.default
     .command('storage:set-acl <acl> [envId]')
@@ -152,4 +157,5 @@ commander_1.default
     const assignEnvId = await utils_1.getEnvId(envId, configFile);
     const storageService = await getStorageService(assignEnvId);
     await storageService.setStorageAcl(acl);
+    logger_1.successLog('设置存储权限成功！');
 });

src/commands/storage.ts

@@ -38,14 +38,15 @@ program
         }
 
         const isDir = fs.statSync(resolveLocalPath).isDirectory()
-        let cancelLoading = loading('上传文件中')
+        const fileText = isDir ? '文件夹' : '文件'
+        let cancelLoading = loading(`上传${fileText}中`)
         if (isDir) {
             await storageService.uploadDirectory(resolveLocalPath, cloudPath)
         } else {
             await storageService.uploadFile(resolveLocalPath, cloudPath)
         }
         cancelLoading()
-        successLog('上传文件成功！')
+        successLog(`上传${fileText}成功！`)
     })
 
 program
@@ -64,11 +65,13 @@ program
         const resolveLocalPath = path.resolve(localPath)
 
         const { dir } = options
+        const fileText = dir ? '文件夹' : '文件'
+
         if (dir && !fs.existsSync(resolveLocalPath)) {
             throw new CloudBaseError('存储文件夹不存在！')
         }
 
-        let cancelLoading = loading('下载文件中')
+        const cancelLoading = loading(`下载${fileText}中`)
 
         if (dir) {
             await storageService.downloadDirectory(cloudPath, resolveLocalPath)
@@ -77,7 +80,7 @@ program
         }
 
         cancelLoading()
-        successLog('下载文件成功！')
+        successLog(`下载${fileText}成功！`)
     })
 
 program
@@ -90,14 +93,17 @@ program
         const storageService = await getStorageService(assignEnvId)
 
         const { dir } = options
+        const fileText = dir ? '文件夹' : '文件'
+        const cancelLoading = loading(`删除${fileText}中`)
 
         if (dir) {
             await storageService.deleteDirectory(cloudPath)
         } else {
             await storageService.deleteFile([cloudPath])
         }
 
-        successLog('删除文件成功！')
+        cancelLoading()
+        successLog(`删除${fileText}成功！`)
     })
 
 program
@@ -167,7 +173,7 @@ program
 
         const acl = await storageService.getStorageAcl()
 
-        console.log(acl)
+        console.log(`权限类型：${acl}`)
     })
 
 program
@@ -189,4 +195,5 @@ program
         const storageService = await getStorageService(assignEnvId)
 
         await storageService.setStorageAcl(acl)
+        successLog('设置存储权限成功！')
     })