Merge pull request #16 from mediamonks/feature/more-async-in-mm-preview

more async stats, Promise.all, big files load faster

Author: PabloCarreira

Diff for: src/index.js

@@ -7,6 +7,7 @@ const Filenames = require('./data/Filenames');
 const fs = require('fs-extra');
 const inquirer = require('inquirer');
 const path = require('path');
+const chalk = require('chalk')
 
 module.exports = async (options = {}, cli) => {
   const filepathRc = `./${Filenames.RC}`;
@@ -156,7 +157,9 @@ module.exports = async (options = {}, cli) => {
   await fs.writeJSON(filepathRc, data, {spaces: 2})
 
   // console.log(targetData)
+  const start = Date.now()
+
   await target.action(targetData);
 
-  console.log(`Done, Have a nice day.`);
-};
+  console.log(chalk.green(`Done in ${Date.now() - start}ms, Have a nice day!`));
+};

Diff for: src/target/mm-preview.js

@@ -69,40 +69,29 @@ const preview = {
 
     const allFiles = await globPromise(`${data.inputDir.replace(/\\/g, '/')}/**/*`);
 
-    const filesArray = allFiles
-      .filter((file) => fs.lstatSync(file).isFile())
-      .map((file) => {
-        return {
-          filePath: file,
-          s3Path: data.outputDir + path.relative(data.inputDir, file).replace(/\\/g, '/'),
-          contentType: mime.lookup(file),
-          content: fs.readFileSync(file),
-        };
-      });
+    const filesArray = (await Promise.all(allFiles.map(async file => {
+      if ((await fs.promises.lstat(file)).isFile()) {
+        return new PutObjectCommand({
+          Bucket: data.bucket,
+          Key: data.outputDir + path.relative(data.inputDir, file).replace(/\\/g, '/'),
+          ContentType: mime.lookup(file),
+          Body: await fs.promises.readFile(file),
+        })
+      }
+    })))
+    .filter(file => file !== undefined)
 
     const progressBar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
     progressBar.start(filesArray.length, 0);
 
     await Promise.all(
-      filesArray.map((file) => {
-        return new Promise(async (resolve) => {
-          const params = {
-            Bucket: data.bucket,
-            Key: file.s3Path,
-            Body: file.content,
-            ContentType: file.contentType,
-          };
-
-          try {
-            await client.send(new PutObjectCommand(params));
-            progressBar.increment();
-            resolve(data);
-          } catch (error) {
-            console.log(error);
-          } finally {
-            // finally.
-          }
-        });
+      filesArray.map(async file => {
+        try {
+          await client.send(file);
+        } catch (e) {
+          console.log(e);
+        }
+        progressBar.increment();
       }),
     );