diff --git a/modules/about/server/controllers/makers.server.controller.js b/modules/about/server/controllers/makers.server.controller.js index ca666574..e267bc51 100644 --- a/modules/about/server/controllers/makers.server.controller.js +++ b/modules/about/server/controllers/makers.server.controller.js @@ -330,9 +330,7 @@ exports.makerByID = function (req, res, next, id) { if (err) { return next(err); } else if (!maker) { - return res.status(404).send({ - message: 'No maker with that identifier has been found' - }); + return res.status(404).send(); } req.maker = maker; next(); diff --git a/modules/collections/server/controllers/collections.server.controller.js b/modules/collections/server/controllers/collections.server.controller.js index 3497785f..521c4a61 100644 --- a/modules/collections/server/controllers/collections.server.controller.js +++ b/modules/collections/server/controllers/collections.server.controller.js @@ -326,9 +326,7 @@ exports.collectionByID = function (req, res, next, id) { if (err) { return next(err); } else if (!coll) { - return res.status(404).send({ - message: 'No collection with that identifier has been found' - }); + return res.status(404).send(); } req.collection = coll; next(); diff --git a/modules/forums/server/controllers/forums.admin.server.controller.js b/modules/forums/server/controllers/forums.admin.server.controller.js index 2a930d40..61ccae33 100644 --- a/modules/forums/server/controllers/forums.admin.server.controller.js +++ b/modules/forums/server/controllers/forums.admin.server.controller.js @@ -187,9 +187,7 @@ exports.forumByID = function (req, res, next, id) { if (err) { return next(err); } else if (!forum) { - return res.status(404).send({ - message: 'No forum with that identifier has been found' - }); + return res.status(404).send(); } req.forum = forum; next(); diff --git a/modules/forums/server/controllers/forums.server.controller.js b/modules/forums/server/controllers/forums.server.controller.js index 5cffc350..73a362ae 100644 --- a/modules/forums/server/controllers/forums.server.controller.js +++ b/modules/forums/server/controllers/forums.server.controller.js @@ -1065,9 +1065,7 @@ exports.topicById = function (req, res, next, id) { if (err) { return next(err); } else if (!topic) { - return res.status(404).send({ - message: 'No topic with that identifier has been found' - }); + return res.status(404).send(); } req.topic = topic; next(); diff --git a/modules/invitations/server/controllers/invitations.server.controller.js b/modules/invitations/server/controllers/invitations.server.controller.js index 36465245..60a09711 100644 --- a/modules/invitations/server/controllers/invitations.server.controller.js +++ b/modules/invitations/server/controllers/invitations.server.controller.js @@ -462,9 +462,7 @@ exports.invitationByID = function (req, res, next, id) { if (err) { return next(err); } else if (!invitation) { - return res.status(404).send({ - message: 'No invitation with that identifier has been found' - }); + return res.status(404).send(); } req.invitation = invitation; next(); diff --git a/modules/messages/server/controllers/admin-messages.server.controller.js b/modules/messages/server/controllers/admin-messages.server.controller.js index a69d776c..2eacd771 100644 --- a/modules/messages/server/controllers/admin-messages.server.controller.js +++ b/modules/messages/server/controllers/admin-messages.server.controller.js @@ -107,9 +107,7 @@ exports.adminMessageByID = function (req, res, next, id) { if (err) { return next(err); } else if (!message) { - return res.status(404).send({ - message: 'No message with that identifier has been found' - }); + return res.status(404).send(); } req.adminMessage = message; next(); diff --git a/modules/messages/server/controllers/messages.server.controller.js b/modules/messages/server/controllers/messages.server.controller.js index cfb4ee03..4cedd48a 100644 --- a/modules/messages/server/controllers/messages.server.controller.js +++ b/modules/messages/server/controllers/messages.server.controller.js @@ -357,9 +357,7 @@ exports.messageByID = function (req, res, next, id) { if (err) { return next(err); } else if (!message) { - return res.status(404).send({ - message: 'No message with that identifier has been found' - }); + return res.status(404).send(); } req.message = message; next(); diff --git a/modules/requests/server/controllers/requests.server.controller.js b/modules/requests/server/controllers/requests.server.controller.js index 9ba6587b..b2648eb0 100644 --- a/modules/requests/server/controllers/requests.server.controller.js +++ b/modules/requests/server/controllers/requests.server.controller.js @@ -327,9 +327,7 @@ exports.requestByID = function (req, res, next, id) { if (err) { return next(err); } else if (!request) { - return res.status(404).send({ - message: 'No request with that identifier has been found' - }); + return res.status(404).send(); } req.request = request; next(); diff --git a/modules/torrents/server/controllers/completes.server.controller.js b/modules/torrents/server/controllers/completes.server.controller.js index 2acacfde..b6c27d79 100644 --- a/modules/torrents/server/controllers/completes.server.controller.js +++ b/modules/torrents/server/controllers/completes.server.controller.js @@ -115,9 +115,7 @@ exports.completeByID = function (req, res, next, id) { if (err) { return next(err); } else if (!complete) { - return res.status(404).send({ - message: 'No complete with that identifier has been found' - }); + return res.status(404).send(); } req.complate = complete; next(); diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js index 80ec2cc0..79fc3100 100644 --- a/modules/torrents/server/controllers/torrents.server.controller.js +++ b/modules/torrents/server/controllers/torrents.server.controller.js @@ -2103,7 +2103,7 @@ exports.torrentByID = function (req, res, next, id) { }; var findOtherTorrents = function (torrent, callback) { - if (torrent.resource_detail_info.id) { + if (torrent && torrent.resource_detail_info.id) { var condition = { torrent_status: 'reviewed', 'resource_detail_info.id': torrent.resource_detail_info.id @@ -2136,33 +2136,40 @@ exports.torrentByID = function (req, res, next, id) { }; var writeAllFiles = function (torrent, callback) { - var filePath = config.uploads.torrent.file.dest + torrent.torrent_filename; - nt.read(filePath, function (err, torrent_data) { - if (err) { - callback(err); - } else { - var mdata = torrent_data.metadata; - torrent._all_files = []; - - if (mdata.info.files) { - mdata.info.files.forEach(function (f) { - torrent._all_files.push(f.path.join('/') + ', ' + common.fileSizeFormat(f.length, 2)); - }); + if (torrent) { + var filePath = config.uploads.torrent.file.dest + torrent.torrent_filename; + nt.read(filePath, function (err, torrent_data) { + if (err) { + callback(err); } else { - torrent._all_files.push(mdata.info.name + ', ' + common.fileSizeFormat(mdata.info.length, 2)); + var mdata = torrent_data.metadata; + torrent._all_files = []; + + if (mdata.info.files) { + mdata.info.files.forEach(function (f) { + torrent._all_files.push(f.path.join('/') + ', ' + common.fileSizeFormat(f.length, 2)); + }); + } else { + torrent._all_files.push(mdata.info.name + ', ' + common.fileSizeFormat(mdata.info.length, 2)); + } + + callback(null, torrent); } - - callback(null, torrent); - } - }); - + }); + } else { + callback(null, torrent); + } }; async.waterfall([findTorrents, findOtherTorrents, writeAllFiles], function (err, torrent) { if (err) { next(err); } else { - req.torrent = torrent; + if (torrent) { + req.torrent = torrent; + } else { + return res.status(404).send(); + } next(); } }); diff --git a/modules/traces/server/controllers/traces.server.controller.js b/modules/traces/server/controllers/traces.server.controller.js index 88a53aa8..1b894cbc 100644 --- a/modules/traces/server/controllers/traces.server.controller.js +++ b/modules/traces/server/controllers/traces.server.controller.js @@ -134,9 +134,7 @@ exports.traceByID = function (req, res, next, id) { if (err) { return next(err); } else if (!trace) { - return res.status(404).send({ - message: 'No trace with that identifier has been found' - }); + return res.status(404).send(); } req.trace = trace; next();