Skip to content
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

Added option to follow symlinks #361

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

Added option to follow symlinks #361

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a005171
Added option to follow symlinks
marcesengel Jan 8, 2019
5ebc795
Fixed filepath generation for linked files when following symlinks
marcesengel Jan 8, 2019
063583b
Added recursive statTasks to be able to properly handle symlinked dir…
marcesengel Jan 8, 2019
295d552
Added missing semicolon
marcesengel Jan 8, 2019
19be2a4
Fixed entire paths of resolved symlinked files beeing put into the ar…
marcesengel Jan 8, 2019
2d69a8f
Fixed detection of symlinked directories when following symlinks
marcesengel Jan 8, 2019
35d40e0
Switched from arrow functions to normal functions with bind
marcesengel Jan 14, 2019
aec7f3b
Added missing semicolon
marcesengel Jan 14, 2019
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
50 changes: 43 additions & 7 deletions lib/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ var Archiver = function(format, options) {
this._module = false;
this._pending = 0;
this._pointer = 0;
this._followSymlinks = options.followSymlinks;

this._entriesCount = 0;
this._entriesProcessedCount = 0;
Expand Down Expand Up @@ -91,12 +92,13 @@ Archiver.prototype._abort = function() {
* @param {EntryData} data The entry data.
* @return void
*/
Archiver.prototype._append = function(filepath, data) {
Archiver.prototype._append = function(filepath, data, recursive) {
data = data || {};

var task = {
source: null,
filepath: filepath
filepath: filepath,
recursive: recursive || false
};

if (!data.name) {
Expand Down Expand Up @@ -439,7 +441,34 @@ Archiver.prototype._onStatQueueTask = function(task, callback) {
this._queue.push(task);
}

setImmediate(callback);
if (task.recursive && task.data.type === 'directory') {
fs.readdir(task.filepath, function(err, files) {
if (this._state.aborted) {
setImmediate(callback);
return;
}

if (err) {
this.emit('warning', err);
setImmediate(callback);
return;
}

files.forEach(function(filename) {
if (filename === '.' || filename === '..') {
return;
}

this._append(path.join(task.filepath, filename), {
name: path.join(task.data.name, filename)
}, true);
}.bind(this));

setImmediate(callback);
}.bind(this));
} else {
setImmediate(callback);
}
}.bind(this));
};

Expand Down Expand Up @@ -493,10 +522,17 @@ Archiver.prototype._updateQueueTaskWithStats = function(task, stats) {
} else if (stats.isSymbolicLink() && this._moduleSupports('symlink')) {
var linkPath = fs.readlinkSync(task.filepath);
var dirName = path.dirname(task.filepath);
task.data.type = 'symlink';
task.data.linkname = path.relative(dirName, path.resolve(dirName, linkPath));
task.data.sourceType = 'buffer';
task.source = Buffer.concat([]);

if (this._followSymlinks) {
task.filepath = path.resolve(dirName, linkPath);
task.recursive = true;
return this._updateQueueTaskWithStats(task, fs.lstatSync(task.filepath));
} else {
task.data.type = 'symlink';
task.data.linkname = path.relative(dirName, path.resolve(dirName, linkPath));
task.data.sourceType = 'buffer';
task.source = Buffer.concat([]);
}
} else {
if (stats.isDirectory()) {
this.emit('warning', new ArchiverError('DIRECTORYNOTSUPPORTED', task.data));
Expand Down