From 8c793254780235d39a2fc8d8620431e93666fbd5 Mon Sep 17 00:00:00 2001 From: JP Richardson Date: Sat, 27 Jun 2015 08:16:11 -0500 Subject: [PATCH] lib/util/utimes: create hasMillisRes() (async) --- lib/util/__tests__/utimes.test.js | 4 ++-- lib/util/utimes.js | 29 ++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/lib/util/__tests__/utimes.test.js b/lib/util/__tests__/utimes.test.js index 80bc6e0..aee9ca2 100644 --- a/lib/util/__tests__/utimes.test.js +++ b/lib/util/__tests__/utimes.test.js @@ -19,9 +19,9 @@ describe('utimes', function () { fse.emptyDir(TEST_DIR, done) }) - describe('hasMillisRes()', function () { + describe('hasMillisResSync()', function () { it('should return a boolean indicating whether it has support', function () { - var res = utimes.hasMillisRes() + var res = utimes.hasMillisResSync() assert.equal(typeof res, 'boolean') // HFS => false diff --git a/lib/util/utimes.js b/lib/util/utimes.js index 98ddd93..248cebc 100644 --- a/lib/util/utimes.js +++ b/lib/util/utimes.js @@ -1,13 +1,13 @@ var fs = require('graceful-fs') var path = require('path') -var HAS_MILLIS_RES = hasMillisRes() +var HAS_MILLIS_RES = hasMillisResSync() // HFS, ext{2,3}, FAT do not, Node.js v0.10 does not -function hasMillisRes () { +function hasMillisResSync () { // 550 millis past UNIX epoch var d = new Date(1435410243862) - var tmpfile = path.join(require('os').tmpdir(), 'millis-test') + var tmpfile = path.join(require('os').tmpdir(), 'millis-test-sync') fs.writeFileSync(tmpfile, 'https://github.com/jprichardson/node-fs-extra/pull/141') var fd = fs.openSync(tmpfile, 'r+') fs.futimesSync(fd, d, d) @@ -15,6 +15,28 @@ function hasMillisRes () { return fs.statSync(tmpfile).mtime > 1435410243000 } +function hasMillisRes (callback) { + // 550 millis past UNIX epoch + var d = new Date(1435410243862) + var tmpfile = path.join(require('os').tmpdir(), 'millis-test') + fs.writeFile(tmpfile, 'https://github.com/jprichardson/node-fs-extra/pull/141', function (err) { + if (err) return callback(err) + fs.open(tmpfile, 'r+', function (err, fd) { + if (err) return callback(err) + fs.futimes(fd, d, d, function (err) { + if (err) return callback(err) + fs.close(fd, function (err) { + if (err) return callback(err) + fs.stat(tmpfile, function (err, stats) { + if (err) return callback(err) + callback(null, stats.mtime > 1435410243000) + }) + }) + }) + }) + }) +} + function timeRemoveMillis (timestamp) { if (typeof timestamp === 'number') { return Math.floor(timestamp / 1000) * 1000 @@ -38,6 +60,7 @@ function utimesMillis (path, atime, mtime, callback) { module.exports = { hasMillisRes: hasMillisRes, + hasMillisResSync: hasMillisResSync, timeRemoveMillis: timeRemoveMillis, utimesMillis: utimesMillis, HAS_MILLIS_RES: HAS_MILLIS_RES