diff --git a/backend/routes/routesToucan.js b/backend/routes/routesToucan.js index 6b5598bb7d3d0160605ae8a2cbc4c07814832311..4977f52f480a467edb5ff0f71c0cd51dbc1c914d 100644 --- a/backend/routes/routesToucan.js +++ b/backend/routes/routesToucan.js @@ -124,19 +124,27 @@ router.get('/img-dernierToucan', (req, res) => { .sort({date:-1}) .limit(1) .exec(function (err, toucan) { - if (err) {res.send(err);} - else { - const id = toucan[0]._id; - res.sendFile(path.resolve(env.savedExtensions[0].path,id)); - } + var imgPath = path.resolve(env.savedExtensions[0].path,req.params.id); + var fileKnown = false; + env.savedExtensions[0].extensions.forEach(ext => { + if (fs.existsSync(imgPath+ext)){ + imgPath = imgPath+ext; + fileKnown = true; + } }); + if (fileKnown) { + res.sendFile(imgPath); + } else { + res.send(404,"Image non trouvée"); + } }); // Renvoie la cover du toucan avec l'id donné router.route("/img/:id") .get(celebrate({params: validId}),function(req,res) { - var imgPath = path.resolve(env.savedExtensions[0].path,req.params.id); + const id = toucan[0]._id; + var imgPath = path.resolve(env.savedExtensions[0].path,id); var fileKnown = false; env.savedExtensions[0].extensions.forEach(ext => { if (fs.existsSync(imgPath+ext)){ @@ -174,7 +182,7 @@ router.get('/pdf/:year/:title', (req, res) => { res.sendFile(path.resolve(env.savedExtensions[1].path,id+".pdf")); } }); -}); - + }); + }); module.exports = router; \ No newline at end of file