ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow adding details to externally uploaded video file

const-conversion
Moe 2020-07-25 23:15:24 -07:00
parent 7d07124ac5
commit 776a7b7f74
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/videos.js
View File

@ -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))

2
libs/webServerPaths.js
View File

@ -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(){