From d991516ddfc8795a8482fa9c76da59bd1c78a858 Mon Sep 17 00:00:00 2001 From: Moe Alam Date: Thu, 11 Feb 2021 09:45:05 -0800 Subject: [PATCH] Fix frame deletion (allow row delete if file does not exist) --- libs/timelapse.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libs/timelapse.js b/libs/timelapse.js index 8dffb305..44ca2dd4 100644 --- a/libs/timelapse.js +++ b/libs/timelapse.js @@ -326,26 +326,26 @@ module.exports = function(s,config,lang,app,io){ selectedDate = req.params.filename.split('T')[0] } fileLocation = `${fileLocation}${frame.ke}/${frame.mid}_timelapse/${selectedDate}/${req.params.filename}` - fs.stat(fileLocation,function(err,stats){ - if(!err){ - if(req.params.action === 'delete'){ - deleteTimelapseFrame({ - ke: frame.ke, - mid: frame.mid, - filename: req.params.filename, - fileLocation: fileLocation, - }) - delete(timelapseFramesCache[cacheKey]) - s.closeJsonResponse(res,{ok: true}) - }else{ + if(req.params.action === 'delete'){ + deleteTimelapseFrame({ + ke: frame.ke, + mid: frame.mid, + filename: req.params.filename, + fileLocation: fileLocation, + }) + delete(timelapseFramesCache[cacheKey]) + s.closeJsonResponse(res,{ok: true}) + }else{ + fs.stat(fileLocation,function(err,stats){ + if(!err){ res.contentType('image/jpeg') res.on('finish',function(){res.end()}) fs.createReadStream(fileLocation).pipe(res) + }else{ + s.closeJsonResponse(res,{ok: false, msg: lang[`Nothing exists`]}) } - }else{ - s.closeJsonResponse(res,{ok: false, msg: lang[`Nothing exists`]}) - } - }) + }) + } } if(timelapseFramesCache[cacheKey]){ processFrame(timelapseFramesCache[cacheKey])