diff --git a/definitions/en_CA.js b/definitions/en_CA.js index d140d69c..be2305b0 100644 --- a/definitions/en_CA.js +++ b/definitions/en_CA.js @@ -3728,27 +3728,6 @@ module.exports = function(s,config,lang){ }, ] }, - { - hidden: true, - "name": lang['OpenCV Cascades'], - "color": "orange", - id: "monSectionOpenCVCascades", - headerTitle: `${lang['OpenCV Cascades']}  `, - blockquote: lang.opencvCascadesText, - isSection: true, - isAdvanced: true, - isFormGroupGroup: true, - "section-pre-pre-class": "h_det_input h_det_1", - "section-pre-class": "h_casc_input h_casc_1", - "section-class": "shinobi-detector-opencv shinobi-detector-openalpr shinobi-detector_plug", - "info": [ - { - "fieldType": "div", - id: "detector_cascade_list", - style: "max-height: 300px;overflow: auto;" - } - ] - }, { hidden: true, "name": lang['Traditional Recording'], @@ -6307,6 +6286,23 @@ module.exports = function(s,config,lang){ hidden:true, "name": "id", }, + { + "name": "enabled", + "field": lang.Enabled, + "fieldType": "select", + "default": "1", + "possible": [ + { + "name": "No", + "value": "0", + }, + { + "name": "Yes", + "value": "1", + "selected": true + } + ] + }, { "name": "filter_name", "field": lang['Filter Name'], @@ -6346,7 +6342,7 @@ module.exports = function(s,config,lang){ "fieldType": "select", "form-group-class": "actions-row", "description": "Make the event do nothing, as if it never happened.", - "default": "No", + "default": "0", "possible": [ { "name": "No", @@ -7553,7 +7549,7 @@ module.exports = function(s,config,lang){ }, "Monitor Options": { "section": "Monitor Options", - "dropdownClass": `dropdown-menu-dark ${mainBackgroundColor}` + "dropdownClass": `${Theme.isDark ? 'dropdown-menu-dark' : ''} ${mainBackgroundColor}` }, "SideMenu": { "section": "SideMenu", @@ -7767,7 +7763,7 @@ module.exports = function(s,config,lang){ "divContent": `
${lang['Live Grid']}

${lang.liveGridDescription}

- ${lang.Open} + ${lang.Open}
` }, { @@ -7776,7 +7772,7 @@ module.exports = function(s,config,lang){ "divContent": `
${lang['Account Settings']}

${lang.accountSettingsDescription}

- ${lang.Open} + ${lang.Open}
` }, ] diff --git a/libs/events/utils.js b/libs/events/utils.js index 0fa2a0ed..1d60f1ff 100644 --- a/libs/events/utils.js +++ b/libs/events/utils.js @@ -187,6 +187,7 @@ module.exports = (s,config,lang,app,io) => { Object.keys(filters).forEach(function(key){ var conditionChain = {} var dFilter = filters[key] + if(dFilter.enabled === '0')return; dFilter.where.forEach(function(condition,place){ conditionChain[place] = {ok:false,next:condition.p4,matrixCount:0} if(d.details.matrices)conditionChain[place].matrixCount = d.details.matrices.length @@ -268,6 +269,9 @@ module.exports = (s,config,lang,app,io) => { var value = dFilter.actions[key] filter[key] = parseValue(key,value) }) + if(dFilter.actions.record === '1'){ + filter.forceRecord = true + } }else{ filter.halt = true } @@ -381,9 +385,8 @@ module.exports = (s,config,lang,app,io) => { detector_timeout = parseFloat(monitorDetails.detector_timeout) } if( - filter.record && + (filter.forceRecord || (filter.record && monitorDetails.detector_trigger === '1')) && monitorConfig.mode === 'start' && - monitorDetails.detector_trigger === '1' && (monitorDetails.detector_record_method === 'sip' || monitorDetails.detector_record_method === 'hot') ){ createEventBasedRecording(d,moment(eventTime).subtract(5,'seconds').format('YYYY-MM-DDTHH-mm-ss')) @@ -595,6 +598,7 @@ module.exports = (s,config,lang,app,io) => { webhook : true, command : true, record : true, + forceRecord : false, indifference : false, countObjects : true }