Adding cwd option

fluent-ffmpeg · Sep 1, 2015 · 0df5873 · 0df5873
1 parent b1ec497
commit 0df5873
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/lib/processor.js b/lib/processor.js
@@ -81,6 +81,7 @@ module.exports = function(proto) {
    *
    * The 'options' argument may contain the following keys:
    * - 'niceness': specify process niceness, ignored on Windows (default: 0)
+   * - `cwd`: change working directory
    * - 'captureStdout': capture stdout and pass it to 'endCB' as its 2nd argument (default: false)
    * - 'captureStderr': capture stderr and pass it to 'endCB' as its 3rd argument (default: false)
    *
@@ -428,7 +429,10 @@ module.exports = function(proto) {
       self._spawnFfmpeg(
         args,
 
-        { niceness: self.options.niceness },
+        {
+          niceness: self.options.niceness,
+          cwd: self.options.cwd
+        },
 
         function processCB(ffmpegProc) {
           self.ffmpegProc = ffmpegProc;

diff --git a/test/processor.test.js b/test/processor.test.js
@@ -55,13 +55,15 @@ describe('Processor', function() {
   // check prerequisites once before all tests
   before(function prerequisites(done) {
     // check for ffmpeg installation
-    this.testfile = path.join(__dirname, 'assets', 'testvideo-43.avi');
-    this.testfilewide = path.join(__dirname, 'assets', 'testvideo-169.avi');
-    this.testfilebig = path.join(__dirname, 'assets', 'testvideo-5m.mpg');
-    this.testfilespecial = path.join(__dirname, 'assets', 'te[s]t_ video \' _ .flv');
-    this.testfileaudio1 = path.join(__dirname, 'assets', 'testaudio-one.wav');
-    this.testfileaudio2 = path.join(__dirname, 'assets', 'testaudio-two.wav');
-    this.testfileaudio3 = path.join(__dirname, 'assets', 'testaudio-three.wav');
+    this.testdir = path.join(__dirname, 'assets');
+    this.testfileName = 'testvideo-43.avi';
+    this.testfile = path.join(this.testdir, this.testfileName);
+    this.testfilewide = path.join(this.testdir, 'testvideo-169.avi');
+    this.testfilebig = path.join(this.testdir, 'testvideo-5m.mpg');
+    this.testfilespecial = path.join(this.testdir, 'te[s]t_ video \' _ .flv');
+    this.testfileaudio1 = path.join(this.testdir, 'testaudio-one.wav');
+    this.testfileaudio2 = path.join(this.testdir, 'testaudio-two.wav');
+    this.testfileaudio3 = path.join(this.testdir, 'testaudio-three.wav');
 
     var self = this;
 
@@ -233,6 +235,22 @@ describe('Processor', function() {
           .saveToFile(testFile);
     });
 
+    it('should change the working directory', function(done) {
+      var testFile = path.join(this.testdir, 'testvideo.flv');
+      this.files.push(testFile);
+
+      this.getCommand({ source: this.testfileName, logger: testhelper.logger, cwd: this.testdir })
+        .usingPreset('flashvideo')
+        .on('error', function(err, stdout, stderr) {
+          testhelper.logError(err, stdout, stderr);
+          assert.ok(!err);
+        })
+        .on('end', function() {
+          done();
+        })
+        .saveToFile(testFile);
+    });
+
     it('should kill the process on timeout', function(done) {
       var testFile = path.join(__dirname, 'assets', 'testProcessKillTimeout.flv');
       this.files.push(testFile);