From 342345cc2fb95e86d65095e0c9996441950ad628 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 04:35:25 +0900
Subject: [PATCH] =?UTF-8?q?create=20-=20=E3=83=90=E3=83=83=E3=83=95?=
=?UTF-8?q?=E3=82=A1=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=AA=E3=81=84?=
=?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/endpoints/drive/files/create.ts | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/api/endpoints/drive/files/create.ts b/src/api/endpoints/drive/files/create.ts
index 7967c31187..7546eca309 100644
--- a/src/api/endpoints/drive/files/create.ts
+++ b/src/api/endpoints/drive/files/create.ts
@@ -1,7 +1,6 @@
/**
* Module dependencies
*/
-import * as fs from 'fs';
import $ from 'cafy';
import { validateFileName } from '../../../models/drive-file';
import serialize from '../../../serializers/drive-file';
@@ -15,15 +14,11 @@ import create from '../../../common/add-file-to-drive';
* @param {any} user
* @return {Promise<any>}
*/
-module.exports = (file, params, user) => new Promise(async (res, rej) => {
+module.exports = async (file, params, user): Promise<any> => {
if (file == null) {
- return rej('file is required');
+ throw 'file is required';
}
- // TODO: 非同期にしたい。Promise対応してないんだろうか...
- const buffer = fs.readFileSync(file.path);
- fs.unlink(file.path, (err) => { if (err) console.log(err); });
-
// Get 'name' parameter
let name = file.originalname;
if (name !== undefined && name !== null) {
@@ -33,7 +28,7 @@ module.exports = (file, params, user) => new Promise(async (res, rej) => {
} else if (name === 'blob') {
name = null;
} else if (!validateFileName(name)) {
- return rej('invalid name');
+ throw 'invalid name';
}
} else {
name = null;
@@ -41,14 +36,11 @@ module.exports = (file, params, user) => new Promise(async (res, rej) => {
// Get 'folder_id' parameter
const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
- if (folderIdErr) return rej('invalid folder_id param');
+ if (folderIdErr) throw 'invalid folder_id param';
// Create file
- const driveFile = await create(user, buffer, name, null, folderId);
+ const driveFile = await create(user, file.path, name, null, folderId);
// Serialize
- const fileObj = await serialize(driveFile);
-
- // Response
- res(fileObj);
-});
+ return serialize(driveFile);
+};