hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file.delete method

Browse Source
v1.18.x
Barış Soner Uşaklı 8 years ago
parent 29135dfed3
commit c9d502320f
7 changed files with 76 additions and 119 deletions
Show Stats Download Patch File Download Diff File

105
src/controllers/accounts/edit.js
Unescape Escape View File

@ -1,8 +1,6 @@
'use strict'; 'use strict';
var async = require('async'); var async = require('async');
var fs = require('fs');
var winston = require('winston');
var db = require('../../database'); var db = require('../../database');
var user = require('../../user'); var user = require('../../user');
@ -12,49 +10,51 @@ var helpers = require('../helpers');
var groups = require('../../groups'); var groups = require('../../groups');
var accountHelpers = require('./helpers'); var accountHelpers = require('./helpers');
var privileges = require('../../privileges'); var privileges = require('../../privileges');
var file = require('../../file');
var editController = {}; var editController = module.exports;
editController.get = function (req, res, callback) { editController.get = function (req, res, callback) {
accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, function (err, userData) { async.waterfall([
if (err || !userData) { function (next) {
return callback(err); accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, next);
} },
function (userData, next) {
userData.maximumSignatureLength = parseInt(meta.config.maximumSignatureLength, 10) || 255; if (!userData) {
userData.maximumAboutMeLength = parseInt(meta.config.maximumAboutMeLength, 10) || 1000; return callback();
userData.maximumProfileImageSize = parseInt(meta.config.maximumProfileImageSize, 10);
userData.allowProfileImageUploads = parseInt(meta.config.allowProfileImageUploads, 10) === 1;
userData.allowAccountDelete = parseInt(meta.config.allowAccountDelete, 10) === 1;
userData.profileImageDimension = parseInt(meta.config.profileImageDimension, 10) || 200;
userData.groups = userData.groups.filter(function (group) {
return group && group.userTitleEnabled && !groups.isPrivilegeGroup(group.name) && group.name !== 'registered-users';
});
userData.groups.forEach(function (group) {
group.selected = group.name === userData.groupTitle;
});
userData.title = '[[pages:account/edit, ' + userData.username + ']]';
userData.breadcrumbs = helpers.buildBreadcrumbs([
{
text: userData.username,
url: '/user/' + userData.userslug,
},
{
text: '[[user:edit]]',
},
]);
userData.editButtons = [];
plugins.fireHook('filter:user.account.edit', userData, function (err, userData) {
if (err) {
return callback(err);
} }
userData.maximumSignatureLength = parseInt(meta.config.maximumSignatureLength, 10) || 255;
userData.maximumAboutMeLength = parseInt(meta.config.maximumAboutMeLength, 10) || 1000;
userData.maximumProfileImageSize = parseInt(meta.config.maximumProfileImageSize, 10);
userData.allowProfileImageUploads = parseInt(meta.config.allowProfileImageUploads, 10) === 1;
userData.allowAccountDelete = parseInt(meta.config.allowAccountDelete, 10) === 1;
userData.profileImageDimension = parseInt(meta.config.profileImageDimension, 10) || 200;
userData.groups = userData.groups.filter(function (group) {
return group && group.userTitleEnabled && !groups.isPrivilegeGroup(group.name) && group.name !== 'registered-users';
});
userData.groups.forEach(function (group) {
group.selected = group.name === userData.groupTitle;
});
userData.title = '[[pages:account/edit, ' + userData.username + ']]';
userData.breadcrumbs = helpers.buildBreadcrumbs([
{
text: userData.username,
url: '/user/' + userData.userslug,
},
{
text: '[[user:edit]]',
},
]);
userData.editButtons = [];
plugins.fireHook('filter:user.account.edit', userData, next);
},
function (userData) {
res.render('account/edit', userData); res.render('account/edit', userData);
}); },
}); ], callback);
}; };
editController.password = function (req, res, next) { editController.password = function (req, res, next) {
@ -115,14 +115,11 @@ function getUserData(req, next, callback) {
} }
db.getObjectField('user:' + userData.uid, 'password', next); db.getObjectField('user:' + userData.uid, 'password', next);
}, },
], function (err, password) { function (password, next) {
if (err) { userData.hasPassword = !!password;
return callback(err); next(null, userData);
} },
], callback);
userData.hasPassword = !!password;
callback(null, userData);
});
} }
editController.uploadPicture = function (req, res, next) { editController.uploadPicture = function (req, res, next) {
@ -147,11 +144,7 @@ editController.uploadPicture = function (req, res, next) {
user.uploadPicture(updateUid, userPhoto, next); user.uploadPicture(updateUid, userPhoto, next);
}, },
], function (err, image) { ], function (err, image) {
fs.unlink(userPhoto.path, function (err) { file.delete(userPhoto.path);
if (err) {
winston.warn('[user/picture] Unable to delete picture ' + userPhoto.path, err);
}
});
if (err) { if (err) {
return next(err); return next(err);
} }
@ -165,11 +158,13 @@ editController.uploadPicture = function (req, res, next) {
editController.uploadCoverPicture = function (req, res, next) { editController.uploadCoverPicture = function (req, res, next) {
var params = JSON.parse(req.body.params); var params = JSON.parse(req.body.params);
var coverPhoto = req.files.files[0];
user.updateCoverPicture({ user.updateCoverPicture({
file: req.files.files[0], file: coverPhoto,
uid: params.uid, uid: params.uid,
}, function (err, image) { }, function (err, image) {
file.delete(coverPhoto.path);
if (err) { if (err) {
return next(err); return next(err);
} }
@ -179,5 +174,3 @@ editController.uploadCoverPicture = function (req, res, next) {
}]); }]);
}); });
}; };
module.exports = editController;

