mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-11-28 23:08:12 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

server - multerがテンポラリディレクトリにファイルを展開するように

Browse Source 
DiskStorageをオプション無しで呼ぶといい感じになる
またチェーンを改行するようにし、デバッグ表示にパスが出るようにした
This commit is contained in:
otofune 2017-11-14 05:26:27 +09:00
parent 95d6832735
commit 1ba12b922d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ const addFile = async (
folderId: mongodb.ObjectID = null,
force: boolean = false
) => {
log(`registering ${name} (user: ${user.username})`);
log(`registering ${name} (user: ${user.username}, path: ${path})`);
// Calculate hash, get content type and get file size
const [hash, [mime, ext], size] = await Promise.all([
@ -210,18 +210,19 @@ export default (user: any, file: string | stream.Readable, ...args) => new Promi
.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(([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 => {
log(`drive file has been created ${file._id}`);
resolve(file);

2
src/api/server.ts
View File

@ -40,7 +40,7 @@ app.get('/', (req, res) => {
endpoints.forEach(endpoint =>
endpoint.withFile ?
app.post(`/${endpoint.name}`,
endpoint.withFile ? multer({ dest: 'uploads/' }).single('file') : null,
endpoint.withFile ? multer({ storage: multer.diskStorage({}) }).single('file') : null,
require('./api-handler').default.bind(null, endpoint)) :
app.post(`/${endpoint.name}`,
require('./api-handler').default.bind(null, endpoint))