mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Return relative path from writeAttachmentData

Browse source 
This will make our app more robust to changes in location on the file system.
This commit is contained in:
Daniel Gasienica 2018-03-16 14:58:21 -04:00
parent 1262d1d696
commit 6355c54114
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/types/attachment/write_attachment_data.js
View file

@ -1,8 +1,8 @@
const crypto = require('crypto');
const FSE = require('fs-extra');
const fse = require('fs-extra');
const isArrayBuffer = require('lodash/isArrayBuffer');
const isString = require('lodash/isString');
const Path = require('path');
const path = require('path');
// _writeAttachmentData :: AttachmentsPath ->
@ -19,10 +19,11 @@ exports.writeAttachmentData = (root) => {
}
const buffer = Buffer.from(arrayBuffer);
const path = Path.join(root, exports._getAttachmentPath());
await FSE.ensureFile(path);
await FSE.writeFile(path, buffer);
return path;
const relativePath = exports._getAttachmentPath();
const absolutePath = path.join(root, relativePath);
await fse.ensureFile(absolutePath);
await fse.writeFile(absolutePath, buffer);
return relativePath;
};
};
@ -36,5 +37,5 @@ exports._getAttachmentName = () => {
exports._getAttachmentPath = () => {
const name = exports._getAttachmentName();
const prefix = name.slice(0, 2);
return Path.join(prefix, name);
return path.join(prefix, name);
};