22
src/controllers/admin/uploads.js
Unescape Escape View File

@ -1,10 +1,8 @@
'use strict'; 'use strict';
var fs = require('fs');
var path = require('path'); var path = require('path');
var async = require('async'); var async = require('async');
var nconf = require('nconf'); var nconf = require('nconf');
var winston = require('winston');
var mime = require('mime'); var mime = require('mime');
var meta = require('../../meta'); var meta = require('../../meta');
@ -23,7 +21,7 @@ uploadsController.uploadCategoryPicture = function (req, res, next) {
try { try {
params = JSON.parse(req.body.params); params = JSON.parse(req.body.params);
} catch (e) { } catch (e) {
deleteTempFile(uploadedFile.path); file.delete(uploadedFile.path);
return next(new Error('[[error:invalid-json]]')); return next(new Error('[[error:invalid-json]]'));
} }
@ -39,7 +37,7 @@ uploadsController.uploadFavicon = function (req, res, next) {
if (validateUpload(req, res, next, uploadedFile, allowedTypes)) { if (validateUpload(req, res, next, uploadedFile, allowedTypes)) {
file.saveFileToLocal('favicon.ico', 'system', uploadedFile.path, function (err, image) { file.saveFileToLocal('favicon.ico', 'system', uploadedFile.path, function (err, image) {
deleteTempFile(uploadedFile.path); file.delete(uploadedFile.path);
if (err) { if (err) {
return next(err); return next(err);
} }
@ -72,7 +70,7 @@ uploadsController.uploadTouchIcon = function (req, res, next) {
}), }),
], next); ], next);
}, function (err) { }, function (err) {
deleteTempFile(uploadedFile.path); file.delete(uploadedFile.path);
if (err) { if (err) {
return next(err); return next(err);
@ -104,7 +102,7 @@ uploadsController.uploadSound = function (req, res, next) {
meta.sounds.build(next); meta.sounds.build(next);
}, },
], function (err) { ], function (err) {
deleteTempFile(uploadedFile.path); file.delete(uploadedFile.path);
if (err) { if (err) {
return next(err); return next(err);
} }
@ -131,7 +129,7 @@ function upload(name, req, res, next) {
function validateUpload(req, res, next, uploadedFile, allowedTypes) { function validateUpload(req, res, next, uploadedFile, allowedTypes) {
if (allowedTypes.indexOf(uploadedFile.type) === -1) { if (allowedTypes.indexOf(uploadedFile.type) === -1) {
deleteTempFile(uploadedFile.path); file.delete(uploadedFile.path);
res.json({ error: '[[error:invalid-image-type, ' + allowedTypes.join(', ') + ']]' }); res.json({ error: '[[error:invalid-image-type, ' + allowedTypes.join(', ') + ']]' });
return false; return false;
} }
@ -149,18 +147,10 @@ function uploadImage(filename, folder, uploadedFile, req, res, next) {
} }
}, },
], function (err, image) { ], function (err, image) {
deleteTempFile(uploadedFile.path); file.delete(uploadedFile.path);
if (err) { if (err) {
return next(err); return next(err);
} }
res.json([{ name: uploadedFile.name, url: image.url.startsWith('http') ? image.url : nconf.get('relative_path') + image.url }]); res.json([{ name: uploadedFile.name, url: image.url.startsWith('http') ? image.url : nconf.get('relative_path') + image.url }]);
}); });
} }
function deleteTempFile(path) {
fs.unlink(path, function (err) {
if (err) {
winston.error(err);
}
});
}

12
src/controllers/uploads.js
Unescape Escape View File

@ -1,11 +1,9 @@
'use strict'; 'use strict';
var fs = require('fs');
var path = require('path'); var path = require('path');
var async = require('async'); var async = require('async');
var nconf = require('nconf'); var nconf = require('nconf');
var validator = require('validator'); var validator = require('validator');
var winston = require('winston');
var meta = require('../meta'); var meta = require('../meta');
var file = require('../file'); var file = require('../file');
@ -242,13 +240,9 @@ function saveFileToLocal(uploadedFile, callback) {
} }
function deleteTempFiles(files) { function deleteTempFiles(files) {
async.each(files, function (file, next) { async.each(files, function (fileObj, next) {
fs.unlink(file.path, function (err) { file.delete(fileObj.path);
if (err) { next();
winston.error(err);
}
next();
});
}); });
} }

