使用 listr 来处理任务

Author: minosss

package.json

@@ -19,10 +19,10 @@
         "cheerio": "^1.0.0-rc.3",
         "download": "^7.1.0",
         "got": "^9.6.0",
+        "listr": "^0.14.3",
         "log-symbols": "^2.2.0",
         "lz-string": "^1.4.4",
         "meow": "^5.0.0",
-        "ora": "^3.4.0",
         "ow": "^0.12.0"
     },
     "keywords": [

source/amanga.js

@@ -1,55 +1,99 @@
 const download = require('download');
-const ora = require('ora');
+const Listr = require('listr');
+const {existsSync} = require('fs');
 
 module.exports = async (input, flags) => {
     const {type, outputDir} = flags;
-    const parser = require(`./lib/${type}`);
-    const spinner = ora(`Loading ${type}`).start();
-
-    const {title, images, options} = await parser(input, flags);
-
-    spinner.info(`Title: ${title}`);
-    spinner.info(`Images: ${images.length}`);
-
-    // 开启info的话只输出信息
-    if (!flags.info) {
-        for (const image of images) {
-            let url = image;
-            const imgOptions = {};
-            if (typeof image !== 'string') {
-                url = image.url;
-                if (image.name) {
-                    imgOptions.filename = image.name;
+
+    const tasks = new Listr([
+        {
+            title: '检查类型是否支持',
+            task: () => {
+                if (!existsSync(`${__dirname}/lib/${type}.js`)) {
+                    throw new Error(`${type} 类型不支持`);
                 }
             }
-
-            try {
-                spinner.start(`Downloading ${url}`);
-                await download(
-                    encodeURI(url),
-                    outputDir || `amanga/${type}/${title}`,
-                    {
-                        // 10s超时
-                        timeout: 10000,
-                        ...options,
-                        ...imgOptions
-                    }
-                ).on('downloadProgress', progress => {
-                    spinner.text = `(${
-                        progress.transferred
-                    }) Downloading ${url}`;
-                });
-                spinner.succeed(`Done ${url}`);
-            } catch (error) {
-                spinner.fail(`${error.message} ${url}`);
+        },
+        {
+            title: '获取数据',
+            task: async ctx => {
+                const parser = require(`./lib/${type}`);
+                const data = await parser(input, flags);
+                ctx.data = data;
             }
         }
+    ]);
+
+    if (flags.info) {
+        tasks.add({
+            title: '格式化数据',
+            task: ctx => {
+                const {title, images} = ctx.data;
+
+                const info = `
+    标题: ${title}
+    数量: ${images.length}
+    图片链接:
+    ${
+        typeof images[0] === 'string'
+            ? images.join('\n')
+            : images.map(img => img.url).join('\n')
+    }
+
+                `;
+
+                ctx.info = info;
+            }
+        });
     } else {
-        console.log();
-        console.dir({type, title, images});
-        console.log();
+        tasks.add({
+            title: '下载图片',
+            skip: () => flags.info,
+            task: async (ctx, task) => {
+                const {title, images, options} = ctx.data;
+
+                let count = 0;
+                task.title = `下载图片 [${count}/${images.length}]`;
+
+                for (const image of images) {
+                    let url = image;
+                    const imgOptions = {};
+                    if (typeof image !== 'string') {
+                        url = image.url;
+                        if (image.name) {
+                            imgOptions.filename = image.name;
+                        }
+                    }
+
+                    task.output = `下载 ${url}`;
+                    await download(
+                        encodeURI(url),
+                        outputDir || `amanga/${type}/${title}`,
+                        {
+                            // 10s
+                            timeout: 10000,
+                            ...options,
+                            ...imgOptions
+                        }
+                    ).on(
+                        'downloadProgress',
+                        ({transferred, total, percent}) => {
+                            task.output = `下载 ${url} [${transferred}/${total}]`;
+                            if (percent === 1) {
+                                task.title = `下载图片 [${(count += 1)}/${
+                                    images.length
+                                }]`;
+                            }
+                        }
+                    );
+                }
+            }
+        });
     }
 
-    spinner.info('All Done 🎉');
-    spinner.stop();
+    await tasks.run().then(ctx => {
+        if (ctx.info) {
+            console.log(ctx.info);
+        }
+    });
 };

source/cli.js

@@ -46,6 +46,8 @@ if (cli.input < 1 || !cli.flags.type) {
 // cli -> lib(parser) -> download -> done
 (async () => {
     await amanga(cli.input, cli.flags);
+
+    console.log(`\n${logSymbols.success} All Done 🎉`);
 })().catch(error => {
     console.error(`\n${logSymbols.error} ${error.message}`);
     process.exit(1);