depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Config sharp image preprocessing

Browse source
This commit is contained in:
Yukai Huang 2016-11-16 17:07:00 +08:00
parent 1f409197c3
commit 2279986f97
2 changed files with 70 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
app.js
View file

@ -413,71 +413,87 @@ app.post('/uploadimage', function (req, res) {
form.uploadDir = "public/uploads"; form.uploadDir = "public/uploads";
} }
function preprocessImage(path) {
return new Promise((resolve) => {
var oldFile = `${path}-old`;
fs.rename(path, oldFile, function() {
var sharp = require('sharp');
sharp(oldFile).toFile(path).then(() => {
fs.unlink(oldFile, function() {
resolve(path);
})
});
});
});
}
form.parse(req, function (err, fields, files) { form.parse(req, function (err, fields, files) {
if (err || !files.image || !files.image.path) { if (err || !files.image || !files.image.path) {
response.errorForbidden(res); response.errorForbidden(res);
} else { } else {
if (config.debug) preprocessImage(files.image.path).then(() => {
logger.info('SERVER received uploadimage: ' + JSON.stringify(files.image)); if (config.debug)
logger.info('SERVER received uploadimage: ' + JSON.stringify(files.image));
var path = require('path'); var path = require('path');
try { try {
switch (config.imageUploadType) { switch (config.imageUploadType) {
case 'filesystem': case 'filesystem':
res.send({ res.send({
link: path.join(config.serverurl, files.image.path.match(/^public(.+$)/)[1]) link: path.join(config.serverurl, files.image.path.match(/^public(.+$)/)[1])
});
break;
case 's3':
var AWS = require('aws-sdk');
var awsConfig = new AWS.Config(config.s3);
var s3 = new AWS.S3(awsConfig);
fs.readFile(files.image.path, function (err, buffer) {
var params = {
Bucket: 'hackmd',
Key: path.join('uploads', path.basename(files.image.path)),
Body: buffer
};
s3.putObject(params, function (err, data) {
if (err) {
logger.error(err);
res.status(500).end('upload image error');
} else {
res.send({
link: `https://s3-${config.s3.region}.amazonaws.com/${config.s3bucket}/${params.Key}`
});
}
}); });
}); break;
break; case 's3':
var AWS = require('aws-sdk');
var awsConfig = new AWS.Config(config.s3);
var s3 = new AWS.S3(awsConfig);
case 'imgur': fs.readFile(files.image.path, function (err, buffer) {
default: var params = {
imgur.setClientId(config.imgur.clientID); Bucket: 'hackmd',
imgur.uploadFile(files.image.path) Key: path.join('uploads', path.basename(files.image.path)),
.then(function (json) { Body: buffer
if (config.debug) };
logger.info('SERVER uploadimage success: ' + JSON.stringify(json));
res.send({ s3.putObject(params, function (err, data) {
link: json.data.link.replace(/^http:\/\//i, 'https://') if (err) {
logger.error(err);
res.status(500).end('upload image error');
} else {
res.send({
link: `https://s3-${config.s3.region}.amazonaws.com/${config.s3bucket}/${params.Key}`
});
}
}); });
})
.catch(function (err) {
logger.error(err);
return res.status(500).end('upload image error');
}); });
break;
break;
case 'imgur':
default:
imgur.setClientId(config.imgur.clientID);
imgur.uploadFile(files.image.path)
.then(function (json) {
if (config.debug)
logger.info('SERVER uploadimage success: ' + JSON.stringify(json));
res.send({
link: json.data.link.replace(/^http:\/\//i, 'https://')
});
})
.catch(function (err) {
logger.error(err);
return res.status(500).end('upload image error');
});
break;
}
} catch (err) {
logger.error(err);
return res.status(500).end('upload image error');
} }
} catch (err) { });
logger.error(err);
return res.status(500).end('upload image error');
}
} }
}); });
}); });

1
package.json
View file

@ -87,6 +87,7 @@
"reveal.js": "^3.3.0", "reveal.js": "^3.3.0",
"sequelize": "^3.24.3", "sequelize": "^3.24.3",
"sequelize-cli": "^2.4.0", "sequelize-cli": "^2.4.0",
"sharp": "^0.16.2",
"shortid": "2.2.6", "shortid": "2.2.6",
"socket.io": "1.5.0", "socket.io": "1.5.0",
"socket.io-client": "^1.5.0", "socket.io-client": "^1.5.0",