From 842a80d4930e3cb01d2da6b91708f4e1b1d266eb Mon Sep 17 00:00:00 2001 From: Ibby Date: Tue, 11 Oct 2016 20:10:47 -0400 Subject: [PATCH] fix(file): fix writeFile method addresses #464 #552 #666 --- src/plugins/file.ts | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/plugins/file.ts b/src/plugins/file.ts index 59c0ccea..9cb06758 100644 --- a/src/plugins/file.ts +++ b/src/plugins/file.ts @@ -674,22 +674,30 @@ export class File { if (replaceOrOptions) { if (typeof(replaceOrOptions) === 'boolean') { opts.replace = replaceOrOptions; + } else { + opts.replace = (replaceOrOptions).replace } } + let getFileOpts: Flags = { + create: true, + exclusive: opts.replace + }; + return File.resolveDirectoryUrl(path) .then((fse) => { - return File.getFile(fse, fileName, opts); + return File.getFile(fse, fileName, getFileOpts); }) .then((fe) => { return File.createWriter(fe); }) .then((writer) => { + if (opts.append) { writer.seek(writer.length); } - if (opts.hasOwnProperty('truncate')) { + if (opts.truncate) { writer.truncate(opts.truncate); } @@ -1018,9 +1026,7 @@ export class File { private static getFile(fse: DirectoryEntry, fn: string, flags: Flags): Promise { return new Promise((resolve, reject) => { try { - fse.getFile(fn, flags, (fe) => { - resolve(fe); - }, (err) => { + fse.getFile(fn, flags, resolve, (err) => { File.fillErrorMessage(err); reject(err); }); @@ -1123,12 +1129,12 @@ export class File { return this.writeFileInChunks(writer, gu); } - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { writer.onwriteend = (evt) => { if (writer.error) { reject(writer.error); } else { - resolve(); + resolve(evt); } }; writer.write(gu);