fix: Switch to duplexify (#49)

philipjscott · May 12, 2019 · b3b1a09 · b3b1a09
1 parent bbe0076
commit b3b1a09
Show file tree

Hide file tree

Showing 6 changed files with 331 additions and 2,200 deletions.
diff --git a/index.js b/index.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { spawn } = require('child_process')
-const { Duplex } = require('stream')
+const duplexify = require('duplexify')
 
 /**
  * Parse a size string (eg. '240x?')
@@ -125,28 +125,6 @@ function ffmpegStreamExecute (path, args, rstream) {
   return Promise.resolve(ffmpeg.stdout)
 }
 
-class DuplexFfmpeg extends Duplex {
-  constructor (ffmpeg) {
-    super()
-    this.ffmpeg = ffmpeg
-  }
-
-  _read (size) {
-    this.ffmpeg.stdout.on('data', data => {
-      this.push(data)
-    })
-  }
-
-  _write (...args) {
-    this.ffmpeg.on('close', () => {
-      this.end()
-    })
-    this.ffmpeg.stdin._write(...args)
-  }
-
-  _final () {}
-}
-
 /**
  * Return a duplex stream
  * @func    ffmpegDuplexExecute
@@ -158,7 +136,7 @@ class DuplexFfmpeg extends Duplex {
 function ffmpegDuplexExecute (path, args) {
   const ffmpeg = spawn(path, args, { shell: true })
 
-  return new DuplexFfmpeg(ffmpeg)
+  return duplexify(ffmpeg.stdin, ffmpeg.stdout)
 }
 
 /**
@@ -187,7 +165,6 @@ function genThumbnail (input, output, size, config = {}) {
   )
 
   if (input === null && output === null) {
-    console.log(args)
     return ffmpegDuplexExecute(ffmpegPath, args)
   }
   if (output === null) {