Skip to content

Escaping input and output paths using double quotes #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iaincollins wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Escaping input and output paths using double quotes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f0d833
Escaping input and output paths with double quotes
iaincollins Nov 20, 2014
5c06b2f
Escaping file input path when parsing for metadata
iaincollins Nov 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/ffmpeg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ var ffmpeg = function (/* inputFilepath, settings, callback */) {
* Get the video info
*/
var _videoInfo = function (fileInput, settings) {
fileInput = '"'+fileInput+'"';
// New 'promise' instance
var deferred = when.defer();
// Make the call to retrieve information about the ffmpeg
Expand Down Expand Up @@ -248,4 +249,4 @@ var ffmpeg = function (/* inputFilepath, settings, callback */) {
return __constructor.call(this, arguments);
};

module.exports = ffmpeg;
module.exports = ffmpeg;
6 changes: 5 additions & 1 deletion lib/video.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module.exports = function (filePath, settings, infoConfiguration, infoFile) {
* Set the output path
*/
var setOutput = function (path) {
output = path;
output = '"'+path+'"';
}

/*********************/
Expand Down Expand Up @@ -546,6 +546,10 @@ module.exports = function (filePath, settings, infoConfiguration, infoFile) {
* Executing the commands list
*/
var execCommand = function (callback, folder) {
// Surround input paths to files with quotes to escape them
inputs.forEach(function(input, index) {
inputs[index] = '"'+input+'"';
});
// Checking if folder is defined
var onlyDestinationFile = folder != undefined ? false : true;
// Building the value for return value. Check if the callback is not a function. In this case will created a new instance of the deferred class
Expand Down