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 #4580 removed path.parse

Browse Source
This commit is contained in:
barisusakli
2016-05-01 12:26:57 +03:00
parent 7365b9cc73
commit e9d548d057
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/controllers/uploads.js
View File

@@ -71,23 +71,31 @@ uploadsController.uploadPost = function(req, res, next) {
return next(null, fileObj);
}
var fullPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), '..', fileObj.url),
parsedPath = path.parse(fullPath);
var fullPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), '..', fileObj.url);
//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(parsedPath.dir, parsedPath.name + '-resized' + parsedPath.ext),
extension: parsedPath.ext,
target: path.join(dirname, basename + '-resized' + extname),
extension: extname,
width: parseInt(meta.config.maximumImageWidth, 10) || 760
}, function(err) {
// Return the resized version to the composer/postData
var parsedUrl = path.parse(fileObj.url);
parsedUrl.base = parsedUrl.name + '-resized' + parsedUrl.ext;
parsedUrl.name = parsedUrl.name + '-resized';
fileObj.url = path.format(parsedUrl);
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);
@@ -174,9 +182,9 @@ function uploadFile(uid, uploadedFile, callback) {
function saveFileToLocal(uploadedFile, callback) {
var extension = path.extname(uploadedFile.name);
if(!extension) {
extension = '.' + mime.extension(uploadedFile.type);
extension = '.' + mime.extension(uploadedFile.type);
}
var filename = uploadedFile.name || 'upload';
filename = Date.now() + '-' + validator.escape(filename.replace(extension, '')).substr(0, 255) + extension;