Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/tar/file_stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class TarFileStream extends stream.Transform {
// stat file to get file size
fs.stat(opts.source, (err, stat) => {
if (err) return this.emit('error', err);
this.entry = pack.entry({ name: opts.relativePath || path.basename(opts.source), size: stat.size, mode: stat.mode & 0o777 }, err => {
this.entry = pack.entry({ name: opts.relativePath || path.basename(opts.source), size: stat.size, mode: stat.mode & 0o777, mtime: stat.mtime }, err => {
if (err) return this.emit('error', err);
pack.finalize();
});
Expand Down
2 changes: 1 addition & 1 deletion lib/tar/stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TarStream extends BaseStream {
// stat file to get file size
fs.stat(entry, (err, stat) => {
if (err) return this.emit('error', err);
const entryStream = this._pack.entry({ name: opts.relativePath || path.basename(entry), size: stat.size, mode: stat.mode & 0o777 }, this._onEntryFinish.bind(this));
const entryStream = this._pack.entry({ name: opts.relativePath || path.basename(entry), size: stat.size, mode: stat.mode & 0o777, mtime: stat.mtime }, this._onEntryFinish.bind(this));
const stream = fs.createReadStream(entry, opts.fs);
stream.on('error', err => this.emit('error', err));
stream.pipe(entryStream);
Expand Down
47 changes: 47 additions & 0 deletions test/tar/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,53 @@ describe('test/tar/index.test.js', () => {
assert(fs.existsSync(destFile));
});

it('tar.compressFile(file, destFile) keeps the modification time', async () => {
const sourceFile = path.join(os.tmpdir(), randomUUID() + '.txt');
const mtime = new Date('2020-01-02T03:04:05Z');
fs.writeFileSync(sourceFile, 'hi');
fs.utimesSync(sourceFile, mtime, mtime);
const destFile = path.join(os.tmpdir(), randomUUID() + '.tar');
await compressing.tar.compressFile(sourceFile, destFile);

const extract = require('tar-stream').extract();
let entryMtime;
extract.on('entry', (header, stream, next) => {
entryMtime = header.mtime;
stream.resume();
stream.on('end', next);
});
await new Promise((resolve, reject) => {
extract.on('finish', resolve);
extract.on('error', reject);
fs.createReadStream(destFile).pipe(extract);
});
assert.deepStrictEqual(entryMtime, mtime);
});

it('tar.compressDir(dir, destFile) keeps file modification times', async () => {
const sourceDir = path.join(os.tmpdir(), randomUUID());
fs.mkdirSync(sourceDir);
const mtime = new Date('2020-01-02T03:04:05Z');
fs.writeFileSync(path.join(sourceDir, 'a.txt'), 'hi');
fs.utimesSync(path.join(sourceDir, 'a.txt'), mtime, mtime);
const destFile = path.join(os.tmpdir(), randomUUID() + '.tar');
await compressing.tar.compressDir(sourceDir, destFile);

const mtimes = {};
const extract = require('tar-stream').extract();
extract.on('entry', (header, stream, next) => {
mtimes[header.name] = header.mtime;
stream.resume();
stream.on('end', next);
});
await new Promise((resolve, reject) => {
extract.on('finish', resolve);
extract.on('error', reject);
fs.createReadStream(destFile).pipe(extract);
});
assert.deepStrictEqual(mtimes[path.basename(sourceDir) + '/a.txt'], mtime);
});

it('tar.compressDir(dir, destStream) should return promise', async () => {
const sourceDir = path.join(__dirname, '..', 'fixtures');
const destFile = path.join(os.tmpdir(), randomUUID() + '.tar');
Expand Down