graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 08:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

add-file-to-drive - 責務の分割とテンポラリファイルを削除するように

Browse source
This commit is contained in:
otofune 2017-11-14 05:10:28 +09:00
parent 51faa7a227
commit d8a3b4ff1d
1 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@ const addToGridFS = (name: string, readable: stream.Readable, type: string, meta
const addFile = async ( const addFile = async (
user: any, user: any,
file: string | stream.Readable, path: string,
name: string = null, name: string = null,
comment: string = null, comment: string = null,
folderId: mongodb.ObjectID = null, folderId: mongodb.ObjectID = null,
@ -42,30 +42,6 @@ const addFile = async (
) => { ) => {
log(`registering ${name} (user: ${user.username})`); log(`registering ${name} (user: ${user.username})`);
// Get file path
const path = await new Promise((res: (v: string) => void, rej) => {
if (typeof file === 'string') {
res(file);
return;
}
if (typeof file === 'object' && typeof file.read === 'function') {
tmpFile()
.then(path => {
const readable: stream.Readable = file;
const writable = fs.createWriteStream(path);
readable
.on('error', rej)
.on('end', () => {
res(path);
})
.pipe(writable)
.on('error', rej);
})
.catch(rej);
}
rej(new Error('un-compatible file.'));
});
// Calculate hash, get content type and get file size // Calculate hash, get content type and get file size
const [hash, [mime, ext], size] = await Promise.all([ const [hash, [mime, ext], size] = await Promise.all([
// hash // hash
@ -212,7 +188,40 @@ const addFile = async (
* @return Object that represents added file * @return Object that represents added file
*/ */
export default (user: any, file: string | stream.Readable, ...args) => new Promise<any>((resolve, reject) => { export default (user: any, file: string | stream.Readable, ...args) => new Promise<any>((resolve, reject) => {
addFile(user, file, ...args) // Get file path
new Promise((res: (v: [string, boolean]) => void, rej) => {
if (typeof file === 'string') {
res([file, false]);
return;
}
if (typeof file === 'object' && typeof file.read === 'function') {
tmpFile()
.then(path => {
const readable: stream.Readable = file;
const writable = fs.createWriteStream(path);
readable
.on('error', rej)
.on('end', () => {
res([path, true]);
})
.pipe(writable)
.on('error', rej);
})
.catch(rej);
}
rej(new Error('un-compatible file.'));
}).then(([path, remove]): Promise<any> => new Promise((res, rej) => {
addFile(user, path, ...args)
.then(file => {
res(file)
if (remove) {
fs.unlink(path, (e) => {
if (e) log(e.stack)
})
}
})
.catch(rej)
}))
.then(file => { .then(file => {
log(`drive file has been created ${file._id}`); log(`drive file has been created ${file._id}`);
resolve(file); resolve(file);