add "events" to Traditional Recording insertCompletedVideo request
- this will allow these kinds of recordings to provide a notification to the Mobile App upon completionmerge-requests/180/head
parent
dfade3791a
commit
443b5565fe
|
@ -234,9 +234,6 @@ module.exports = function(s,config,lang){
|
|||
var eventTime = new Date()
|
||||
//motion counter
|
||||
if(filter.addToMotionCounter && filter.record){
|
||||
if(!s.group[d.ke].activeMonitors[d.id].detector_motion_count){
|
||||
s.group[d.ke].activeMonitors[d.id].detector_motion_count = []
|
||||
}
|
||||
s.group[d.ke].activeMonitors[d.id].detector_motion_count.push(d)
|
||||
}
|
||||
if(filter.useLock){
|
||||
|
@ -417,7 +414,8 @@ module.exports = function(s,config,lang){
|
|||
return
|
||||
}
|
||||
s.insertCompletedVideo(d.mon,{
|
||||
file : filename
|
||||
file : filename,
|
||||
events: s.group[d.ke].activeMonitors[d.id].detector_motion_count
|
||||
})
|
||||
s.userLog(d,{type:lang["Traditional Recording"],msg:lang["Detector Recording Complete"]})
|
||||
s.userLog(d,{type:lang["Traditional Recording"],msg:lang["Clear Recorder Process"]})
|
||||
|
|
|
@ -34,6 +34,7 @@ module.exports = function(s,config,lang){
|
|||
if(!s.group[e.ke].activeMonitors[e.mid].isStarted){s.group[e.ke].activeMonitors[e.mid].isStarted = false};
|
||||
if(s.group[e.ke].activeMonitors[e.mid].delete){clearTimeout(s.group[e.ke].activeMonitors[e.mid].delete)}
|
||||
if(!s.group[e.ke].rawMonitorConfigurations){s.group[e.ke].rawMonitorConfigurations={}}
|
||||
if(!s.group[e.ke].activeMonitors[e.mid].detector_motion_count){s.group[e.ke].activeMonitors[e.mid].detector_motion_count = []}
|
||||
s.onMonitorInitExtensions.forEach(function(extender){
|
||||
extender(e)
|
||||
})
|
||||
|
|
|
@ -1849,7 +1849,8 @@ module.exports = function(s,config,lang,app,io){
|
|||
var filename = s.formattedTime(time) + '.' + monitor.ext
|
||||
video.mv(s.getVideoDirectory(monitor) + filename,function(){
|
||||
s.insertCompletedVideo(monitor,{
|
||||
file : filename,
|
||||
file: filename,
|
||||
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(){
|
||||
response.ok = true
|
||||
|
|
Loading…
Reference in New Issue