From 7b32ff7498395884ed4508dc4c5ca21fed259530 Mon Sep 17 00:00:00 2001 From: Damien <damien.armillon@gmail.com> Date: Sat, 18 May 2019 10:54:44 +0200 Subject: [PATCH] Change route for download pdf --- backend/routes/routesToucan.js | 48 +++++++++++++++------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/backend/routes/routesToucan.js b/backend/routes/routesToucan.js index 9e99057..faa717c 100644 --- a/backend/routes/routesToucan.js +++ b/backend/routes/routesToucan.js @@ -56,33 +56,7 @@ router.route("/toucans") } }); }}); -// Renvoie le pdf du toucan avec l'id donné -router.route("/pdf/:id") - .get(celebrate({params: validId}), function (req,res) { - var pdfPath = path.format({ - dir: env.savedExtensions[1].path, - name: req.params.id, - ext: ".pdf" - }); - res.sendFile(pdfPath); - }); -// Renvoie la cover du toucan avec l'id donné -router.route("/img/:id") - .get(celebrate({params: validId}),function(req,res) { - var imgPath = path.join(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"); - } - }); + // Supprime le toucan avec l'id donné router.route("/delete/:id") .post( @@ -122,4 +96,24 @@ router.route("/delete/:id") }); }); +// Renvoie la cover du toucan avec l'id donné +router.route("/img/:id") + .get(celebrate({params: validId}),function(req,res) { + var imgPath = path.join(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"); + } + }); + +router.use("/pdf",express.static(env.savedExtensions[1].path)); + module.exports = router; \ No newline at end of file -- GitLab