sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#882

Browse Source
This commit is contained in:
syuilo
2017-11-07 21:04:32 +09:00
parent 307f0389ac
commit a85d5ac4bb
4 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/common/add-file-to-drive.ts
View File

@ -13,13 +13,13 @@ import { Duplex } from 'stream';
const log = debug('misskey:register-drive-file');
const addToGridFS = (name, binary, metadata): Promise<any> => new Promise(async (resolve, reject) => {
const addToGridFS = (name, binary, type, metadata): Promise<any> => new Promise(async (resolve, reject) => {
const dataStream = new Duplex();
dataStream.push(binary);
dataStream.push(null);
const bucket = await getGridFSBucket();
const writeStream = bucket.openUploadStream(name, { metadata });
const writeStream = bucket.openUploadStream(name, { contentType: type, metadata });
writeStream.once('finish', (doc) => { resolve(doc); });
writeStream.on('error', reject);
dataStream.pipe(writeStream);
@ -144,10 +144,9 @@ export default (
}
// Create DriveFile document
const file = await addToGridFS(name, data, {
const file = await addToGridFS(name, data, mime, {
user_id: user._id,
folder_id: folder !== null ? folder._id : null,
type: mime,
comment: comment,
properties: properties
});

1
src/api/serializers/drive-file.ts
View File

@ -48,6 +48,7 @@ export default (
_target.id = _file._id;
_target.created_at = _file.uploadDate;
_target.name = _file.filename;
_target.type = _file.contentType;
_target = Object.assign(_target, _file.metadata);