chore: clean up postProcessRecording code (#7777)

cypress-io · Jun 22, 2020 · 6423b35 · 6423b35 · cypress-bot · Jun 22, 2020
1 parent bf752f1
commit 6423b35
Showing 1 changed file with 69 additions and 65 deletions.
diff --git a/packages/server/lib/modes/run.js b/packages/server/lib/modes/run.js
@@ -824,84 +824,88 @@ module.exports = {
       return
     }
 
-    const postProcessRecordingOutput = (name, videoCompression) => {
-      console.log('')
+    function continueProcessing (onProgress = undefined) {
+      return videoCapture.process(name, cname, videoCompression, onProgress)
+    }
 
-      terminal.header('Video', {
-        color: ['cyan'],
-      })
+    if (quiet) {
+      return continueProcessing()
+    }
 
-      console.log('')
+    console.log('')
 
-      const table = terminal.table({
-        colWidths: [3, 21, 76],
-        colAligns: ['left', 'left', 'left'],
-        type: 'noBorder',
-        style: {
-          'padding-right': 0,
-        },
-        chars: {
-          'left': ' ',
-          'right': '',
-        },
-      })
+    terminal.header('Video', {
+      color: ['cyan'],
+    })
 
-      table.push([
-        gray('-'),
-        gray('Started processing:'),
-        chalk.cyan(`Compressing to ${videoCompression} CRF`),
-      ])
+    console.log('')
 
-      console.log(table.toString())
-
-      const started = Date.now()
-      let progress = Date.now()
-      const throttle = env.get('VIDEO_COMPRESSION_THROTTLE') || human('10 seconds')
-
-      return function (float) {
-        if (float === 1) {
-          const finished = Date.now() - started
-          const dur = `(${humanTime.long(finished)})`
-
-          const table = terminal.table({
-            colWidths: [3, 21, 61, 15],
-            colAligns: ['left', 'left', 'left', 'right'],
-            type: 'noBorder',
-            style: {
-              'padding-right': 0,
-            },
-            chars: {
-              'left': ' ',
-              'right': '',
-            },
-          })
+    const table = terminal.table({
+      colWidths: [3, 21, 76],
+      colAligns: ['left', 'left', 'left'],
+      type: 'noBorder',
+      style: {
+        'padding-right': 0,
+      },
+      chars: {
+        'left': ' ',
+        'right': '',
+      },
+    })
 
-          table.push([
-            gray('-'),
-            gray('Finished processing:'),
-            `${formatPath(name, getWidth(table, 2), 'cyan')}`,
-            gray(dur),
-          ])
+    table.push([
+      gray('-'),
+      gray('Started processing:'),
+      chalk.cyan(`Compressing to ${videoCompression} CRF`),
+    ])
 
-          console.log(table.toString())
+    console.log(table.toString())
 
-          console.log('')
-        }
+    const started = Date.now()
+    let progress = Date.now()
+    const throttle = env.get('VIDEO_COMPRESSION_THROTTLE') || human('10 seconds')
 
-        if (Date.now() - progress > throttle) {
-          // bump up the progress so we dont
-          // continuously get notifications
-          progress += throttle
-          const percentage = `${Math.ceil(float * 100)}%`
+    const onProgress = function (float) {
+      if (float === 1) {
+        const finished = Date.now() - started
+        const dur = `(${humanTime.long(finished)})`
 
-          console.log('    Compression progress: ', chalk.cyan(percentage))
-        }
+        const table = terminal.table({
+          colWidths: [3, 21, 61, 15],
+          colAligns: ['left', 'left', 'left', 'right'],
+          type: 'noBorder',
+          style: {
+            'padding-right': 0,
+          },
+          chars: {
+            'left': ' ',
+            'right': '',
+          },
+        })
+
+        table.push([
+          gray('-'),
+          gray('Finished processing:'),
+          `${formatPath(name, getWidth(table, 2), 'cyan')}`,
+          gray(dur),
+        ])
+
+        console.log(table.toString())
+
+        console.log('')
       }
-    }
 
-    const onProgress = quiet ? undefined : postProcessRecordingOutput(name, videoCompression)
+      if (Date.now() - progress > throttle) {
+        // bump up the progress so we dont
+        // continuously get notifications
+        progress += throttle
+        const percentage = `${Math.ceil(float * 100)}%`
+
+        console.log('    Compression progress: ', chalk.cyan(percentage))
+      }
+    }
 
-    return videoCapture.process(name, cname, videoCompression, onProgress)
+    return continueProcessing(onProgress)
   },
 
   launchBrowser (options = {}) {