From 776a7b7f74d9c587cfd9b873f40751892ce7e053 Mon Sep 17 00:00:00 2001 From: Moe Date: Sat, 25 Jul 2020 23:15:24 -0700 Subject: [PATCH] allow adding details to externally uploaded video file --- libs/videos.js | 2 +- libs/webServerPaths.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/videos.js b/libs/videos.js index e3bf0c5e..a6531b59 100644 --- a/libs/videos.js +++ b/libs/videos.js @@ -108,7 +108,7 @@ module.exports = function(s,config,lang){ } if(k.fileExists===true){ //close video row - k.details = {} + k.details = k.details && k.details instanceof Object ? k.details : {} k.stat = fs.statSync(k.dir+k.file) k.filesize = k.stat.size k.filesizeMB = parseFloat((k.filesize/1048576).toFixed(2)) diff --git a/libs/webServerPaths.js b/libs/webServerPaths.js index 83774874..d7b0dac8 100644 --- a/libs/webServerPaths.js +++ b/libs/webServerPaths.js @@ -1756,12 +1756,14 @@ module.exports = function(s,config,lang,app,io){ }); } else { let video = req.files.video; + var details = s.getPostData(req,'details',true) || {} var time = new Date(parseInt(video.name.split('.')[0])) time = req.body.startTime ? !time.getTime() ? new Date(parseInt(req.body.startTime)) : time : new Date() var filename = s.formattedTime(time) + '.' + monitor.ext video.mv(s.getVideoDirectory(monitor) + filename,function(){ s.insertCompletedVideo(monitor,{ file: filename, + details: details, events: s.group[groupKey].activeMonitors[monitorId].detector_motion_count, endTime: req.body.endTime.indexOf('-') > -1 ? s.nameToTime(req.body.endTime) : parseInt(req.body.endTime) || null, },function(){