Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4590

Browse Source
This commit is contained in:
barisusakli
2016-05-01 12:44:43 +03:00
parent e9d548d057
commit fea18a050f
2 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/controllers/uploads.js
View File

@@ -71,36 +71,50 @@ uploadsController.uploadPost = function(req, res, next) {
return next(null, fileObj); return next(null, fileObj);
} }
var fullPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), '..', fileObj.url); resizeImage(fileObj, next);
//var parsedPath = path.parse(fullPath);
var dirname = path.dirname(fullPath);
var extname = path.extname(fullPath);
var basename = path.basename(fullPath, extname);
image.resizeImage({
path: fullPath,
target: path.join(dirname, basename + '-resized' + extname),
extension: extname,
width: parseInt(meta.config.maximumImageWidth, 10) || 760
}, function(err) {
next(err, fileObj);
});
},
function (fileObj, next) {
// Return the resized version to the composer/postData
var dirname = path.dirname(fileObj.url);
var extname = path.extname(fileObj.url);
var basename = path.basename(fileObj.url, extname);
fileObj.url = path.join(dirname, basename + '-resized' + extname);
next(null, fileObj);
} }
], next); ], next);
}, next); }, next);
}; };
function resizeImage(fileObj, callback) {
var fullPath;
async.waterfall([
function(next) {
fullPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), '..', fileObj.url);
image.load(fullPath, next);
},
function (imageData, next) {
if (imageData.width < parseInt(meta.config.maximumImageWidth, 10) || 760) {
return callback(null, fileObj);
}
var dirname = path.dirname(fullPath);
var extname = path.extname(fullPath);
var basename = path.basename(fullPath, extname);
image.resizeImage({
path: fullPath,
target: path.join(dirname, basename + '-resized' + extname),
extension: extname,
width: parseInt(meta.config.maximumImageWidth, 10) || 760
}, next);
},
function (next) {
// Return the resized version to the composer/postData
var dirname = path.dirname(fileObj.url);
var extname = path.extname(fileObj.url);
var basename = path.basename(fileObj.url, extname);
fileObj.url = path.join(dirname, basename + '-resized' + extname);
next(null, fileObj);
}
], callback);
}
uploadsController.uploadThumb = function(req, res, next) { uploadsController.uploadThumb = function(req, res, next) {
if (parseInt(meta.config.allowTopicsThumbnail, 10) !== 1) { if (parseInt(meta.config.allowTopicsThumbnail, 10) !== 1) {
deleteTempFiles(req.files.files); deleteTempFiles(req.files.files);

10
src/image.js
View File

@@ -15,7 +15,7 @@ image.resizeImage = function(data, callback) {
extension: data.extension, extension: data.extension,
width: data.width, width: data.width,
height: data.height height: data.height
}, function(err, data) { }, function(err) {
callback(err); callback(err);
}); });
} else { } else {
@@ -79,7 +79,7 @@ image.normalise = function(path, extension, callback) {
plugins.fireHook('filter:image.normalise', { plugins.fireHook('filter:image.normalise', {
path: path, path: path,
extension: extension extension: extension
}, function(err, data) { }, function(err) {
callback(err); callback(err);
}); });
} else { } else {
@@ -94,6 +94,12 @@ image.normalise = function(path, extension, callback) {
} }
}; };
image.load = function(path, callback) {
new Jimp(path, function(err, data) {
callback(err, data ? data.bitmap : null);
});
};
image.convertImageToBase64 = function(path, callback) { image.convertImageToBase64 = function(path, callback) {
fs.readFile(path, function(err, data) { fs.readFile(path, function(err, data) {
callback(err, data ? data.toString('base64') : null); callback(err, data ? data.toString('base64') : null);