12
src/file.js
Unescape Escape View File

@ -115,6 +115,16 @@ file.existsSync = function (path) {
return true; return true;
}; };
file.delete = function (path) {
if (path) {
fs.unlink(path, function (err) {
if (err) {
winston.error(err);
}
});
}
};
file.link = function link(filePath, destPath, cb) { file.link = function link(filePath, destPath, cb) {
if (process.platform === 'win32') { if (process.platform === 'win32') {
fs.link(filePath, destPath, cb); fs.link(filePath, destPath, cb);
@ -178,5 +188,3 @@ file.walk = function (dir, done) {
}); });
}); });
}; };
module.exports = file;

11
src/groups/cover.js
Unescape Escape View File

@ -1,14 +1,13 @@
'use strict'; 'use strict';
var async = require('async'); var async = require('async');
var fs = require('fs');
var path = require('path'); var path = require('path');
var Jimp = require('jimp'); var Jimp = require('jimp');
var mime = require('mime'); var mime = require('mime');
var winston = require('winston');
var db = require('../database'); var db = require('../database');
var image = require('../image'); var image = require('../image');
var file = require('../file');
var uploadsController = require('../controllers/uploads'); var uploadsController = require('../controllers/uploads');
module.exports = function (Groups) { module.exports = function (Groups) {
@ -70,12 +69,8 @@ module.exports = function (Groups) {
} }
}, },
], function (err) { ], function (err) {
fs.unlink(tempPath, function (unlinkErr) { file.delete(tempPath);
if (unlinkErr) { callback(err, { url: url });
winston.error(unlinkErr);
}
callback(err, { url: url });
});
}); });
}; };

15
src/topics/thumb.js
Unescape Escape View File

@ -3,7 +3,6 @@
var async = require('async'); var async = require('async');
var nconf = require('nconf'); var nconf = require('nconf');
var winston = require('winston');
var path = require('path'); var path = require('path');
var fs = require('fs'); var fs = require('fs');
var request = require('request'); var request = require('request');
@ -64,25 +63,15 @@ module.exports = function (Topics) {
plugins.fireHook('filter:uploadImage', { image: { path: pathToUpload, name: '' }, uid: data.uid }, next); plugins.fireHook('filter:uploadImage', { image: { path: pathToUpload, name: '' }, uid: data.uid }, next);
}, },
function (uploadedFile, next) { function (uploadedFile, next) {
deleteFile(pathToUpload); file.delete(pathToUpload);
data.thumb = uploadedFile.url; data.thumb = uploadedFile.url;
next(); next();
}, },
], function (err) { ], function (err) {
if (err) { if (err) {
deleteFile(pathToUpload); file.delete(pathToUpload);
} }
callback(err); callback(err);
}); });
}; };
function deleteFile(path) {
if (path) {
fs.unlink(path, function (err) {
if (err) {
winston.error(err);
}
});
}
}
}; };

18
src/user/picture.js
Unescape Escape View File

@ -1,8 +1,6 @@
'use strict'; 'use strict';
var async = require('async'); var async = require('async');
var fs = require('fs');
var winston = require('winston');
var request = require('request'); var request = require('request');
var mime = require('mime'); var mime = require('mime');
@ -106,7 +104,7 @@ module.exports = function (User) {
} }
}, },
], function (err) { ], function (err) {
deleteFile(picture.path); file.delete(picture.path);
callback(err, { callback(err, {
url: url, url: url,
}); });
@ -175,7 +173,7 @@ module.exports = function (User) {
}, next); }, next);
}, },
], function (err) { ], function (err) {
deleteFile(picture.path); file.delete(picture.path);
callback(err, uploadedImage); callback(err, uploadedImage);
}); });
}; };
@ -190,7 +188,7 @@ module.exports = function (User) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
deleteFile(path); file.delete(path);
callback(null, newPath); callback(null, newPath);
}); });
} }
@ -230,16 +228,6 @@ module.exports = function (User) {
], callback); ], callback);
} }
function deleteFile(path) {
if (path) {
fs.unlink(path, function (err) {
if (err) {
winston.error(err);
}
});
}
}
User.removeCoverPicture = function (data, callback) { User.removeCoverPicture = function (data, callback) {
db.deleteObjectFields('user:' + data.uid, ['cover:url', 'cover:position'], callback); db.deleteObjectFields('user:' + data.uid, ['cover:url', 'cover:position'], callback);
}; };

Write Preview
Loading…
Cancel
Save