coolaj86/desirae.js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bugfix fs

Browse Source
This commit is contained in:
AJ ONeal 2020-11-08 21:04:35 -07:00
parent d70e660a79
commit 3700c525ae
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/node-adapters/fsapi.js
View File

@ -98,7 +98,7 @@ function walkDir(parent, sub, opts) {
// TODO stream sha1 (for assets) // TODO stream sha1 (for assets)
return fs return fs
.readFileAsync(path.join(root, stat.name), null) .readFile(path.join(root, stat.name), null)
.then(function (buffer) { .then(function (buffer) {
var contents = buffer.toString("utf8"); var contents = buffer.toString("utf8");
file.sha1 = sha1sum(contents); file.sha1 = sha1sum(contents);
@ -144,7 +144,7 @@ function getfs(blogdir, filepaths) {
return forEachAsync(filepaths, function (filepath) { return forEachAsync(filepaths, function (filepath) {
var pathname = safeResolve(blogdir, filepath); var pathname = safeResolve(blogdir, filepath);
return fs return fs
.lstatAsync(pathname) .lstat(pathname)
.then(function (stat) { .then(function (stat) {
return fs.readFile(pathname, null).then(function (buffer) { return fs.readFile(pathname, null).then(function (buffer) {
files.push({ files.push({
@ -304,13 +304,9 @@ function putfs(blogdir, files, options) {
return forEachAsync(files, function (file) { return forEachAsync(files, function (file) {
// TODO use lastModifiedDate as per client request? // TODO use lastModifiedDate as per client request?
// TODO compare sha1 sums for integrity // TODO compare sha1 sums for integrity
// NOTE existsAsync is backwards
return fs return fs
.existsAsync(file.realPath) .access(file.realPath)
.then(function () { .then(function () {
return fs.writeFile(file.realPath, file.contents, "utf8");
})
.catch(function (/*exists*/) {
if (file.delete || !file.contents) { if (file.delete || !file.contents) {
return fs.unlink(file.realPath); return fs.unlink(file.realPath);
} }
@ -321,6 +317,9 @@ function putfs(blogdir, files, options) {
return fs.writeFile(file.realPath, file.contents, "utf8"); return fs.writeFile(file.realPath, file.contents, "utf8");
}) })
.catch(function () {
return fs.writeFile(file.realPath, file.contents, "utf8");
})
.catch(function (e) { .catch(function (e) {
putfsResults.errors.push({ putfsResults.errors.push({
type: "file", type: "file",